diff cli-chansession.c @ 99:0247fbd9379d

Move the revert-to-non-blocking-stdin code to cli-session so it always gets hit.
author Matt Johnston <matt@ucc.asn.au>
date Sun, 22 Aug 2004 09:23:59 +0000
parents 5dda5a4d475c
children d3eb1fa8484e
line wrap: on
line diff
--- a/cli-chansession.c	Sun Aug 22 09:23:11 2004 +0000
+++ b/cli-chansession.c	Sun Aug 22 09:23:59 2004 +0000
@@ -63,10 +63,6 @@
 
 	cli_tty_cleanup(); /* Restore tty modes etc */
 
-	/* Set stdin back to non-blocking - busybox ash dies nastily
-	 * if we don't revert the flags */
-	fcntl(cli_ses.stdincopy, F_SETFL, cli_ses.stdinflags);
-
 }
 
 static void start_channel_request(struct Channel *channel, 
@@ -317,13 +313,9 @@
 
 static int cli_initchansess(struct Channel *channel) {
 
-	/* We store stdin'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);
 
 	channel->infd = STDOUT_FILENO;
-	//channel->outfd = STDIN_FILENO;
+	channel->outfd = STDIN_FILENO;
 	//channel->errfd = STDERR_FILENO;
 
 	if (cli_opts.wantpty) {