From 7df0afafb5f4e9c335a4e3c209039e0dc1a736ba Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Mon, 19 Feb 2007 11:14:11 +0000
Subject: [PATCH]    - 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@

---
 ChangeLog | 6 ++++++
 scp.c     | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3e9f386..17c2c85d 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)
diff --git a/scp.c b/scp.c
index 56a3e79f..a52aaeb1 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;
-- 
2.45.2