The unified diff between revisions [7d2393b4..] and [b33adcc1..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "cli-session.c"
# from [044e633a29f6fea152646a63193851598f5d0b4d]
# to [456ed9269b52604e2d0c8aa700ba987974d0fd7b]
#
# patch "session.h"
# from [cc4c1b731836950406593afc60fedd35a59f9adb]
# to [8b1677ad8f52c19aa94571211683d6ef04de2d6a]
#
============================================================
--- cli-session.c 044e633a29f6fea152646a63193851598f5d0b4d
+++ cli-session.c 456ed9269b52604e2d0c8aa700ba987974d0fd7b
@@ -113,10 +113,14 @@ static void cli_session_init() {
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 @@ void cli_session_cleanup() {
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();
============================================================
--- session.h cc4c1b731836950406593afc60fedd35a59f9adb
+++ session.h 8b1677ad8f52c19aa94571211683d6ef04de2d6a
@@ -218,6 +218,10 @@ struct clientsession {
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 */