diff options
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | 26 | ||
27 | RCSID("$OpenBSD: sftp.c,v 1.26 2002/02/12 12:32:27 djm Exp $"); | 27 | RCSID("$OpenBSD: sftp.c,v 1.27 2002/03/19 10:49:35 markus 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 | ||
@@ -94,7 +94,7 @@ static void | |||
94 | usage(void) | 94 | usage(void) |
95 | { | 95 | { |
96 | extern char *__progname; | 96 | extern char *__progname; |
97 | 97 | ||
98 | fprintf(stderr, | 98 | fprintf(stderr, |
99 | "usage: %s [-vC1] [-b batchfile] [-o option] [-s subsystem|path] [-B buffer_size]\n" | 99 | "usage: %s [-vC1] [-b batchfile] [-o option] [-s subsystem|path] [-B buffer_size]\n" |
100 | " [-F config] [-P direct server path] [-S program]\n" | 100 | " [-F config] [-P direct server path] [-S program]\n" |
@@ -172,7 +172,7 @@ main(int argc, char **argv) | |||
172 | case 'R': | 172 | case 'R': |
173 | num_requests = strtol(optarg, &cp, 10); | 173 | num_requests = strtol(optarg, &cp, 10); |
174 | if (num_requests == 0 || *cp != '\0') | 174 | if (num_requests == 0 || *cp != '\0') |
175 | fatal("Invalid number of requests \"%s\"", | 175 | fatal("Invalid number of requests \"%s\"", |
176 | optarg); | 176 | optarg); |
177 | break; | 177 | break; |
178 | case 'h': | 178 | case 'h': |
@@ -218,19 +218,19 @@ main(int argc, char **argv) | |||
218 | addargs(&args, "-s"); | 218 | addargs(&args, "-s"); |
219 | 219 | ||
220 | addargs(&args, "%s", host); | 220 | addargs(&args, "%s", host); |
221 | addargs(&args, "%s", (sftp_server != NULL ? | 221 | addargs(&args, "%s", (sftp_server != NULL ? |
222 | sftp_server : "sftp")); | 222 | sftp_server : "sftp")); |
223 | args.list[0] = ssh_program; | 223 | args.list[0] = ssh_program; |
224 | 224 | ||
225 | fprintf(stderr, "Connecting to %s...\n", host); | 225 | fprintf(stderr, "Connecting to %s...\n", host); |
226 | connect_to_server(ssh_program, args.list, &in, &out, | 226 | connect_to_server(ssh_program, args.list, &in, &out, |
227 | &sshpid); | 227 | &sshpid); |
228 | } else { | 228 | } else { |
229 | args.list = NULL; | 229 | args.list = NULL; |
230 | addargs(&args, "sftp-server"); | 230 | addargs(&args, "sftp-server"); |
231 | 231 | ||
232 | fprintf(stderr, "Attaching to %s...\n", sftp_direct); | 232 | fprintf(stderr, "Attaching to %s...\n", sftp_direct); |
233 | connect_to_server(sftp_direct, args.list, &in, &out, | 233 | connect_to_server(sftp_direct, args.list, &in, &out, |
234 | &sshpid); | 234 | &sshpid); |
235 | } | 235 | } |
236 | 236 | ||