===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/main.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- src/usr.bin/ftp/main.c	2010/06/29 23:12:33	1.81
+++ src/usr.bin/ftp/main.c	2012/04/30 13:41:26	1.82
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.81 2010/06/29 23:12:33 halex Exp $	*/
+/*	$OpenBSD: main.c,v 1.82 2012/04/30 13:41:26 haesbaert Exp $	*/
 /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
 
 /*
@@ -114,6 +114,7 @@
 	hist = NULL;
 	cookiefile = NULL;
 	resume = 0;
+	srcaddr = NULL;
 	marg_sl = sl_init();
 #endif /* !SMALL */
 	mark = HASHBYTES;
@@ -174,7 +175,7 @@
 	cookiefile = getenv("http_cookies");
 #endif /* !SMALL */
 
-	while ((ch = getopt(argc, argv, "46AaCc:dEegik:mno:pP:r:tvV")) != -1) {
+	while ((ch = getopt(argc, argv, "46AaCc:dEegik:mno:pP:r:s:tvV")) != -1) {
 		switch (ch) {
 		case '4':
 			family = PF_INET;
@@ -275,6 +276,12 @@
 			}
 			break;
 
+		case 's':
+#ifndef SMALL
+			srcaddr = optarg;
+#endif /* !SMALL */
+			break;
+
 		case 't':
 			trace = 1;
 			break;
@@ -756,15 +763,21 @@
 	    "       %s [-C] "
 #endif /* !SMALL */
 	    "[-o output] "
+#ifndef SMALL
+	    "[-s srcaddr] "
+#endif /* !SMALL */
 	    "ftp://[user:password@]host[:port]/file[/] ...\n"
 	    "       %s "
 #ifndef SMALL
 	    "[-C] [-c cookie] "
 #endif /* !SMALL */
 	    "[-o output] "
+#ifndef SMALL
+	    "[-s srcaddr] "
+#endif /* !SMALL */
 	    "http://host[:port]/file ...\n"
 #ifndef SMALL
-	    "       %s [-C] [-c cookie] [-o output] "
+	    "       %s [-C] [-c cookie] [-o output] [-s srcaddr] "
 	    "https://host[:port]/file ...\n"
 #endif /* !SMALL */
 	    "       %s "
@@ -772,12 +785,19 @@
 	    "[-C] "
 #endif /* !SMALL */
 	    "[-o output] "
+#ifndef SMALL
+	    "[-s srcaddr] "
+#endif /* !SMALL */
 	    "file:file ...\n"
 	    "       %s "
 #ifndef SMALL
 	    "[-C] "
 #endif /* !SMALL */
-	    "[-o output] host:/file[/] ...\n",
+	    "[-o output] "
+#ifndef SMALL
+	    "[-s srcaddr] "
+#endif /* !SMALL */
+	    "host:/file[/] ...\n",
 #ifndef SMALL
 	    __progname, __progname, __progname, __progname, __progname,
 	    __progname);