- djm@cvs.openbsd.org 2007/01/22 13:06:21

     [scp.c]
     fix detection of whether we should show progress meter or not: scp
     tested isatty(stderr) but wrote the progress meter to stdout. This patch
     makes it test stdout. bz#1265 reported by junkmail AT bitsculpture.com;
     of dtucker@

diff --git a/ChangeLog b/ChangeLog
index b3e9f3862760ba3478cc964cd6ab3e7971e6d997..17c2c85d14f23174675e73ea04759ff4480ceeb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,12 @@
      return error from do_upload() when a write fails. fixes bz#1252: zero
      exit status from sftp when uploading to a full device. report from
      jirkat AT atlas.cz; ok dtucker@
+   - djm@cvs.openbsd.org 2007/01/22 13:06:21
+     [scp.c]
+     fix detection of whether we should show progress meter or not: scp
+     tested isatty(stderr) but wrote the progress meter to stdout. This patch
+     makes it test stdout. bz#1265 reported by junkmail AT bitsculpture.com;
+     of dtucker@
 
 20070128
  - (djm) [channels.c serverloop.c] Fix so-called "hang on exit" (bz #52)

diff --git a/scp.c b/scp.c
index 56a3e79ffa2b5ae1a12dfac1e5486af9866efdcb..a52aaeb12fc5acdb3dfee0c75531dd7140045364 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.155 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: scp.c,v 1.156 2007/01/22 13:06:21 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -380,7 +380,7 @@ main(int argc, char **argv)
        if ((pwd = getpwuid(userid = getuid())) == NULL)
                fatal("unknown user %u", (u_int) userid);
 
-       if (!isatty(STDERR_FILENO))
+       if (!isatty(STDOUT_FILENO))
                showprogress = 0;
 
        remin = STDIN_FILENO;