diff options
author | Matt Johnston <matt@ucc.asn.au> | 2004-08-22 09:23:59 +0000 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2004-08-22 09:23:59 +0000 |
commit | aba8a3e2d4840fc9258b5e80221e5b79f46ea1df (patch) | |
tree | 7bceb734d88f87d611784545f68b5e5d64d5e268 /cli-chansession.c | |
parent | 545ce7d8bfac96e4731bdf7379a65374e306ba09 (diff) |
Move the revert-to-non-blocking-stdin code to cli-session so it
always gets hit.
--HG--
extra : convert_revision : 3eb50d87fa6439d336b2238926fbed5066302d30
Diffstat (limited to 'cli-chansession.c')
-rw-r--r-- | cli-chansession.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/cli-chansession.c b/cli-chansession.c index 267a07f..1267ae0 100644 --- a/cli-chansession.c +++ b/cli-chansession.c @@ -63,10 +63,6 @@ static void cli_closechansess(struct Channel *channel) { 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 void send_chansess_shell_req(struct Channel *channel) { 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) { |