tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2004/03/03 09:31:20 

[sftp.c]
     Fix initialisation of progress meter; ok markus@
This commit is contained in:
Damien Miller 2004-03-08 23:12:19 +11:00
parent 9ba3069a8b
commit c0f27d8782
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -17,6 +17,9 @@
[sftp-client.c] [sftp-client.c]
Don't print duplicate messages when progressmeter is off Don't print duplicate messages when progressmeter is off
Spotted by job317 AT mailvault.com; ok markus@ 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 20040307
- (tim) [regress/login-timeout.sh] fix building outside of source tree. - (tim) [regress/login-timeout.sh] fix building outside of source tree.
@ -877,4 +880,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

7
sftp.c
View File

@ -16,7 +16,7 @@
#include "includes.h" #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 "buffer.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -44,7 +44,7 @@ size_t num_requests = 16;
static pid_t sshpid = -1; static pid_t sshpid = -1;
/* This is set to 0 if the progressmeter is not desired. */ /* 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 remote_glob(struct sftp_conn *, const char *, int,
int (*)(const char *, int), glob_t *); /* proto for sftp-glob.c */ 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); log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
if (sftp_direct == NULL) { if (sftp_direct == NULL) {