summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/cat/cat.c16
-rw-r--r--bin/chmod/chmod.c16
-rw-r--r--bin/cp/utils.c10
-rw-r--r--bin/csh/alloc.c10
-rw-r--r--bin/csh/char.c10
-rw-r--r--bin/csh/const.c10
-rw-r--r--bin/csh/csh.c16
-rw-r--r--bin/csh/dir.c10
-rw-r--r--bin/csh/dol.c10
-rw-r--r--bin/csh/error.c10
-rw-r--r--bin/csh/exec.c10
-rw-r--r--bin/csh/exp.c10
-rw-r--r--bin/csh/file.c10
-rw-r--r--bin/csh/func.c10
-rw-r--r--bin/csh/glob.c10
-rw-r--r--bin/csh/hist.c10
-rw-r--r--bin/csh/init.c10
-rw-r--r--bin/csh/lex.c10
-rw-r--r--bin/csh/misc.c10
-rw-r--r--bin/csh/parse.c10
-rw-r--r--bin/csh/proc.c10
-rw-r--r--bin/csh/sem.c10
-rw-r--r--bin/csh/set.c17
-rw-r--r--bin/csh/str.c10
-rw-r--r--bin/csh/time.c10
-rw-r--r--bin/date/date.c16
-rw-r--r--bin/date/netdate.c10
-rw-r--r--bin/dd/args.c10
-rw-r--r--bin/dd/conv.c10
-rw-r--r--bin/dd/conv_tab.c10
-rw-r--r--bin/dd/dd.c16
-rw-r--r--bin/dd/misc.c10
-rw-r--r--bin/dd/position.c10
-rw-r--r--bin/df/df.c16
-rw-r--r--bin/df/ffs_df.c8
-rw-r--r--bin/domainname/domainname.c16
-rw-r--r--bin/echo/echo.c16
-rw-r--r--bin/ed/buf.c10
-rw-r--r--bin/ed/cbc.c10
-rw-r--r--bin/ed/glbl.c10
-rw-r--r--bin/ed/io.c10
-rw-r--r--bin/ed/main.c16
-rw-r--r--bin/ed/re.c10
-rw-r--r--bin/ed/sub.c10
-rw-r--r--bin/ed/undo.c10
-rw-r--r--bin/hostname/hostname.c16
-rw-r--r--bin/kill/kill.c16
-rw-r--r--bin/ksh/mknod.c16
-rw-r--r--bin/ln/ln.c16
-rw-r--r--bin/ls/cmp.c10
-rw-r--r--bin/ls/ls.c16
-rw-r--r--bin/ls/print.c10
-rw-r--r--bin/ls/util.c10
-rw-r--r--bin/md5/crc.c6
-rw-r--r--bin/mkdir/mkdir.c16
-rw-r--r--bin/mt/mt.c16
-rw-r--r--bin/mt/mtrmt.c9
-rw-r--r--bin/mv/mv.c16
-rw-r--r--bin/pax/ar_io.c10
-rw-r--r--bin/pax/ar_subs.c10
-rw-r--r--bin/pax/buf_subs.c10
-rw-r--r--bin/pax/cache.c10
-rw-r--r--bin/pax/cpio.c10
-rw-r--r--bin/pax/file_subs.c10
-rw-r--r--bin/pax/ftree.c10
-rw-r--r--bin/pax/gen_subs.c10
-rw-r--r--bin/pax/getoldopt.c6
-rw-r--r--bin/pax/options.c10
-rw-r--r--bin/pax/pat_rep.c10
-rw-r--r--bin/pax/pax.c16
-rw-r--r--bin/pax/sel_subs.c10
-rw-r--r--bin/pax/tables.c10
-rw-r--r--bin/pax/tar.c10
-rw-r--r--bin/pax/tty_subs.c10
-rw-r--r--bin/ps/keyword.c10
-rw-r--r--bin/ps/nlist.c10
-rw-r--r--bin/ps/print.c10
-rw-r--r--bin/ps/ps.c16
-rw-r--r--bin/pwd/pwd.c16
-rw-r--r--bin/rcp/rcp.c16
-rw-r--r--bin/rcp/util.c10
-rw-r--r--bin/rm/rm.c16
-rw-r--r--bin/rmail/rmail.c16
-rw-r--r--bin/rmdir/rmdir.c16
-rw-r--r--bin/sleep/sleep.c16
-rw-r--r--bin/stty/cchar.c10
-rw-r--r--bin/stty/gfmt.c10
-rw-r--r--bin/stty/key.c10
-rw-r--r--bin/stty/modes.c10
-rw-r--r--bin/stty/print.c10
-rw-r--r--bin/stty/stty.c16
-rw-r--r--bin/sync/sync.c16
-rw-r--r--bin/test/test.c6
93 files changed, 93 insertions, 991 deletions
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index dabf2a4356b..399db63d71a 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cat.c,v 1.19 2007/07/17 07:10:22 jmc Exp $ */
+/* $OpenBSD: cat.c,v 1.20 2009/10/27 23:59:19 deraadt Exp $ */
/* $NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $ */
/*
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95";
-#else
-static char rcsid[] = "$OpenBSD: cat.c,v 1.19 2007/07/17 07:10:22 jmc Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index 9fe51a1c3df..4e568381c81 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chmod.c,v 1.24 2009/01/21 16:05:39 sobrado Exp $ */
+/* $OpenBSD: chmod.c,v 1.25 2009/10/27 23:59:20 deraadt Exp $ */
/* $NetBSD: chmod.c,v 1.12 1995/03/21 09:02:09 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94";
-#else
-static const char rcsid[] = "$OpenBSD: chmod.c,v 1.24 2009/01/21 16:05:39 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 1fa8a358282..4a28cd50b2e 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utils.c,v 1.29 2007/09/22 21:10:49 sobrado Exp $ */
+/* $OpenBSD: utils.c,v 1.30 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94";
-#else
-static char rcsid[] = "$OpenBSD: utils.c,v 1.29 2007/09/22 21:10:49 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mman.h>
diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c
index 0c46215593e..92f65780408 100644
--- a/bin/csh/alloc.c
+++ b/bin/csh/alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: alloc.c,v 1.9 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: alloc.c,v 1.10 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: alloc.c,v 1.6 1995/03/21 09:02:23 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)alloc.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: alloc.c,v 1.9 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/bin/csh/char.c b/bin/csh/char.c
index 8cf8bfa0435..a97fa35737f 100644
--- a/bin/csh/char.c
+++ b/bin/csh/char.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: char.c,v 1.3 2003/06/02 23:32:06 millert Exp $ */
+/* $OpenBSD: char.c,v 1.4 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: char.c,v 1.6 1995/03/21 09:02:26 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)char.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: char.c,v 1.3 2003/06/02 23:32:06 millert Exp $";
-#endif
-#endif /* not lint */
-
#include "char.h"
unsigned short _cmap[256] = {
diff --git a/bin/csh/const.c b/bin/csh/const.c
index b5bb162f99e..f3a7b93f260 100644
--- a/bin/csh/const.c
+++ b/bin/csh/const.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: const.c,v 1.5 2003/06/02 23:32:06 millert Exp $ */
+/* $OpenBSD: const.c,v 1.6 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: const.c,v 1.6 1995/03/21 09:02:31 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)const.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: const.c,v 1.5 2003/06/02 23:32:06 millert Exp $";
-#endif
-#endif /* not lint */
-
/*
* tc.const.c: String constants for csh.
*/
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 6a693cfca3f..9c9d7dac2be 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: csh.c,v 1.24 2006/10/18 21:20:39 deraadt Exp $ */
+/* $OpenBSD: csh.c,v 1.25 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
-#else
-static char rcsid[] = "$OpenBSD: csh.c,v 1.24 2006/10/18 21:20:39 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/bin/csh/dir.c b/bin/csh/dir.c
index 5b658c45552..499f6df7818 100644
--- a/bin/csh/dir.c
+++ b/bin/csh/dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dir.c,v 1.13 2003/09/25 15:29:06 millert Exp $ */
+/* $OpenBSD: dir.c,v 1.14 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dir.c,v 1.13 2003/09/25 15:29:06 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index aca71c79bf7..fcb4819c997 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dol.c,v 1.15 2005/02/25 16:07:10 deraadt Exp $ */
+/* $OpenBSD: dol.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: dol.c,v 1.15 2005/02/25 16:07:10 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/bin/csh/error.c b/bin/csh/error.c
index 7fb5739ccee..3c6239257e5 100644
--- a/bin/csh/error.c
+++ b/bin/csh/error.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: error.c,v 1.8 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: error.c,v 1.9 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: err.c,v 1.6 1995/03/21 09:02:47 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: error.c,v 1.8 2008/05/17 23:31:52 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index b517813b140..fb5061e93ea 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.c,v 1.14 2005/02/25 16:07:10 deraadt Exp $ */
+/* $OpenBSD: exec.c,v 1.15 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95";
-#else
-static char rcsid[] = "$OpenBSD: exec.c,v 1.14 2005/02/25 16:07:10 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <dirent.h>
diff --git a/bin/csh/exp.c b/bin/csh/exp.c
index 0f4145af032..d66ee283c35 100644
--- a/bin/csh/exp.c
+++ b/bin/csh/exp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exp.c,v 1.7 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: exp.c,v 1.8 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: exp.c,v 1.7 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
diff --git a/bin/csh/file.c b/bin/csh/file.c
index 2c06bdf344f..c8fa07395ac 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.15 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: file.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94";
-#else
-static char rcsid[] = "$OpenBSD: file.c,v 1.15 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#ifdef FILEC
#include <sys/param.h>
diff --git a/bin/csh/func.c b/bin/csh/func.c
index 7c5834f4986..786fd778d5e 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: func.c,v 1.24 2004/08/08 12:55:28 millert Exp $ */
+/* $OpenBSD: func.c,v 1.25 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: func.c,v 1.24 2004/08/08 12:55:28 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <signal.h>
diff --git a/bin/csh/glob.c b/bin/csh/glob.c
index c886c699994..ecdff678306 100644
--- a/bin/csh/glob.c
+++ b/bin/csh/glob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glob.c,v 1.12 2003/06/25 21:12:39 deraadt Exp $ */
+/* $OpenBSD: glob.c,v 1.13 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.12 2003/06/25 21:12:39 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <glob.h>
#include <errno.h>
diff --git a/bin/csh/hist.c b/bin/csh/hist.c
index ba251d91e40..bdfcaf5511c 100644
--- a/bin/csh/hist.c
+++ b/bin/csh/hist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hist.c,v 1.7 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: hist.c,v 1.8 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: hist.c,v 1.7 1995/03/21 18:35:44 mycroft Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: hist.c,v 1.7 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdlib.h>
#include <stdarg.h>
diff --git a/bin/csh/init.c b/bin/csh/init.c
index 1384c6fee78..ddc447a37c0 100644
--- a/bin/csh/init.c
+++ b/bin/csh/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.6 2003/06/23 16:42:15 deraadt Exp $ */
+/* $OpenBSD: init.c,v 1.7 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: init.c,v 1.6 1995/03/21 09:03:05 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.6 2003/06/23 16:42:15 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <stdarg.h>
#include "csh.h"
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index 271bf35a867..2ea507e3ad7 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.13 2005/02/25 16:07:10 deraadt Exp $ */
+/* $OpenBSD: lex.c,v 1.14 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: lex.c,v 1.13 2005/02/25 16:07:10 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/ioctl.h>
#include <termios.h>
diff --git a/bin/csh/misc.c b/bin/csh/misc.c
index 9271908cac3..f75cbfa8051 100644
--- a/bin/csh/misc.c
+++ b/bin/csh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.10 2005/12/11 02:41:01 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.10 2005/12/11 02:41:01 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/bin/csh/parse.c b/bin/csh/parse.c
index a64c699cc6f..7b833c50871 100644
--- a/bin/csh/parse.c
+++ b/bin/csh/parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.c,v 1.8 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: parse.c,v 1.9 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: parse.c,v 1.6 1995/03/21 09:03:10 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: parse.c,v 1.8 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/csh/proc.c b/bin/csh/proc.c
index b3882a9f0de..5f55b7cf6c3 100644
--- a/bin/csh/proc.c
+++ b/bin/csh/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.20 2003/09/19 03:18:52 millert Exp $ */
+/* $OpenBSD: proc.c,v 1.21 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: proc.c,v 1.20 2003/09/19 03:18:52 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/wait.h>
#include <errno.h>
diff --git a/bin/csh/sem.c b/bin/csh/sem.c
index 7a353334f42..c4d0255dadc 100644
--- a/bin/csh/sem.c
+++ b/bin/csh/sem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sem.c,v 1.15 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: sem.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: sem.c,v 1.9 1995/09/27 00:38:50 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: sem.c,v 1.15 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/bin/csh/set.c b/bin/csh/set.c
index a08a0a625ae..4476fa29381 100644
--- a/bin/csh/set.c
+++ b/bin/csh/set.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: set.c,v 1.10 2003/06/11 21:09:50 deraadt Exp $ */
+/* $OpenBSD: set.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: set.c,v 1.8 1995/03/21 18:35:52 mycroft Exp $ */
/*-
@@ -30,21 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: set.c,v 1.10 2003/06/11 21:09:50 deraadt Exp $";
-#endif
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <stdlib.h>
-#ifndef SHORT_STRINGS
-#include <string.h>
-#endif /* SHORT_STRINGS */
-#include <stdarg.h>
-
#include "csh.h"
#include "extern.h"
diff --git a/bin/csh/str.c b/bin/csh/str.c
index e05674ef5f8..44b48064ea6 100644
--- a/bin/csh/str.c
+++ b/bin/csh/str.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: str.c,v 1.14 2008/10/03 19:45:34 deraadt Exp $ */
+/* $OpenBSD: str.c,v 1.15 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: str.c,v 1.14 2008/10/03 19:45:34 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#define MALLOC_INCR 128
/*
diff --git a/bin/csh/time.c b/bin/csh/time.c
index 33a04a3ba8d..83bb020988e 100644
--- a/bin/csh/time.c
+++ b/bin/csh/time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: time.c,v 1.11 2005/02/25 16:07:10 deraadt Exp $ */
+/* $OpenBSD: time.c,v 1.12 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: time.c,v 1.7 1995/03/21 13:55:25 mycroft Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: time.c,v 1.11 2005/02/25 16:07:10 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stdarg.h>
diff --git a/bin/date/date.c b/bin/date/date.c
index 5820adb2da8..e58029c6868 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: date.c,v 1.31 2007/12/28 19:17:28 chl Exp $ */
+/* $OpenBSD: date.c,v 1.32 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: date.c,v 1.11 1995/09/07 06:21:05 jtc Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1985, 1987, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: date.c,v 1.31 2007/12/28 19:17:28 chl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index b100d20a7a7..5e720decac3 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netdate.c,v 1.17 2008/10/01 08:46:58 otto Exp $ */
+/* $OpenBSD: netdate.c,v 1.18 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: netdate.c,v 1.10 1995/09/07 06:21:06 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)netdate.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: netdate.c,v 1.17 2008/10/01 08:46:58 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/socket.h>
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 3aef61e8735..9e4d573c31a 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: args.c,v 1.17 2006/11/01 05:46:20 ray Exp $ */
+/* $OpenBSD: args.c,v 1.18 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: args.c,v 1.7 1996/03/01 01:18:58 jtc Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: args.c,v 1.17 2006/11/01 05:46:20 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index ee5e1ecc9fc..ba005a3e155 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conv.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: conv.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: conv.c,v 1.6 1996/02/20 19:29:02 jtc Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)conv.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: conv.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index 05e5c0e7896..7c08885fe21 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conv_tab.c,v 1.4 2003/06/02 23:32:07 millert Exp $ */
+/* $OpenBSD: conv_tab.c,v 1.5 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: conv_tab.c,v 1.7 1996/02/20 19:29:03 jtc Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)conv_tab.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: conv_tab.c,v 1.4 2003/06/02 23:32:07 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
/*
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 7a8a371830e..64dd3f8c79e 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dd.c,v 1.15 2007/11/10 13:45:17 chl Exp $ */
+/* $OpenBSD: dd.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: dd.c,v 1.6 1996/02/20 19:29:06 jtc Exp $ */
/*-
@@ -34,20 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: dd.c,v 1.15 2007/11/10 13:45:17 chl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index e94168b2459..b87a67cfbf9 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.15 2006/03/22 18:08:04 dhill Exp $ */
+/* $OpenBSD: misc.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: misc.c,v 1.4 1995/03/21 09:04:10 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.15 2006/03/22 18:08:04 dhill Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/uio.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index d0ea5598176..1f0a9382be9 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: position.c,v 1.9 2006/11/07 18:47:46 otto Exp $ */
+/* $OpenBSD: position.c,v 1.10 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: position.c,v 1.4 1995/03/21 09:04:12 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)position.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: position.c,v 1.9 2006/11/07 18:47:46 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/bin/df/df.c b/bin/df/df.c
index 27a4a1f552e..6ae73ca3f8c 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: df.c,v 1.49 2008/03/16 20:04:35 otto Exp $ */
+/* $OpenBSD: df.c,v 1.50 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $ */
/*
@@ -35,20 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: df.c,v 1.49 2008/03/16 20:04:35 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mount.h>
diff --git a/bin/df/ffs_df.c b/bin/df/ffs_df.c
index 358bd423723..718d8bd75fa 100644
--- a/bin/df/ffs_df.c
+++ b/bin/df/ffs_df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_df.c,v 1.12 2007/04/30 18:40:24 otto Exp $ */
+/* $OpenBSD: ffs_df.c,v 1.13 2009/10/27 23:59:21 deraadt Exp $ */
/*
* Copyright (c) 1980, 1990, 1993, 1994
@@ -34,12 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <ufs/ufs/dinode.h>
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index e295bdeb2b1..a5a38929ddc 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: domainname.c,v 1.7 2003/06/02 23:32:07 millert Exp $ */
+/* $OpenBSD: domainname.c,v 1.8 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: domainname.c,v 1.7 1995/03/21 09:04:22 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: domainname.c,v 1.7 2003/06/02 23:32:07 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <err.h>
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index b1633198ba8..fbb326c0560 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: echo.c,v 1.6 2003/06/02 23:32:07 millert Exp $ */
+/* $OpenBSD: echo.c,v 1.7 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: echo.c,v 1.6 1995/03/21 09:04:27 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: echo.c,v 1.6 2003/06/02 23:32:07 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index 0fa9735b7e1..fc1ae7f4ffe 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf.c,v 1.18 2008/02/12 07:57:29 otto Exp $ */
+/* $OpenBSD: buf.c,v 1.19 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: buf.c,v 1.15 1995/04/23 10:07:28 cgd Exp $ */
/* buf.c: This file contains the scratch-file buffer routines for the
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: buf.c,v 1.18 2008/02/12 07:57:29 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index cf8c070592b..da1304799a8 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cbc.c,v 1.15 2008/06/08 13:58:10 tobias Exp $ */
+/* $OpenBSD: cbc.c,v 1.16 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: cbc.c,v 1.9 1995/03/21 09:04:36 cgd Exp $ */
/* cbc.c: This file contains the encryption routines for the ed line editor */
@@ -36,14 +36,6 @@
* from: @(#)bdes.c 5.5 (Berkeley) 6/27/91
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: cbc.c,v 1.15 2008/06/08 13:58:10 tobias Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
#include <errno.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index d7862a31fd2..e2a4bca5045 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glbl.c,v 1.11 2007/09/03 14:26:54 deraadt Exp $ */
+/* $OpenBSD: glbl.c,v 1.12 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: glbl.c,v 1.2 1995/03/21 09:04:41 cgd Exp $ */
/* glob.c: This file contains the global command routines for the ed line
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: glbl.c,v 1.11 2007/09/03 14:26:54 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/ioctl.h>
#include <sys/wait.h>
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 25c43d37374..46dd83342b4 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.12 2007/11/06 10:22:29 chl Exp $ */
+/* $OpenBSD: io.c,v 1.13 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: io.c,v 1.2 1995/03/21 09:04:43 cgd Exp $ */
/* io.c: This file contains the i/o routines for the ed line editor */
@@ -28,14 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: io.c,v 1.12 2007/11/06 10:22:29 chl Exp $";
-#endif
-#endif /* not lint */
-
#include "ed.h"
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 6075a4a255d..a12f83aeaca 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.32 2009/01/28 22:17:30 sobrado Exp $ */
+/* $OpenBSD: main.c,v 1.33 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $ */
/* main.c: This file contains the main control and user-interface routines
@@ -29,20 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-char *copyright =
-"@(#) Copyright (c) 1993 Andrew Moore, Talke Studio. \n\
- All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.32 2009/01/28 22:17:30 sobrado Exp $";
-#endif
-#endif /* not lint */
-
/*
* CREDITS
*
diff --git a/bin/ed/re.c b/bin/ed/re.c
index b1626192529..57d0b89dca4 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: re.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: re.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: re.c,v 1.14 1995/03/21 09:04:48 cgd Exp $ */
/* re.c: This file contains the regular expression interface routines for
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: re.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "ed.h"
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index 5aaca73d392..c9b91aa9966 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sub.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: sub.c,v 1.11 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: sub.c,v 1.4 1995/03/21 09:04:50 cgd Exp $ */
/* sub.c: This file contains the substitution routines for the ed
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: sub.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "ed.h"
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index c01dc191ee1..487df5156a8 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: undo.c,v 1.9 2007/09/02 15:19:07 deraadt Exp $ */
+/* $OpenBSD: undo.c,v 1.10 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: undo.c,v 1.2 1995/03/21 09:04:52 cgd Exp $ */
/* undo.c: This file contains the undo routines for the ed line editor */
@@ -28,14 +28,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char *rcsid = "@(#)undo.c,v 1.1 1994/02/01 00:34:44 alm Exp";
-#else
-static char rcsid[] = "$OpenBSD: undo.c,v 1.9 2007/09/02 15:19:07 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include "ed.h"
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 4f1a2581d1a..6a63d7f08bf 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostname.c,v 1.7 2003/06/02 23:32:08 millert Exp $ */
+/* $OpenBSD: hostname.c,v 1.8 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: hostname.c,v 1.10 1995/09/07 06:28:40 jtc Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)hostname.c 8.2 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: hostname.c,v 1.7 2003/06/02 23:32:08 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <err.h>
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 1b8db40568f..4a356c31f7d 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kill.c,v 1.8 2003/07/29 00:24:15 deraadt Exp $ */
+/* $OpenBSD: kill.c,v 1.9 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: kill.c,v 1.11 1995/09/07 06:30:27 jtc Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: kill.c,v 1.8 2003/07/29 00:24:15 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/bin/ksh/mknod.c b/bin/ksh/mknod.c
index a336a867047..2e336a7ad13 100644
--- a/bin/ksh/mknod.c
+++ b/bin/ksh/mknod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mknod.c,v 1.1 2005/10/06 06:39:36 otto Exp $ */
+/* $OpenBSD: mknod.c,v 1.2 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: mknod.c,v 1.8 1995/08/11 00:08:18 jtc Exp $ */
/*
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mknod.c 8.1 (Berkeley) 6/5/93";
-#else
-static const char rcsid[] = "$OpenBSD: mknod.c,v 1.1 2005/10/06 06:39:36 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index ac8e7ce9040..0b0be08f7a4 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ln.c,v 1.17 2008/05/28 19:31:38 millert Exp $ */
+/* $OpenBSD: ln.c,v 1.18 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: ln.c,v 1.10 1995/03/21 09:06:10 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94";
-#else
-static const char rcsid[] = "$OpenBSD: ln.c,v 1.17 2008/05/28 19:31:38 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index 1b8ba0f70a0..fa4f11aeda6 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmp.c,v 1.5 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: cmp.c,v 1.6 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: cmp.c,v 1.10 1996/07/08 10:32:01 mycroft Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cmp.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: cmp.c,v 1.5 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index eb3a1d0e430..5b8d56a68f4 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ls.c,v 1.34 2009/05/06 18:47:32 todd Exp $ */
+/* $OpenBSD: ls.c,v 1.35 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */
/*
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94";
-#else
-static char rcsid[] = "$OpenBSD: ls.c,v 1.34 2009/05/06 18:47:32 todd Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/bin/ls/print.c b/bin/ls/print.c
index e5fac1b56b2..74178319c7d 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.25 2007/05/07 18:39:28 millert Exp $ */
+/* $OpenBSD: print.c,v 1.26 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)print.c 8.5 (Berkeley) 7/28/94";
-#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.25 2007/05/07 18:39:28 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 2fc6ee6c7ac..22f97ccb5e6 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.13 2007/04/25 08:16:10 sobrado Exp $ */
+/* $OpenBSD: util.c,v 1.14 2009/10/27 23:59:21 deraadt Exp $ */
/* $NetBSD: util.c,v 1.12 1995/09/07 06:43:02 jtc Exp $ */
/*
@@ -33,14 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)util.c 8.5 (Berkeley) 4/28/95";
-#else
-static char rcsid[] = "$OpenBSD: util.c,v 1.13 2007/04/25 08:16:10 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/md5/crc.c b/bin/md5/crc.c
index d322f342e93..bb949b95c6e 100644
--- a/bin/md5/crc.c
+++ b/bin/md5/crc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crc.c,v 1.2 2004/05/10 19:48:07 deraadt Exp $ */
+/* $OpenBSD: crc.c,v 1.3 2009/10/27 23:59:22 deraadt Exp $ */
/*
* Copyright (c) 2004 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -16,10 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: crc.c,v 1.2 2004/05/10 19:48:07 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <errno.h>
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index 719f0207b14..7e65b332706 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkdir.c,v 1.23 2008/09/30 23:25:31 millert Exp $ */
+/* $OpenBSD: mkdir.c,v 1.24 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: mkdir.c,v 1.14 1995/06/25 21:59:21 mycroft Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94";
-#else
-static char rcsid[] = "$OpenBSD: mkdir.c,v 1.23 2008/09/30 23:25:31 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/mt/mt.c b/bin/mt/mt.c
index b1d271e2321..df1d454f4f5 100644
--- a/bin/mt/mt.c
+++ b/bin/mt/mt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mt.c,v 1.29 2006/06/14 02:14:25 krw Exp $ */
+/* $OpenBSD: mt.c,v 1.30 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: mt.c,v 1.14.2.1 1996/05/27 15:12:11 mrg Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mt.c 8.2 (Berkeley) 6/6/93";
-#else
-static char rcsid[] = "$OpenBSD: mt.c,v 1.29 2006/06/14 02:14:25 krw Exp $";
-#endif
-#endif /* not lint */
-
/*
* mt --
* magnetic tape manipulation program
diff --git a/bin/mt/mtrmt.c b/bin/mt/mtrmt.c
index 38f6026078c..f17620193dd 100644
--- a/bin/mt/mtrmt.c
+++ b/bin/mt/mtrmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtrmt.c,v 1.17 2006/04/11 15:06:48 ray Exp $ */
+/* $OpenBSD: mtrmt.c,v 1.18 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: mtrmt.c,v 1.2 1996/03/06 06:22:07 scottr Exp $ */
/*-
@@ -30,13 +30,6 @@
* SUCH DAMAGE.
*/
-/*
- * This was unceremoniously ripped out of usr.sbin/dump/dumprmt.c:
- *
- * static char sccsid[] = "@(#)dumprmt.c 8.1 (Berkeley) 6/5/93";
- *
- */
-
#include <sys/param.h>
#include <sys/mtio.h>
#include <sys/ioctl.h>
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 97cb60cfbdd..979797ddff0 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mv.c,v 1.34 2007/07/27 02:49:38 ray Exp $ */
+/* $OpenBSD: mv.c,v 1.35 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: mv.c,v 1.9 1995/03/21 09:06:52 cgd Exp $ */
/*
@@ -33,20 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: mv.c,v 1.34 2007/07/27 02:49:38 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/wait.h>
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 2a833bb2f65..f230a9c8940 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_io.c,v 1.38 2008/06/11 00:49:08 pvalchev Exp $ */
+/* $OpenBSD: ar_io.c,v 1.39 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: ar_io.c,v 1.38 2008/06/11 00:49:08 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 73aefdabb48..5b5505a7e4e 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_subs.c,v 1.32 2008/05/06 06:54:28 henning Exp $ */
+/* $OpenBSD: ar_subs.c,v 1.33 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: ar_subs.c,v 1.32 2008/05/06 06:54:28 henning Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index aff311aa6f2..f64416cb146 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_subs.c,v 1.21 2005/11/09 19:59:06 otto Exp $ */
+/* $OpenBSD: buf_subs.c,v 1.22 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: buf_subs.c,v 1.21 2005/11/09 19:59:06 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 44eda1f518a..c15d61a79d0 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cache.c,v 1.17 2004/03/16 03:28:34 tedu Exp $ */
+/* $OpenBSD: cache.c,v 1.18 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: cache.c,v 1.4 1995/03/21 09:07:10 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: cache.c,v 1.17 2004/03/16 03:28:34 tedu Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 4a9796028b8..1a46cb668a3 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpio.c,v 1.18 2008/01/01 16:22:44 tobias Exp $ */
+/* $OpenBSD: cpio.c,v 1.19 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: cpio.c,v 1.18 2008/01/01 16:22:44 tobias Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index 73db1af1129..4c809064649 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file_subs.c,v 1.30 2005/11/09 19:59:06 otto Exp $ */
+/* $OpenBSD: file_subs.c,v 1.31 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.30 2005/11/09 19:59:06 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index 1ca2a7a1d63..415a4963452 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftree.c,v 1.28 2008/05/06 06:54:28 henning Exp $ */
+/* $OpenBSD: ftree.c,v 1.29 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: ftree.c,v 1.4 1995/03/21 09:07:21 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: ftree.c,v 1.28 2008/05/06 06:54:28 henning Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 7e66f62cd0a..1c6f73ee57e 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gen_subs.c,v 1.19 2007/04/04 21:55:10 millert Exp $ */
+/* $OpenBSD: gen_subs.c,v 1.20 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: gen_subs.c,v 1.19 2007/04/04 21:55:10 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index 45fdbf29fbc..8ceb189eec2 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getoldopt.c,v 1.8 2003/07/02 21:19:33 deraadt Exp $ */
+/* $OpenBSD: getoldopt.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $ */
/*
@@ -10,10 +10,6 @@
* in the Public Domain for your edification and enjoyment.
*/
-#ifndef lint
-static const char rcsid[] = "$OpenBSD: getoldopt.c,v 1.8 2003/07/02 21:19:33 deraadt Exp $";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index fa198891e54..7a5589ab6f3 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.70 2008/06/11 00:49:08 pvalchev Exp $ */
+/* $OpenBSD: options.c,v 1.71 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: options.c,v 1.70 2008/06/11 00:49:08 pvalchev Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index ff79582ce24..118c30b19ca 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pat_rep.c,v 1.30 2005/08/05 08:30:10 djm Exp $ */
+/* $OpenBSD: pat_rep.c,v 1.31 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: pat_rep.c,v 1.30 2005/08/05 08:30:10 djm Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 3c3d2b47197..f89ca349419 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pax.c,v 1.28 2005/08/04 10:02:44 mpf Exp $ */
+/* $OpenBSD: pax.c,v 1.29 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $ */
/*-
@@ -34,20 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: pax.c,v 1.28 2005/08/04 10:02:44 mpf Exp $";
-#endif
-#endif /* not lint */
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/param.h>
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 55d3a0017c1..625547d506a 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sel_subs.c,v 1.18 2004/04/16 22:50:23 deraadt Exp $ */
+/* $OpenBSD: sel_subs.c,v 1.19 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: sel_subs.c,v 1.18 2004/04/16 22:50:23 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index e428051c3da..50bd89b53ec 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tables.c,v 1.25 2007/09/02 15:19:08 deraadt Exp $ */
+/* $OpenBSD: tables.c,v 1.26 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] = "$OpenBSD: tables.c,v 1.25 2007/09/02 15:19:08 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 6a0b3b32963..234c4368b70 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tar.c,v 1.41 2006/03/04 20:24:55 otto Exp $ */
+/* $OpenBSD: tar.c,v 1.42 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: tar.c,v 1.41 2006/03/04 20:24:55 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index 6b6e13423ee..e63a221cba4 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_subs.c,v 1.13 2009/06/01 13:02:46 ray Exp $ */
+/* $OpenBSD: tty_subs.c,v 1.14 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: tty_subs.c,v 1.5 1995/03/21 09:07:52 cgd Exp $ */
/*-
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94";
-#else
-static const char rcsid[] = "$OpenBSD: tty_subs.c,v 1.13 2009/06/01 13:02:46 ray Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 6d320c5572e..e861e3a5d0d 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keyword.c,v 1.28 2008/03/08 19:20:12 millert Exp $ */
+/* $OpenBSD: keyword.c,v 1.29 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: keyword.c,v 1.28 2008/03/08 19:20:12 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index feb2cfe1a7e..ba89a6ada1d 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nlist.c,v 1.16 2008/02/10 16:56:13 kettenis Exp $ */
+/* $OpenBSD: nlist.c,v 1.17 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: nlist.c,v 1.11 1995/03/21 09:08:03 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: nlist.c,v 1.16 2008/02/10 16:56:13 kettenis Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/proc.h>
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 578461c87b4..b8ac1f03f19 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.44 2008/03/08 19:20:12 millert Exp $ */
+/* $OpenBSD: print.c,v 1.45 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
-#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.44 2008/03/08 19:20:12 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index bd10e34ac5e..7c60d4f6af8 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ps.c,v 1.46 2008/07/18 14:24:18 kevlo Exp $ */
+/* $OpenBSD: ps.c,v 1.47 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: ps.c,v 1.46 2008/07/18 14:24:18 kevlo Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/user.h>
#include <sys/time.h>
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index b02ea0a019f..fd6078408a1 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwd.c,v 1.10 2006/04/01 18:08:48 deraadt Exp $ */
+/* $OpenBSD: pwd.c,v 1.11 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: pwd.c,v 1.7 1995/03/21 09:08:18 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94";
-#else
-static char rcsid[] = "$OpenBSD: pwd.c,v 1.10 2006/04/01 18:08:48 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 5a7dc5fd665..b62ca1fb18c 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcp.c,v 1.48 2009/03/01 13:47:02 sobrado Exp $ */
+/* $OpenBSD: rcp.c,v 1.49 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1983, 1990, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] = "$OpenBSD: rcp.c,v 1.48 2009/03/01 13:47:02 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index 465ffc42c37..c96eec5bc70 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.18 2007/11/29 07:39:09 chl Exp $ */
+/* $OpenBSD: util.c,v 1.19 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: util.c,v 1.2 1995/03/21 08:19:08 cgd Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)util.c 8.2 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] = "$OpenBSD: util.c,v 1.18 2007/11/29 07:39:09 chl Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index f4ed950aa1f..10a6404fb1e 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rm.c,v 1.22 2008/06/10 17:14:16 otto Exp $ */
+/* $OpenBSD: rm.c,v 1.23 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: rm.c,v 1.19 1995/09/07 06:48:50 jtc Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rm.c 8.8 (Berkeley) 4/27/95";
-#else
-static char rcsid[] = "$OpenBSD: rm.c,v 1.22 2008/06/10 17:14:16 otto Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index bce0429adab..841cceca45c 100644
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmail.c,v 1.23 2008/05/28 16:01:42 sobrado Exp $ */
+/* $OpenBSD: rmail.c,v 1.24 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rmail.c 8.3 (Berkeley) 5/15/95";
-#else
-static char rcsid[] = "$OpenBSD: rmail.c,v 1.23 2008/05/28 16:01:42 sobrado Exp $";
-#endif
-#endif /* not lint */
-
/*
* RMAIL -- UUCP mail server.
*
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 2973461ec5a..f4d55d42f01 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmdir.c,v 1.8 2003/06/02 23:32:09 millert Exp $ */
+/* $OpenBSD: rmdir.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: rmdir.c,v 1.13 1995/03/21 09:08:31 cgd Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: rmdir.c,v 1.8 2003/06/02 23:32:09 millert Exp $";
-#endif
-#endif /* not lint */
-
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index c1c4a2bd764..337cc4d7d81 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sleep.c,v 1.18 2009/02/13 20:39:58 deraadt Exp $ */
+/* $OpenBSD: sleep.c,v 1.19 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: sleep.c,v 1.8 1995/03/21 09:11:11 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: sleep.c,v 1.18 2009/02/13 20:39:58 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <ctype.h>
#include <errno.h>
#include <locale.h>
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index 16e3eec6c78..f585a633ede 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cchar.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: cchar.c,v 1.11 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: cchar.c,v 1.10 1996/05/07 18:20:05 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)cchar.c 8.5 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: cchar.c,v 1.10 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index aee5896e66b..995e1f60283 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gfmt.c,v 1.6 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: gfmt.c,v 1.7 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: gfmt.c,v 1.10 1996/05/07 18:20:08 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)gfmt.c 8.6 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: gfmt.c,v 1.6 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/bin/stty/key.c b/bin/stty/key.c
index 5d18a565aa1..22af3088caa 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.12 2003/06/11 23:42:12 deraadt Exp $ */
+/* $OpenBSD: key.c,v 1.13 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: key.c,v 1.11 1995/09/07 06:57:11 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)key.c 8.4 (Berkeley) 2/20/95";
-#else
-static char rcsid[] = "$OpenBSD: key.c,v 1.12 2003/06/11 23:42:12 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <err.h>
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index 9c2f3161fab..fea27dc944f 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: modes.c,v 1.9 2004/09/16 09:55:09 deraadt Exp $ */
+/* $OpenBSD: modes.c,v 1.10 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: modes.c,v 1.9 1996/05/07 18:20:09 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)modes.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: modes.c,v 1.9 2004/09/16 09:55:09 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stddef.h>
#include <string.h>
diff --git a/bin/stty/print.c b/bin/stty/print.c
index 899301365bf..a765e714b9a 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.12 2006/06/04 01:35:05 deraadt Exp $ */
+/* $OpenBSD: print.c,v 1.13 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: print.c,v 1.11 1996/05/07 18:20:10 jtc Exp $ */
/*-
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
-#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.12 2006/06/04 01:35:05 deraadt Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <stddef.h>
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 26ee132c41d..210a7368393 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stty.c,v 1.12 2008/05/17 23:31:52 sobrado Exp $ */
+/* $OpenBSD: stty.c,v 1.13 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: stty.c,v 1.11 1995/03/21 09:11:30 cgd Exp $ */
/*-
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)stty.c 8.3 (Berkeley) 4/2/94";
-#else
-static char rcsid[] = "$OpenBSD: stty.c,v 1.12 2008/05/17 23:31:52 sobrado Exp $";
-#endif
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index 69b5791ee6b..1c83ed9ae06 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sync.c,v 1.6 2005/02/02 19:23:17 jolan Exp $ */
+/* $OpenBSD: sync.c,v 1.7 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: sync.c,v 1.7 1995/03/21 09:11:37 cgd Exp $ */
/*
@@ -30,20 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)sync.c 8.1 (Berkeley) 5/31/93";
-#else
-static char rcsid[] = "$OpenBSD: sync.c,v 1.6 2005/02/02 19:23:17 jolan Exp $";
-#endif
-#endif /* not lint */
-
#include <unistd.h>
int
diff --git a/bin/test/test.c b/bin/test/test.c
index 8bf5e93a7d1..23f9757eb28 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: test.c,v 1.10 2009/03/01 20:11:06 otto Exp $ */
+/* $OpenBSD: test.c,v 1.11 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: test.c,v 1.15 1995/03/21 07:04:06 cgd Exp $ */
/*
@@ -11,10 +11,6 @@
* This program is in the Public Domain.
*/
-#ifndef lint
-static char rcsid[] = "$OpenBSD: test.c,v 1.10 2009/03/01 20:11:06 otto Exp $";
-#endif
-
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>