- (bal) Applied shutdown() patch for sftp.c by Corinna Vinschen

   <vinschen@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index c7280b47ece4cfb1e2e3c1473de3ed5c51d15b0f..be334d0cd92a4df7fb63423d8202b809bad5eaa7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20010226
+ - (bal) Applied shutdown() patch for sftp.c by  Corinna Vinschen 
+   <vinschen@redhat.com>
+
 20010226
  - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again.
  - (djm) Some systems (SCO3, NeXT) have weird saved uid semantics. 

diff --git a/sftp.c b/sftp.c
index b4775c02f20e96b80a9e6736009cfed3257ed4d6..0fba6749f1cbf105221b1c20d6dcc7cd24663982 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -246,11 +246,18 @@ main(int argc, char **argv)
 
        interactive_loop(in, out);
 
+#if !defined(USE_PIPES)
+        shutdown(in, SHUT_RDWR);
+        shutdown(out, SHUT_RDWR);
+#endif
+
        close(in);
        close(out);
 
+#if !defined(HAVE_CYGWIN)
        if (kill(sshpid, SIGHUP) == -1)
                fatal("Couldn't terminate ssh process: %s", strerror(errno));
+#endif
 
        if (waitpid(sshpid, NULL, 0) == -1)
                fatal("Couldn't wait for ssh process: %s", strerror(errno));