Module Name: src
Committed By: lukem
Date: Fri Apr 24 08:57:26 UTC 2009
Modified Files:
src/usr.bin/ftp: main.c version.h
Log Message:
Revert incorrect change made as part of the WARNS=4.
Fixes "ftp host [port]" on the CLI.
Noted by Geoff Wing.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/usr.bin/ftp/main.c
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/ftp/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/main.c
diff -u src/usr.bin/ftp/main.c:1.115 src/usr.bin/ftp/main.c:1.116
--- src/usr.bin/ftp/main.c:1.115 Sun Apr 12 10:18:52 2009
+++ src/usr.bin/ftp/main.c Fri Apr 24 08:57:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.115 2009/04/12 10:18:52 lukem Exp $ */
+/* $NetBSD: main.c,v 1.116 2009/04/24 08:57:26 lukem Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: main.c,v 1.115 2009/04/12 10:18:52 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.116 2009/04/24 08:57:26 lukem Exp $");
#endif
#endif /* not lint */
@@ -574,7 +574,7 @@
anonftp = 0;
autologin = 0;
}
- setpeer(3, xargv);
+ setpeer(argc+1, xargv);
autologin = oautologin;
if (connected == 1 && uuser != NULL)
(void)ftp_login(host, uuser, NULL);
Index: src/usr.bin/ftp/version.h
diff -u src/usr.bin/ftp/version.h:1.78 src/usr.bin/ftp/version.h:1.79
--- src/usr.bin/ftp/version.h:1.78 Sun Apr 12 10:18:52 2009
+++ src/usr.bin/ftp/version.h Fri Apr 24 08:57:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.78 2009/04/12 10:18:52 lukem Exp $ */
+/* $NetBSD: version.h,v 1.79 2009/04/24 08:57:26 lukem Exp $ */
/*-
* Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
@@ -34,5 +34,5 @@
#endif
#ifndef FTP_VERSION
-#define FTP_VERSION "20090412"
+#define FTP_VERSION "20090424"
#endif
