commit c0f27d8782ecb76c7b83ba1fb047b9ca696b2071
author Damien Miller <djm@mindrot.org> Mon Mar 08 23:12:19 2004 +1100
committer Damien Miller <djm@mindrot.org> Mon Mar 08 23:12:19 2004 +1100
tree 507684fd4399a8db432c54da00ffff23c3ff3aa2
parent 9ba3069a8b346efc7c1b1ea5908e6c5c8b01fec2

   - djm@cvs.openbsd.org 2004/03/03 09:31:20
     [sftp.c]
     Fix initialisation of progress meter; ok markus@

sftp.c

diff --git a/sftp.c b/sftp.c
index 7f7f507..a47ccf5 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 @@
 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 @@
 		}
 	}
 
+	if (!isatty(STDERR_FILENO))
+		showprogress = 0;
+
 	log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
 
 	if (sftp_direct == NULL) {