Mercurial > dropbear
changeset 175:2c5741e4b855 nonblock-stdout-stderr
* Reset the non-blocking status of stdout and stderr as well on exit
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Wed, 02 Mar 2005 04:14:26 +0000 |
| parents | c753db8eb446 |
| children | 058cc7892636 |
| files | cli-session.c session.h |
| diffstat | 2 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/cli-session.c Wed Mar 02 04:13:01 2005 +0000 +++ b/cli-session.c Wed Mar 02 04:14:26 2005 +0000 @@ -113,10 +113,14 @@ cli_ses.tty_raw_mode = 0; cli_ses.winchange = 0; - /* We store stdin's flags, so we can set them back on exit (otherwise - * busybox's ash isn't happy */ + /* We store std{in,out,err}'s flags, so we can set them back on exit + * (otherwise busybox's ash isn't happy */ cli_ses.stdincopy = dup(STDIN_FILENO); cli_ses.stdinflags = fcntl(STDIN_FILENO, F_GETFL, 0); + cli_ses.stdoutcopy = dup(STDOUT_FILENO); + cli_ses.stdoutflags = fcntl(STDOUT_FILENO, F_GETFL, 0); + cli_ses.stderrcopy = dup(STDERR_FILENO); + cli_ses.stderrflags = fcntl(STDERR_FILENO, F_GETFL, 0); cli_ses.retval = EXIT_SUCCESS; /* Assume it's clean if we don't get a specific exit status */ @@ -250,9 +254,11 @@ return; } - /* Set stdin back to non-blocking - busybox ash dies nastily - * if we don't revert the flags */ + /* Set std{in,out,err} back to non-blocking - busybox ash dies nastily if + * we don't revert the flags */ fcntl(cli_ses.stdincopy, F_SETFL, cli_ses.stdinflags); + fcntl(cli_ses.stdoutcopy, F_SETFL, cli_ses.stdoutflags); + fcntl(cli_ses.stderrcopy, F_SETFL, cli_ses.stderrflags); cli_tty_cleanup();
--- a/session.h Wed Mar 02 04:13:01 2005 +0000 +++ b/session.h Wed Mar 02 04:14:26 2005 +0000 @@ -218,6 +218,10 @@ struct termios saved_tio; int stdincopy; int stdinflags; + int stdoutcopy; + int stdoutflags; + int stderrcopy; + int stderrflags; int winchange; /* Set to 1 when a windowchange signal happens */