===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ftp/main.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- src/usr.bin/ftp/main.c	2019/05/16 12:44:18	1.129
+++ src/usr.bin/ftp/main.c	2019/10/23 16:48:59	1.130
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.129 2019/05/16 12:44:18 florian Exp $	*/
+/*	$OpenBSD: main.c,v 1.130 2019/10/23 16:48:59 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
 
 /*
@@ -297,7 +297,7 @@
 	httpuseragent = NULL;
 
 	while ((ch = getopt(argc, argv,
-		    "46AaCc:dD:Eegik:Mmno:pP:r:S:s:tU:vVw:")) != -1) {
+		    "46AaCc:dD:EeN:gik:Mmno:pP:r:S:s:tU:vVw:")) != -1) {
 		switch (ch) {
 		case '4':
 			family = PF_INET;
@@ -310,6 +310,9 @@
 			passivemode = 0;
 			break;
 
+		case 'N':
+			setprogname(optarg);
+			break;
 		case 'a':
 			anonftp = 1;
 			break;
@@ -943,25 +946,25 @@
 	    "ftp [-46AadEegiMmnptVv] [-D title] [-k seconds] [-P port] "
 	    "[-r seconds]\n"
 	    "           [-s srcaddr] [host [port]]\n"
-	    "       ftp [-C] [-o output] [-s srcaddr]\n"
+	    "       ftp [-C] [-N name] [-o output] [-s srcaddr]\n"
 	    "           ftp://[user:password@]host[:port]/file[/] ...\n"
-	    "       ftp [-C] [-c cookie] [-o output] [-S ssl_options] "
+	    "       ftp [-C] [-c cookie] [-N name] [-o output] [-S ssl_options] "
 	    "[-s srcaddr]\n"
 	    "           [-U useragent] [-w seconds] "
 	    "http[s]://[user:password@]host[:port]/file ...\n"
-	    "       ftp [-C] [-o output] [-s srcaddr] file:file ...\n"
-	    "       ftp [-C] [-o output] [-s srcaddr] host:/file[/] ...\n"
+	    "       ftp [-C] [-N name] [-o output] [-s srcaddr] file:file ...\n"
+	    "       ftp [-C] [-N name] [-o output] [-s srcaddr] host:/file[/] ...\n"
 #else /* !SMALL */
-	    "ftp [-o output] "
+	    "ftp [-N name] [-o output] "
 	    "ftp://[user:password@]host[:port]/file[/] ...\n"
 #ifndef NOSSL
-	    "       ftp [-o output] [-S ssl_options] [-w seconds] "
+	    "       ftp [-N name] [-o output] [-S ssl_options] [-w seconds] "
 	    "http[s]://[user:password@]host[:port]/file ...\n"
 #else
-	    "       ftp [-o output] [-w seconds] http://host[:port]/file ...\n"
+	    "       ftp [-N name] [-o output] [-w seconds] http://host[:port]/file ...\n"
 #endif /* NOSSL */
-	    "       ftp [-o output] file:file ...\n"
-	    "       ftp [-o output] host:/file[/] ...\n"
+	    "       ftp [-N name] [-o output] file:file ...\n"
+	    "       ftp [-N name] [-o output] host:/file[/] ...\n"
 #endif /* !SMALL */
 	    );
 	exit(1);