v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Sync OpenBSD patchset 654:

Browse Source 
Don't set the terminal to nonblocking on detach until we have finished with it
entirely.
This commit is contained in:
Tiago Cunha 2010-02-26 13:34:15 +00:00
parent 5920a55a87
commit 862b89b78b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.187 2010-02-02 23:56:25 tcunha Exp $ */ /* $Id: tty.c,v 1.188 2010-02-26 13:34:15 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -213,10 +213,6 @@ tty_stop_tty(struct tty *tty)
* because the fd is invalid. Things like ssh -t can easily leave us * because the fd is invalid. Things like ssh -t can easily leave us
* with a dead tty. * with a dead tty.
*/ */
if ((mode = fcntl(tty->fd, F_GETFL)) == -1)
return;
if (fcntl(tty->fd, F_SETFL, mode & ~O_NONBLOCK) == -1)
return;
if (ioctl(tty->fd, TIOCGWINSZ, &ws) == -1) if (ioctl(tty->fd, TIOCGWINSZ, &ws) == -1)
return; return;
if (tcsetattr(tty->fd, TCSANOW, &tty->tio) == -1) if (tcsetattr(tty->fd, TCSANOW, &tty->tio) == -1)
@ -233,6 +229,9 @@ 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));
if ((mode = fcntl(tty->fd, F_GETFL)) != -1)
fcntl(tty->fd, F_SETFL, mode & ~O_NONBLOCK);
} }
void void