diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-04-20 09:35:04 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-04-20 09:35:04 +0000 |
commit | 52028650dba51037ac82f766107619f336a00e25 (patch) | |
tree | aaca3b36adea134d5ba39fa7c38bf759a9ef49c6 /crypto/openssh/sftp.c | |
parent | efcad6b72fe9d4f7ea99c021f4903d09ca31b666 (diff) | |
download | src-52028650dba51037ac82f766107619f336a00e25.tar.gz src-52028650dba51037ac82f766107619f336a00e25.zip |
Vendor import of OpenSSH 3.8.1p1.
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=128456
Diffstat (limited to 'crypto/openssh/sftp.c')
-rw-r--r-- | crypto/openssh/sftp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/openssh/sftp.c b/crypto/openssh/sftp.c index 7f7f507311c0..a47ccf5a2ae7 100644 --- a/crypto/openssh/sftp.c +++ b/crypto/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) { |