===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- src/usr.bin/ssh/sftp.c	2001/06/23 15:12:20	1.18
+++ src/usr.bin/ssh/sftp.c	2001/09/17 17:57:57	1.19
@@ -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') */
@@ -87,7 +87,9 @@
 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);
 }
 
@@ -112,7 +114,7 @@
 	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");
@@ -124,8 +126,9 @@
 			}
 			debug_level++;
 			break;
+		case 'F':
 		case 'o':
-			addargs(&args, "-o%s", optarg);
+			addargs(&args, "-%c%s", ch, optarg);
 			break;
 		case '1':
 			sshver = 1;