- 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@

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index c5590c032..14a5deace 100644
--- 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)
@@ -2721,4 +2727,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4614 2007/02/19 11:13:39 dtucker Exp $
+$Id: ChangeLog,v 1.4615 2007/02/19 11:14:11 dtucker Exp $
diff --git a/scp.c b/scp.c
index 56a3e79ff..a52aaeb12 100644
--- 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;