diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 4c83c895b62f..72eaaecd9fa8 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmds.c,v 1.93 2000/12/15 02:22:50 lukem Exp $	*/
+/*	$NetBSD: cmds.c,v 1.94 2001/02/19 18:15:28 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996-2000 The NetBSD Foundation, Inc.
@@ -107,7 +107,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$NetBSD: cmds.c,v 1.93 2000/12/15 02:22:50 lukem Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.94 2001/02/19 18:15:28 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -558,10 +558,10 @@ get(int argc, char *argv[])
 int
 getit(int argc, char *argv[], int restartit, const char *mode)
 {
-	int loc = 0;
-	int rval = 0;
-	char *remfile, *locfile, *olocfile;
+	int	 loc, rval;
+	char	*remfile, *locfile, *olocfile;
 
+	loc = rval = 0;
 	if (argc == 2) {
 		argc++;
 		argv[2] = argv[1];
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index fe3ef0148457..14ece7f01b30 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftp.c,v 1.113 2000/11/27 16:08:03 itojun Exp $	*/
+/*	$NetBSD: ftp.c,v 1.114 2001/02/19 18:15:29 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996-2000 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: ftp.c,v 1.113 2000/11/27 16:08:03 itojun Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.114 2001/02/19 18:15:29 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -1211,7 +1211,7 @@ recvrequest(const char *cmd, const char *local, const char *remote,
 			bytes++;
 	contin2:	;
 		}
-break2:
+ break2:
 		if (hash && (!progress || filesize < 0)) {
 			if (bytes < hashbytes)
 				(void)putc('#', ttyout);