rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and

unmaintainable).  these days, people use source.  these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

8 files changed, 8 insertions, 78 deletions

diff --git a/usr.bin/sort/append.c b/usr.bin/sort/append.c
index 38797679f1d..c6249060deb 100644
--- a/usr.bin/sort/append.c
+++ b/usr.bin/sort/append.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: append.c,v 1.9 2004/07/20 03:50:27 deraadt Exp $	*/
+/*	$OpenBSD: append.c,v 1.10 2009/10/27 23:59:43 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)append.c	8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: append.c,v 1.9 2004/07/20 03:50:27 deraadt Exp $";
-#endif
-#endif /* not lint */
-
 #include "sort.h"
 
 #include <stdlib.h>
diff --git a/usr.bin/sort/fields.c b/usr.bin/sort/fields.c
index d02275e9d6d..4217904bcde 100644
--- a/usr.bin/sort/fields.c
+++ b/usr.bin/sort/fields.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fields.c,v 1.13 2008/02/22 01:24:58 millert Exp $	*/
+/*	$OpenBSD: fields.c,v 1.14 2009/10/27 23:59:43 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fields.c	8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: fields.c,v 1.13 2008/02/22 01:24:58 millert Exp $";
-#endif
-#endif /* not lint */
-
 /* Subroutines to generate sort keys. */
 
 #include "sort.h"
diff --git a/usr.bin/sort/files.c b/usr.bin/sort/files.c
index fb8973518b6..e62409ccaec 100644
--- a/usr.bin/sort/files.c
+++ b/usr.bin/sort/files.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: files.c,v 1.12 2005/08/18 14:56:25 jaredy Exp $	*/
+/*	$OpenBSD: files.c,v 1.13 2009/10/27 23:59:43 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)files.c	8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: files.c,v 1.12 2005/08/18 14:56:25 jaredy Exp $";
-#endif
-#endif /* not lint */
-
 #include "sort.h"
 #include "fsort.h"
 
diff --git a/usr.bin/sort/fsort.c b/usr.bin/sort/fsort.c
index b46974b57b0..cab2b3b824f 100644
--- a/usr.bin/sort/fsort.c
+++ b/usr.bin/sort/fsort.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsort.c,v 1.20 2008/11/20 12:14:16 otto Exp $	*/
+/*	$OpenBSD: fsort.c,v 1.21 2009/10/27 23:59:43 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)fsort.c	8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: fsort.c,v 1.20 2008/11/20 12:14:16 otto Exp $";
-#endif
-#endif /* not lint */
-
 /*
  * Read in the next bin.  If it fits in one segment sort it;
  * otherwise refine it by segment deeper by one character,
diff --git a/usr.bin/sort/init.c b/usr.bin/sort/init.c
index 700b8406979..34ef4149e10 100644
--- a/usr.bin/sort/init.c
+++ b/usr.bin/sort/init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init.c,v 1.11 2007/09/01 18:13:58 kili Exp $	*/
+/*	$OpenBSD: init.c,v 1.12 2009/10/27 23:59:43 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.11 2007/09/01 18:13:58 kili Exp $";
-#endif
-#endif /* not lint */
-
 #include "sort.h"
 
 #include <ctype.h>
diff --git a/usr.bin/sort/msort.c b/usr.bin/sort/msort.c
index 342f8e37aea..7b208107342 100644
--- a/usr.bin/sort/msort.c
+++ b/usr.bin/sort/msort.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msort.c,v 1.21 2007/08/21 20:29:25 millert Exp $	*/
+/*	$OpenBSD: msort.c,v 1.22 2009/10/27 23:59:43 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)msort.c	8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: msort.c,v 1.21 2007/08/21 20:29:25 millert Exp $";
-#endif
-#endif /* not lint */
-
 #include "sort.h"
 #include "fsort.h"
 
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index b31a7111dcd..f8d94064533 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sort.c,v 1.36 2007/08/22 06:56:40 jmc Exp $	*/
+/*	$OpenBSD: sort.c,v 1.37 2009/10/27 23:59:43 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -32,20 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)sort.c	8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: sort.c,v 1.36 2007/08/22 06:56:40 jmc Exp $";
-#endif
-#endif /* not lint */
-
 /*
  * Sort sorts a file using an optional user-defined key.
  * Sort uses radix sort for internal sorting, and allows
diff --git a/usr.bin/sort/tmp.c b/usr.bin/sort/tmp.c
index c2d628e7736..b772580b1a8 100644
--- a/usr.bin/sort/tmp.c
+++ b/usr.bin/sort/tmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tmp.c,v 1.8 2008/03/19 19:25:49 kili Exp $	*/
+/*	$OpenBSD: tmp.c,v 1.9 2009/10/27 23:59:43 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -32,14 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tmp.c	8.1 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: tmp.c,v 1.8 2008/03/19 19:25:49 kili Exp $";
-#endif
-#endif /* not lint */
-
 #include <sys/param.h>
 
 #include <err.h>