toast the rcsid strings which just get in the way

10 files changed, 10 insertions, 58 deletions

diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 9804866ba9c..7d5ebe2e75b 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.67 2008/10/16 23:15:53 martynas Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.68 2009/04/27 21:37:13 deraadt Exp $	*/
 /*	$NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $	*/
 
 /*
@@ -59,10 +59,6 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: cmds.c,v 1.67 2008/10/16 23:15:53 martynas Exp $";
-#endif /* not lint and not SMALL */
-
 /*
  * FTP User Program -- Command Routines.
  */
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index bc84d937129..71bf7441a44 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmdtab.c,v 1.23 2008/07/08 21:07:57 martynas Exp $	*/
+/*	$OpenBSD: cmdtab.c,v 1.24 2009/04/27 21:37:13 deraadt Exp $	*/
 /*	$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $	*/
 
 /*
@@ -30,10 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.23 2008/07/08 21:07:57 martynas Exp $";
-#endif /* not lint and not SMALL */
-
 #include <stdio.h>
 #include "ftp_var.h"
 
diff --git a/usr.bin/ftp/complete.c b/usr.bin/ftp/complete.c
index c2224af07e0..8acd8e907e5 100644
--- a/usr.bin/ftp/complete.c
+++ b/usr.bin/ftp/complete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: complete.c,v 1.21 2008/07/08 21:07:57 martynas Exp $	*/
+/*	$OpenBSD: complete.c,v 1.22 2009/04/27 21:37:13 deraadt Exp $	*/
 /*	$NetBSD: complete.c,v 1.10 1997/08/18 10:20:18 lukem Exp $	*/
 
 /*-
@@ -31,9 +31,6 @@
  */
 
 #ifndef SMALL
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: complete.c,v 1.21 2008/07/08 21:07:57 martynas Exp $";
-#endif /* not lint */
 
 /*
  * FTP user program - command and file completion routines
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c
index 26eafd3edd2..40bd6122417 100644
--- a/usr.bin/ftp/domacro.c
+++ b/usr.bin/ftp/domacro.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: domacro.c,v 1.14 2008/08/22 08:52:35 sobrado Exp $	*/
+/*	$OpenBSD: domacro.c,v 1.15 2009/04/27 21:37:13 deraadt Exp $	*/
 /*	$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $	*/
 
 /*
@@ -30,10 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: domacro.c,v 1.14 2008/08/22 08:52:35 sobrado Exp $";
-#endif /* not lint and not SMALL */
-
 #include <ctype.h>
 #include <signal.h>
 #include <stdio.h>
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index be1c4edab17..4cc777d7d95 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fetch.c,v 1.84 2009/04/26 21:26:03 martynas Exp $	*/
+/*	$OpenBSD: fetch.c,v 1.85 2009/04/27 21:37:13 deraadt Exp $	*/
 /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
 
 /*-
@@ -30,10 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: fetch.c,v 1.84 2009/04/26 21:26:03 martynas Exp $";
-#endif /* not lint and not SMALL */
-
 /*
  * FTP User Program -- Command line file retrieval
  */
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index a809f64fdeb..c1509e63b60 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftp.c,v 1.75 2009/04/26 21:26:03 martynas Exp $	*/
+/*	$OpenBSD: ftp.c,v 1.76 2009/04/27 21:37:13 deraadt Exp $	*/
 /*	$NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $	*/
 
 /*
@@ -59,10 +59,6 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: ftp.c,v 1.75 2009/04/26 21:26:03 martynas Exp $";
-#endif /* not lint and not SMALL */
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index 74e7b382ea7..d16eadb8b45 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.74 2009/04/27 08:32:15 sobrado Exp $	*/
+/*	$OpenBSD: main.c,v 1.75 2009/04/27 21:37:13 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
 
 /*
@@ -59,16 +59,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: main.c,v 1.74 2009/04/27 08:32:15 sobrado Exp $";
-#endif /* not lint and not SMALL */
-
 /*
  * FTP User Program -- Command Interface.
  */
diff --git a/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c
index 20a3a4d8f8d..bdb8e961181 100644
--- a/usr.bin/ftp/ruserpass.c
+++ b/usr.bin/ftp/ruserpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ruserpass.c,v 1.26 2008/06/25 21:15:19 martynas Exp $	*/
+/*	$OpenBSD: ruserpass.c,v 1.27 2009/04/27 21:37:13 deraadt Exp $	*/
 /*	$NetBSD: ruserpass.c,v 1.14 1997/07/20 09:46:01 lukem Exp $	*/
 
 /*
@@ -31,13 +31,6 @@
  */
 
 #ifndef SMALL
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ruserpass.c	8.4 (Berkeley) 4/27/95";
-#else
-static const char rcsid[] = "$OpenBSD: ruserpass.c,v 1.26 2008/06/25 21:15:19 martynas Exp $";
-#endif
-#endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ftp/stringlist.c b/usr.bin/ftp/stringlist.c
index a0823e67af1..c10df836572 100644
--- a/usr.bin/ftp/stringlist.c
+++ b/usr.bin/ftp/stringlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stringlist.c,v 1.8 2007/09/02 15:19:32 deraadt Exp $	*/
+/*	$OpenBSD: stringlist.c,v 1.9 2009/04/27 21:37:13 deraadt Exp $	*/
 /*	$NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $	*/
 
 /*
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: stringlist.c,v 1.8 2007/09/02 15:19:32 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint and not SMALL */
-
 #include <stdio.h>
 #include <string.h>
 #include <err.h>
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index 491056a002e..fb5e1a735bc 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.59 2009/04/26 21:26:03 martynas Exp $	*/
+/*	$OpenBSD: util.c,v 1.60 2009/04/27 21:37:13 deraadt Exp $	*/
 /*	$NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $	*/
 
 /*-
@@ -63,10 +63,6 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: util.c,v 1.59 2009/04/26 21:26:03 martynas Exp $";
-#endif /* not lint and not SMALL */
-
 /*
  * FTP User Program -- Misc support routines
  */