- markus@cvs.openbsd.org 2001/04/15 17:16:00

     [clientloop.c]
     set stdin/out/err to nonblocking in SSH proto 1, too. suggested by ho@
     should fix some of the blocking problems for rsync over SSH-1

2 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9951503b8..0d84abf79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@
    - markus@cvs.openbsd.org 2001/04/15 16:58:03
      [authfile.c ssh-keygen.c sshd.c]
      don't use errno for key_{load,save}_private; discussion w/ solar@openwall
+   - markus@cvs.openbsd.org 2001/04/15 17:16:00
+     [clientloop.c]
+     set stdin/out/err to nonblocking in SSH proto 1, too. suggested by ho@
+     should fix some of the blocking problems for rsync over SSH-1
  - (djm) Convert mandoc manpages to man automatically. Patch from Mark D.
    Roth <roth+openssh@feep.net>
 
@@ -5096,4 +5100,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1120 2001/04/16 02:00:02 mouring Exp $
+$Id: ChangeLog,v 1.1121 2001/04/16 02:01:25 mouring Exp $
diff --git a/clientloop.c b/clientloop.c
index 24ea0dec0..95c00f343 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.62 2001/04/14 16:33:20 stevesk Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.63 2001/04/15 17:16:00 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -80,6 +80,7 @@ RCSID("$OpenBSD: clientloop.c,v 1.62 2001/04/14 16:33:20 stevesk Exp $");
 #include "authfd.h"
 #include "atomicio.h"
 #include "sshtty.h"
+#include "misc.h"
 
 /* import options */
 extern Options options;
@@ -782,6 +783,13 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
         max_fd = MAX(connection_in, connection_out);
 
         if (!compat20) {
+                /* enable nonblocking unless tty */
+                if (!isatty(fileno(stdin)))
+                        set_nonblock(fileno(stdin));
+                if (!isatty(fileno(stdout)))
+                        set_nonblock(fileno(stdout));
+                if (!isatty(fileno(stderr)))
+                        set_nonblock(fileno(stderr));
                 max_fd = MAX(max_fd, fileno(stdin));
                 max_fd = MAX(max_fd, fileno(stdout));
                 max_fd = MAX(max_fd, fileno(stderr));