Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/usr.bin/ftp/main.c,v
rcsdiff: /ftp/cvs/cvsroot/src/usr.bin/ftp/main.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- src/usr.bin/ftp/main.c	2000/11/15 00:11:03	1.74
+++ src/usr.bin/ftp/main.c	2000/12/15 02:22:51	1.75
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.74 2000/11/15 00:11:03 lukem Exp $	*/
+/*	$NetBSD: main.c,v 1.75 2000/12/15 02:22:51 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996-2000 The NetBSD Foundation, Inc.
@@ -108,7 +108,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 19
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.74 2000/11/15 00:11:03 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.75 2000/12/15 02:22:51 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -679,6 +679,7 @@ cmdscanner(void)
 			continue;
 		}
 		confirmrest = 0;
+		margv[0] = c->c_name;
 		(*c->c_handler)(margc, margv);
 		if (bell && c->c_bell)
 			(void)putc('\007', ttyout);
@@ -944,7 +945,7 @@ help(int argc, char *argv[])
 			    cmd, arg);
 		else {
 			if (isusage) {
-				nargv[0] = arg;
+				nargv[0] = c->c_name;
 				(*c->c_handler)(0, nargv);
 			} else
 				fprintf(ttyout, "%-*s\t%s\n", HELPINDENT,