2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index c2c0c508a..4ad86f200 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
      [sftp-client.c]
      Don't print duplicate messages when progressmeter is off
      Spotted by job317 AT mailvault.com; ok markus@
+   - djm@cvs.openbsd.org 2004/03/03 09:31:20
+     [sftp.c]
+     Fix initialisation of progress meter; ok markus@
 
 20040307
  - (tim) [regress/login-timeout.sh] fix building outside of source tree.
@@ -877,4 +880,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3281 2004/03/08 12:12:02 djm Exp $
+$Id: ChangeLog,v 1.3282 2004/03/08 12:12:19 djm Exp $
diff --git a/sftp.c b/sftp.c
index 7f7f50731..a47ccf5a2 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.44 2004/02/17 11:03:08 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.45 2004/03/03 09:31:20 djm Exp $");
 
 #include "buffer.h"
 #include "xmalloc.h"
@@ -44,7 +44,7 @@ size_t num_requests = 16;
 static pid_t sshpid = -1;
 
 /* This is set to 0 if the progressmeter is not desired. */
-int showprogress;
+int showprogress = 1;
 
 int remote_glob(struct sftp_conn *, const char *, int,
     int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */
@@ -1357,6 +1357,9 @@ main(int argc, char **argv)
                 }
         }
 
+        if (!isatty(STDERR_FILENO))
+                showprogress = 0;
+
         log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
 
         if (sftp_direct == NULL) {