diff options
author | Damien Miller <djm@mindrot.org> | 2003-01-10 21:43:24 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-01-10 21:43:24 +1100 |
commit | 62d57f605a84b8d80803a36a612a37a5137a9963 (patch) | |
tree | d8299282efb2b5216109b302d9e369b67c3e69cd /sftp.c | |
parent | 956f3fb28b93420e87a51d1611029accebb2e43b (diff) |
- fgsch@cvs.openbsd.org 2003/01/10 08:19:07
[scp.c sftp.1 sftp.c sftp-client.c sftp-int.c]
sftp progress meter support.
original diffs by Nils Nordman <nino at nforced dot com> via
markus@, merged to -current by me, djm@ ok.
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | 26 | ||
27 | RCSID("$OpenBSD: sftp.c,v 1.33 2003/01/08 23:53:26 djm Exp $"); | 27 | RCSID("$OpenBSD: sftp.c,v 1.34 2003/01/10 08:19:07 fgsch Exp $"); |
28 | 28 | ||
29 | /* XXX: short-form remote directory listings (like 'ls -C') */ | 29 | /* XXX: short-form remote directory listings (like 'ls -C') */ |
30 | 30 | ||
@@ -49,6 +49,8 @@ FILE* infile; | |||
49 | size_t copy_buffer_len = 32768; | 49 | size_t copy_buffer_len = 32768; |
50 | size_t num_requests = 16; | 50 | size_t num_requests = 16; |
51 | 51 | ||
52 | extern int showprogress; | ||
53 | |||
52 | static void | 54 | static void |
53 | connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid) | 55 | connect_to_server(char *path, char **args, int *in, int *out, pid_t *sshpid) |
54 | { | 56 | { |
@@ -162,6 +164,7 @@ main(int argc, char **argv) | |||
162 | fatal("%s (%s).", strerror(errno), optarg); | 164 | fatal("%s (%s).", strerror(errno), optarg); |
163 | } else | 165 | } else |
164 | fatal("Filename already specified."); | 166 | fatal("Filename already specified."); |
167 | showprogress = 0; | ||
165 | break; | 168 | break; |
166 | case 'P': | 169 | case 'P': |
167 | sftp_direct = optarg; | 170 | sftp_direct = optarg; |