Import of OpenSSH 3.8.1p1

[gssapi-openssh.git] / openssh / sftp.c

diff --git a/openssh/sftp.c b/openssh/sftp.c
index 7f7f507311c0cd6a3690faf233d2b6b4cb4f6c9c..a47ccf5a2ae7bbad822d4a2d78ccfb0c4a148bff 100644 (file)
--- a/openssh/sftp.c
+++ b/openssh/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) {