summaryrefslogtreecommitdiff
path: root/sftp.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-09-18 05:38:44 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-09-18 05:38:44 +0000
commit1e2432416483351ba18ac7ea21538b138db583ae (patch)
tree5cd4c05c6dad657a43b92b37783481f9a0e106c5 /sftp.c
parent99b8febe111e304e47c79c1f6f2351afed7a0e96 (diff)
- stevesk@cvs.openbsd.org 2001/09/17 17:57:57
[scp.1 scp.c sftp.1 sftp.c] add -Fssh_config option; ok markus@
Diffstat (limited to 'sftp.c')
-rw-r--r--sftp.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sftp.c b/sftp.c
index 98294ab0..b9558efd 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
#include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.18 2001/06/23 15:12:20 itojun Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.19 2001/09/17 17:57:57 stevesk Exp $");
/* XXX: commandline mode */
/* XXX: short-form remote directory listings (like 'ls -C') */
@@ -93,7 +93,9 @@ connect_to_server(char **args, int *in, int *out, pid_t *sshpid)
static void
usage(void)
{
- fprintf(stderr, "usage: sftp [-1vC] [-b batchfile] [-osshopt=value] [user@]host[:file [file]]\n");
+ fprintf(stderr,
+ "usage: sftp [-1vC] [-b batchfile] [-F config] [-o option]\n"
+ " [user@]host[:file [file]]\n");
exit(1);
}
@@ -119,7 +121,7 @@ main(int argc, char **argv)
ll = SYSLOG_LEVEL_INFO;
infile = stdin; /* Read from STDIN unless changed by -b */
- while ((ch = getopt(argc, argv, "1hvCo:s:S:b:")) != -1) {
+ while ((ch = getopt(argc, argv, "1hvCo:s:S:b:F:")) != -1) {
switch (ch) {
case 'C':
addargs(&args, "-C");
@@ -131,8 +133,9 @@ main(int argc, char **argv)
}
debug_level++;
break;
+ case 'F':
case 'o':
- addargs(&args, "-o%s", optarg);
+ addargs(&args, "-%c%s", ch, optarg);
break;
case '1':
sshver = 1;