circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-04 23:28:51 +00:00
Code Issues Projects Releases Wiki Activity

I strongly suspect it is possible for tmux to block on detach in tty_raw, so

Browse Source 
make the fd blocking again much later and have tty_raw just retry the write a
few times.
This commit is contained in:
Nicholas Marriott 2013-02-17 22:28:11 +00:00
parent cf2c0237f4
commit 4c91c153cb
1 changed files with 17 additions and 3 deletions

20
tty.c
View File

@ -267,8 +267,6 @@ tty_stop_tty(struct tty *tty)
if (tcsetattr(tty->fd, TCSANOW, &tty->tio) == -1) if (tcsetattr(tty->fd, TCSANOW, &tty->tio) == -1)
return; return;
setblocking(tty->fd, 1);
tty_raw(tty, tty_term_string2(tty->term, TTYC_CSR, 0, ws.ws_row - 1)); tty_raw(tty, tty_term_string2(tty->term, TTYC_CSR, 0, ws.ws_row - 1));
if (tty_use_acs(tty)) if (tty_use_acs(tty))
tty_raw(tty, tty_term_string(tty->term, TTYC_RMACS)); tty_raw(tty, tty_term_string(tty->term, TTYC_RMACS));
@ -288,6 +286,8 @@ tty_stop_tty(struct tty *tty)
tty_raw(tty, "\033[?1000l"); tty_raw(tty, "\033[?1000l");
tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP)); tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
setblocking(tty->fd, 1);
} }
void void
@ -332,7 +332,21 @@ tty_free(struct tty *tty)
void void
tty_raw(struct tty *tty, const char *s) tty_raw(struct tty *tty, const char *s)
{ {
write(tty->fd, s, strlen(s)); ssize_t n, slen;
u_int i;
slen = strlen(s);
for (i = 0; i < 5; i++) {
n = write(tty->fd, s, slen);
if (n >= 0) {
s += n;
slen -= n;
if (slen == 0)
break;
} else if (n == -1 && errno != EAGAIN)
break;
usleep(100);
}
} }
void void