aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/cat/cat.c10
-rw-r--r--bin/chflags/chflags.c10
-rw-r--r--bin/chio/chio.c8
-rw-r--r--bin/chmod/chmod.c9
-rw-r--r--bin/cp/cp.c9
-rw-r--r--bin/date/date.c9
-rw-r--r--bin/dd/dd.c9
-rw-r--r--bin/df/df.c9
-rw-r--r--bin/domainname/domainname.c9
-rw-r--r--bin/echo/echo.c9
-rw-r--r--bin/ed/main.c9
-rw-r--r--bin/hostname/hostname.c9
-rw-r--r--bin/kill/kill.c9
-rw-r--r--bin/ln/ln.c9
-rw-r--r--bin/ls/ls.c9
-rw-r--r--bin/mkdir/mkdir.c9
-rw-r--r--bin/mv/mv.c9
-rw-r--r--bin/pax/pax.c9
-rw-r--r--bin/ps/ps.c10
-rw-r--r--bin/pwd/pwd.c9
-rw-r--r--bin/rm/rm.c9
-rw-r--r--bin/rmdir/rmdir.c9
-rw-r--r--bin/sh/main.c9
-rw-r--r--bin/sh/mknodes.c9
-rw-r--r--bin/sh/mksyntax.c9
-rw-r--r--bin/sleep/sleep.c9
-rw-r--r--bin/stty/stty.c9
-rw-r--r--bin/sync/sync.c9
-rw-r--r--lib/libc/db/test/dbtest.c6
-rw-r--r--lib/libc/db/test/hash.tests/driver2.c6
-rw-r--r--lib/libc/db/test/hash.tests/tcreat3.c6
-rw-r--r--lib/libc/db/test/hash.tests/tdel.c6
-rw-r--r--lib/libc/db/test/hash.tests/thash4.c6
-rw-r--r--lib/libc/db/test/hash.tests/tread2.c6
-rw-r--r--lib/libc/db/test/hash.tests/tseq.c6
-rw-r--r--lib/libc/db/test/hash.tests/tverify.c6
-rw-r--r--lib/libc/quad/TESTS/divrem.c6
-rw-r--r--lib/libc/quad/TESTS/mul.c6
-rw-r--r--lib/libc/stdtime/strftime.c10
-rw-r--r--lib/libc/stdtime/strptime.c8
-rw-r--r--libexec/comsat/comsat.c9
-rw-r--r--libexec/fingerd/fingerd.c9
-rw-r--r--libexec/ftpd/ftpd.c12
-rw-r--r--libexec/getty/main.c9
-rw-r--r--libexec/rbootd/rbootd.c9
-rw-r--r--libexec/talkd/talkd.c9
-rw-r--r--libexec/tftpd/tftpd.c9
-rw-r--r--sbin/adjkerntz/adjkerntz.c8
-rw-r--r--sbin/bsdlabel/bsdlabel.c9
-rw-r--r--sbin/clri/clri.c10
-rw-r--r--sbin/dmesg/dmesg.c9
-rw-r--r--sbin/dump/main.c9
-rw-r--r--sbin/dumpfs/dumpfs.c9
-rw-r--r--sbin/dumpon/dumpon.c9
-rw-r--r--sbin/ffsinfo/ffsinfo.c7
-rw-r--r--sbin/fsck_ffs/globs.c9
-rw-r--r--sbin/fsck_ffs/main.c9
-rw-r--r--sbin/growfs/growfs.c8
-rw-r--r--sbin/ifconfig/ifconfig.c6
-rw-r--r--sbin/init/init.c9
-rw-r--r--sbin/mknod/mknod.c9
-rw-r--r--sbin/mount/mount.c7
-rw-r--r--sbin/mount/mount_fs.c9
-rw-r--r--sbin/mount_nfs/mount_nfs.c9
-rw-r--r--sbin/mount_nullfs/mount_nullfs.c9
-rw-r--r--sbin/mount_unionfs/mount_unionfs.c9
-rw-r--r--sbin/newfs/newfs.c9
-rw-r--r--sbin/nfsiod/nfsiod.c9
-rw-r--r--sbin/ping/ping.c9
-rw-r--r--sbin/ping/ping6.c10
-rw-r--r--sbin/ping/utils.c9
-rw-r--r--sbin/quotacheck/quotacheck.c9
-rw-r--r--sbin/reboot/reboot.c9
-rw-r--r--sbin/restore/main.c10
-rw-r--r--sbin/route/route.c10
-rw-r--r--sbin/routed/main.c3
-rw-r--r--sbin/routed/rtquery/rtquery.c14
-rw-r--r--sbin/shutdown/shutdown.c9
-rw-r--r--sbin/swapon/swapon.c9
-rw-r--r--sbin/tunefs/tunefs.c9
-rw-r--r--sbin/umount/umount.c9
-rw-r--r--usr.bin/banner/banner.c10
-rw-r--r--usr.bin/basename/basename.c10
-rw-r--r--usr.bin/biff/biff.c10
-rw-r--r--usr.bin/bintrans/uudecode.c9
-rw-r--r--usr.bin/bintrans/uuencode.c9
-rw-r--r--usr.bin/caesar/caesar.c9
-rw-r--r--usr.bin/calendar/calendar.c10
-rw-r--r--usr.bin/calendar/io.c10
-rw-r--r--usr.bin/calendar/pom.c9
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.c10
-rw-r--r--usr.bin/chpass/chpass.c9
-rw-r--r--usr.bin/cksum/cksum.c10
-rw-r--r--usr.bin/cmp/cmp.c10
-rw-r--r--usr.bin/col/col.c10
-rw-r--r--usr.bin/colrm/colrm.c10
-rw-r--r--usr.bin/column/column.c10
-rw-r--r--usr.bin/comm/comm.c10
-rw-r--r--usr.bin/compress/compress.c10
-rw-r--r--usr.bin/ctags/ctags.c10
-rw-r--r--usr.bin/dirname/dirname.c7
-rw-r--r--usr.bin/du/du.c9
-rw-r--r--usr.bin/env/env.c10
-rw-r--r--usr.bin/expand/expand.c9
-rw-r--r--usr.bin/false/false.c7
-rw-r--r--usr.bin/find/main.c6
-rw-r--r--usr.bin/finger/finger.c10
-rw-r--r--usr.bin/fold/fold.c10
-rw-r--r--usr.bin/fortune/fortune/fortune.c9
-rw-r--r--usr.bin/fortune/strfile/strfile.c9
-rw-r--r--usr.bin/fortune/unstr/unstr.c9
-rw-r--r--usr.bin/from/from.c9
-rw-r--r--usr.bin/gcore/gcore.c9
-rw-r--r--usr.bin/gprof/gprof.c10
-rw-r--r--usr.bin/gzip/gzip.c6
-rw-r--r--usr.bin/head/head.c9
-rw-r--r--usr.bin/hexdump/hexdump.c9
-rw-r--r--usr.bin/id/id.c9
-rw-r--r--usr.bin/join/join.c9
-rw-r--r--usr.bin/jot/jot.c9
-rw-r--r--usr.bin/kdump/kdump.c9
-rw-r--r--usr.bin/ktrace/ktrace.c10
-rw-r--r--usr.bin/lam/lam.c9
-rw-r--r--usr.bin/last/last.c7
-rw-r--r--usr.bin/lastcomm/lastcomm.c9
-rw-r--r--usr.bin/leave/leave.c9
-rw-r--r--usr.bin/locate/bigram/locate.bigram.c10
-rw-r--r--usr.bin/locate/code/locate.code.c9
-rw-r--r--usr.bin/locate/locate/locate.c10
-rw-r--r--usr.bin/lock/lock.c9
-rw-r--r--usr.bin/logger/logger.c10
-rw-r--r--usr.bin/logname/logname.c7
-rw-r--r--usr.bin/look/look.c9
-rw-r--r--usr.bin/mail/main.c9
-rw-r--r--usr.bin/mesg/mesg.c9
-rw-r--r--usr.bin/mkfifo/mkfifo.c9
-rw-r--r--usr.bin/mkstr/mkstr.c10
-rw-r--r--usr.bin/morse/morse.c5
-rw-r--r--usr.bin/msgs/msgs.c10
-rw-r--r--usr.bin/mt/mt.c10
-rw-r--r--usr.bin/netstat/main.c10
-rw-r--r--usr.bin/nfsstat/nfsstat.c9
-rw-r--r--usr.bin/nice/nice.c10
-rw-r--r--usr.bin/nl/nl.c7
-rw-r--r--usr.bin/nohup/nohup.c9
-rw-r--r--usr.bin/number/number.c9
-rw-r--r--usr.bin/paste/paste.c10
-rw-r--r--usr.bin/pom/pom.c9
-rw-r--r--usr.bin/pr/pr.c10
-rw-r--r--usr.bin/primes/primes.c9
-rw-r--r--usr.bin/printenv/printenv.c10
-rw-r--r--usr.bin/printf/printf.c11
-rw-r--r--usr.bin/quota/quota.c7
-rw-r--r--usr.bin/random/random.c9
-rw-r--r--usr.bin/renice/renice.c10
-rw-r--r--usr.bin/rev/rev.c10
-rw-r--r--usr.bin/ruptime/ruptime.c8
-rw-r--r--usr.bin/rwall/rwall.c8
-rw-r--r--usr.bin/rwho/rwho.c10
-rw-r--r--usr.bin/script/script.c6
-rw-r--r--usr.bin/sed/main.c8
-rw-r--r--usr.bin/showmount/showmount.c9
-rw-r--r--usr.bin/split/split.c8
-rw-r--r--usr.bin/su/su.c10
-rw-r--r--usr.bin/tail/tail.c7
-rw-r--r--usr.bin/talk/talk.c8
-rw-r--r--usr.bin/tcopy/tcopy.c8
-rw-r--r--usr.bin/tee/tee.c9
-rw-r--r--usr.bin/tftp/main.c10
-rw-r--r--usr.bin/time/time.c9
-rw-r--r--usr.bin/tip/tip/remote.c10
-rw-r--r--usr.bin/tip/tip/tip.c10
-rw-r--r--usr.bin/touch/touch.c8
-rw-r--r--usr.bin/tr/tr.c8
-rw-r--r--usr.bin/true/true.c7
-rw-r--r--usr.bin/tsort/tsort.c8
-rw-r--r--usr.bin/tty/tty.c10
-rw-r--r--usr.bin/ul/ul.c9
-rw-r--r--usr.bin/uname/uname.c8
-rw-r--r--usr.bin/unexpand/unexpand.c8
-rw-r--r--usr.bin/uniq/uniq.c9
-rw-r--r--usr.bin/vgrind/regexp.c8
-rw-r--r--usr.bin/vgrind/vfontedpr.c8
-rw-r--r--usr.bin/vmstat/vmstat.c10
-rw-r--r--usr.bin/w/w.c8
-rw-r--r--usr.bin/wall/wall.c8
-rw-r--r--usr.bin/wc/wc.c10
-rw-r--r--usr.bin/what/what.c8
-rw-r--r--usr.bin/whois/whois.c10
-rw-r--r--usr.bin/write/write.c10
-rw-r--r--usr.bin/xargs/xargs.c9
-rw-r--r--usr.bin/xinstall/xinstall.c10
-rw-r--r--usr.bin/xstr/xstr.c7
-rw-r--r--usr.bin/yes/yes.c9
-rw-r--r--usr.sbin/accton/accton.c9
-rw-r--r--usr.sbin/arp/arp.c9
-rw-r--r--usr.sbin/bluetooth/btpand/btpand.c4
-rw-r--r--usr.sbin/chown/chown.c10
-rw-r--r--usr.sbin/chroot/chroot.c9
-rw-r--r--usr.sbin/config/main.cc9
-rw-r--r--usr.sbin/cron/cron/globals.h3
-rw-r--r--usr.sbin/edquota/edquota.c10
-rw-r--r--usr.sbin/inetd/inetd.c9
-rw-r--r--usr.sbin/lpr/filters/lpf.c9
-rw-r--r--usr.sbin/lpr/lpc/cmds.c9
-rw-r--r--usr.sbin/lpr/lpc/lpc.c9
-rw-r--r--usr.sbin/lpr/lpd/lpd.c9
-rw-r--r--usr.sbin/lpr/lpd/printjob.c9
-rw-r--r--usr.sbin/lpr/lpd/recvjob.c9
-rw-r--r--usr.sbin/lpr/lpq/lpq.c9
-rw-r--r--usr.sbin/lpr/lpr/lpr.c9
-rw-r--r--usr.sbin/lpr/lprm/lprm.c9
-rw-r--r--usr.sbin/lpr/lptest/lptest.c9
-rw-r--r--usr.sbin/lpr/pac/pac.c9
-rw-r--r--usr.sbin/mountd/mountd.c10
-rw-r--r--usr.sbin/nfsd/nfsd.c9
-rw-r--r--usr.sbin/pstat/pstat.c9
-rw-r--r--usr.sbin/pwd_mkdb/pwd_mkdb.c10
-rw-r--r--usr.sbin/quotaon/quotaon.c9
-rw-r--r--usr.sbin/rarpd/rarpd.c8
-rw-r--r--usr.sbin/repquota/repquota.c9
-rw-r--r--usr.sbin/rmt/rmt.c9
-rw-r--r--usr.sbin/rwhod/rwhod.c10
-rw-r--r--usr.sbin/sa/main.c8
-rw-r--r--usr.sbin/syslogd/syslogd.c10
-rw-r--r--usr.sbin/traceroute6/traceroute6.c9
-rw-r--r--usr.sbin/vipw/vipw.c9
227 files changed, 0 insertions, 2003 deletions
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 7b39caa84d00..852617010ce2 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -32,16 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-#endif
-
-#ifndef lint
-#endif /* not lint */
#include <sys/cdefs.h>
#include <sys/capsicum.h>
#include <sys/param.h>
diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index 6704f569cd33..b92d5b6439f5 100644
--- a/bin/chflags/chflags.c
+++ b/bin/chflags/chflags.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index eaa46775edac..4feafe5ce720 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -35,14 +35,6 @@
* Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
- "@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved.";
-#endif /* not lint */
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/chio.h>
#include <err.h>
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index 67dc03e1f99d..78bf3137b9ed 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index f8610229e4c8..1510943ab5f6 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* Cp copies source files to target files.
*
diff --git a/bin/date/date.c b/bin/date/date.c
index abc51c307f47..9f6a2336de97 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1985, 1987, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index a2997ea12249..ca79b684bf1e 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -33,15 +33,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/capsicum.h>
diff --git a/bin/df/df.c b/bin/df/df.c
index f59b21963eb2..db5b8b18beae 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -34,15 +34,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mount.h>
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index 54be99392865..dbf8f9b8d29b 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <err.h>
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index b2e82e9990d9..b8f7507c416e 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/bin/ed/main.c b/bin/ed/main.c
index bddf6c1e9c2c..fefb83b7bc71 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -26,15 +26,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-#if 0
-static const char copyright[] =
-"@(#) Copyright (c) 1993 Andrew Moore, Talke Studio. \n\
- All rights reserved.\n";
-#endif
-#endif /* not lint */
-
-#include <sys/cdefs.h>
/*
* CREDITS
*
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 3b2d51230955..c122656ec237 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <err.h>
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 500f9384cbb9..f3d323a1ff49 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -33,15 +33,6 @@
* as a builtin for /bin/sh (#define SHELL).
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <ctype.h>
#include <err.h>
#include <errno.h>
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index 3481d40ccb4f..2a4597b5fe36 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 1bd5b7f2c88d..6af7715fa5f0 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -32,15 +32,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 */
-
-#if 0
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index 725d88235645..e67c99ce2a3a 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1983, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 1104a2710174..1dee9348cc3b 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/acl.h>
#include <sys/param.h>
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index 1a42013e4923..70611e54be95 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -33,15 +33,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 075856187ded..cbee10c20d53 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -36,16 +36,6 @@
* ------+---------+---------+-------- + --------+---------+---------+---------*
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/jail.h>
#include <sys/proc.h>
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 4edef62fe961..a49c638b1dee 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index c139955e2174..16bbf7403fd4 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/stat.h>
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 9e27c9832c07..c5d3db831309 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/bin/sh/main.c b/bin/sh/main.c
index b4759b67ee0c..23147c1db0be 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <stdio.h>
#include <signal.h>
#include <sys/stat.h>
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index 4fbf01906cb3..0c5dfb1accfb 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* This program reads the nodetypes file and nodes.c.pat file. It generates
* the files nodes.h and nodes.c.
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index a8a671ffa0a9..60570d0f60a4 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* This program creates syntax.h and syntax.c.
*/
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index 7922ebff661b..20e525ce093c 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -27,15 +27,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <capsicum_helpers.h>
#include <err.h>
#include <errno.h>
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index ecee736cccab..38834aaccea0 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -27,15 +27,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1989, 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <ctype.h>
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index 7eb4368531d3..7560e794d35f 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -27,15 +27,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c
index 233153e88ef8..8ce8239f41b6 100644
--- a/lib/libc/db/test/dbtest.c
+++ b/lib/libc/db/test/dbtest.c
@@ -29,12 +29,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 */
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/lib/libc/db/test/hash.tests/driver2.c b/lib/libc/db/test/hash.tests/driver2.c
index d557968b0191..eb05a6da2dab 100644
--- a/lib/libc/db/test/hash.tests/driver2.c
+++ b/lib/libc/db/test/hash.tests/driver2.c
@@ -32,12 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
/*
* Test driver, to try to tackle the large ugly-split problem.
*/
diff --git a/lib/libc/db/test/hash.tests/tcreat3.c b/lib/libc/db/test/hash.tests/tcreat3.c
index 8c6f930e22d4..163992dd17a6 100644
--- a/lib/libc/db/test/hash.tests/tcreat3.c
+++ b/lib/libc/db/test/hash.tests/tcreat3.c
@@ -32,12 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
diff --git a/lib/libc/db/test/hash.tests/tdel.c b/lib/libc/db/test/hash.tests/tdel.c
index 3488f23ac4c1..78a5618995a9 100644
--- a/lib/libc/db/test/hash.tests/tdel.c
+++ b/lib/libc/db/test/hash.tests/tdel.c
@@ -32,12 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <db.h>
diff --git a/lib/libc/db/test/hash.tests/thash4.c b/lib/libc/db/test/hash.tests/thash4.c
index 311ddcf00c5e..8dfdf003eafe 100644
--- a/lib/libc/db/test/hash.tests/thash4.c
+++ b/lib/libc/db/test/hash.tests/thash4.c
@@ -32,12 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <sys/timeb.h>
diff --git a/lib/libc/db/test/hash.tests/tread2.c b/lib/libc/db/test/hash.tests/tread2.c
index 2d175f46ffae..eead3b3105f0 100644
--- a/lib/libc/db/test/hash.tests/tread2.c
+++ b/lib/libc/db/test/hash.tests/tread2.c
@@ -32,12 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
diff --git a/lib/libc/db/test/hash.tests/tseq.c b/lib/libc/db/test/hash.tests/tseq.c
index c96b118f4f57..5b27d80881e9 100644
--- a/lib/libc/db/test/hash.tests/tseq.c
+++ b/lib/libc/db/test/hash.tests/tseq.c
@@ -32,12 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
diff --git a/lib/libc/db/test/hash.tests/tverify.c b/lib/libc/db/test/hash.tests/tverify.c
index 4b42d045724f..6a2342c96bd9 100644
--- a/lib/libc/db/test/hash.tests/tverify.c
+++ b/lib/libc/db/test/hash.tests/tverify.c
@@ -32,12 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
diff --git a/lib/libc/quad/TESTS/divrem.c b/lib/libc/quad/TESTS/divrem.c
index 4a213f7a26e6..728c0786f464 100644
--- a/lib/libc/quad/TESTS/divrem.c
+++ b/lib/libc/quad/TESTS/divrem.c
@@ -33,12 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <stdio.h>
main()
diff --git a/lib/libc/quad/TESTS/mul.c b/lib/libc/quad/TESTS/mul.c
index 3d4657fafb26..9306284f3faf 100644
--- a/lib/libc/quad/TESTS/mul.c
+++ b/lib/libc/quad/TESTS/mul.c
@@ -33,12 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <stdio.h>
main()
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
index 8196f1bd81f6..8e0bbcb6d1df 100644
--- a/lib/libc/stdtime/strftime.c
+++ b/lib/libc/stdtime/strftime.c
@@ -20,16 +20,6 @@
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-#ifndef NOID
-static const char elsieid[] = "@(#)strftime.3 8.3";
-/*
- * Based on the UCB version with the ID appearing below.
- * This is ANSIish only when "multibyte character == plain character".
- */
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
#include "namespace.h"
#include "private.h"
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index 848b94545dd2..c988d968d580 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -37,14 +37,6 @@
* official policies, either expressed or implied, of Powerdog Industries.
*/
-#include <sys/cdefs.h>
-#ifndef lint
-#ifndef NOID
-static char copyright[] __unused =
-"@(#) Copyright (c) 1994 Powerdog Industries. All rights reserved.";
-static char sccsid[] __unused = "@(#)strptime.c 0.1 (Powerdog) 94/03/27";
-#endif /* !defined NOID */
-#endif /* not lint */
#include "namespace.h"
#include <time.h>
#include <ctype.h>
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index 6d3c47d2761f..2d2141238a4e 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index 79a006ec99a3..c30d5e5e0ef5 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index d71ba541578e..8004d51a4579 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -29,18 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-#endif
-
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
/*
* FTP server.
*/
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 29bd7532a913..0e8a08f81b5f 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/time.h>
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index 5b2a37365ce5..4eb945741a0d 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -40,15 +40,6 @@
* Author: Jeff Forys, University of Utah CSS
*/
-#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
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
#include <ctype.h>
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index 10232ba34522..356985a08a8e 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
/*
* The top level of the daemon, the format is heavily borrowed
* from rwhod.c. Basically: find out who and where you are;
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index 92dd6c44370d..9b56029797ec 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
/*
* Trivial file transfer protocol server.
*
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index 7ed46f9c4d85..b231e1647b33 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -26,14 +26,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#)Copyright (C) 1993-1996 by Andrey A. Chernov, Moscow, Russia.\n\
- All rights reserved.\n";
-#endif /* not lint */
-#endif
-#include <sys/cdefs.h>
/*
* Andrey A. Chernov <ache@astral.msk.su> Dec 20 1993
*
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index bc0dec3bc399..2c03117e344a 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -42,15 +42,6 @@
* from: $NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk $
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <stdint.h>
#include <sys/file.h>
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 8eeafbda70af..331975b4cdce 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -32,16 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/disklabel.h>
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index 4e243d2f51cd..65005a903154 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/msgbuf.h>
#include <sys/sysctl.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 945c38e519ac..0ff622125fdd 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/mount.h>
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 9eb1cba26824..c4988ded88d8 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -44,15 +44,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/time.h>
#include <sys/disklabel.h>
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 20a9246496ae..dd772ca75049 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/disk.h>
diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c
index 539cbd1631e1..f2b25e582bda 100644
--- a/sbin/ffsinfo/ffsinfo.c
+++ b/sbin/ffsinfo/ffsinfo.c
@@ -41,13 +41,6 @@
*
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz\n\
-Copyright (c) 1980, 1989, 1993 The Regents of the University of California.\n\
-All rights reserved.\n";
-#endif /* not lint */
-
/* ********************************************************** INCLUDES ***** */
#include <sys/param.h>
#include <sys/disklabel.h>
diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c
index 8c69b8db44ea..1f04311e2e5c 100644
--- a/sbin/fsck_ffs/globs.c
+++ b/sbin/fsck_ffs/globs.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1986, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 63446f63a110..aabab489573e 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1986, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#define _WANT_P_OSREL
#include <sys/param.h>
#include <sys/file.h>
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index a63002271af1..daa3931df300 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -45,14 +45,6 @@
*
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz\n\
-Copyright (c) 1980, 1989, 1993 The Regents of the University of California.\n\
-All rights reserved.\n";
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index cd91cf7991bc..5ee41bb24b71 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -29,12 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/ioctl.h>
#ifdef JAIL
diff --git a/sbin/init/init.c b/sbin/init/init.c
index a78bfac073da..b6908f19fd82 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/boottrace.h>
#include <sys/ioctl.h>
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index aeee4c12508f..a9eb65e7a76c 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -32,15 +32,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
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 0b22056118aa..c950574719ad 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -29,13 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#define _WANT_MNTOPTNAMES
#include <sys/mount.h>
diff --git a/sbin/mount/mount_fs.c b/sbin/mount/mount_fs.c
index b7000c46e576..6035857578ae 100644
--- a/sbin/mount/mount_fs.c
+++ b/sbin/mount/mount_fs.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 0c01c41b4290..e4c469eff0ae 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/linker.h>
#include <sys/module.h>
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index dbaa295d5df2..b5782dc24e45 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/stat.h>
diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c
index ff5650efb02e..28f224ae0f68 100644
--- a/sbin/mount_unionfs/mount_unionfs.c
+++ b/sbin/mount_unionfs/mount_unionfs.c
@@ -35,15 +35,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/uio.h>
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 820874b5570a..38781368e8ca 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -38,15 +38,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1989, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* newfs: friendly front end to mkfs
*/
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 330f5efce784..c34671a8c551 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/syslog.h>
#include <sys/wait.h>
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 5c97496aa1f9..d9d544bc75c8 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#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 */
-
-#endif
-#include <sys/cdefs.h>
/*
* P I N G . C
*
diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c
index 50254c3eeeb0..99de4f608d69 100644
--- a/sbin/ping/ping6.c
+++ b/sbin/ping/ping6.c
@@ -65,16 +65,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#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 */
-
-#endif
-
-#include <sys/cdefs.h>
/*
* Using the InterNet Control Message Protocol (ICMP) "ECHO" facility,
* measure round-trip-delays and packet loss across network paths.
diff --git a/sbin/ping/utils.c b/sbin/ping/utils.c
index 1488fdfeb06c..e723f690be2b 100644
--- a/sbin/ping/utils.c
+++ b/sbin/ping/utils.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#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 */
-
-#endif
-#include <sys/cdefs.h>
#include <string.h>
#include "utils.h"
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 952c101a6034..1fb4789ae348 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* Fix up / report on disk quotas & usage
*/
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index 5cfbacef1849..7daf38b88a3e 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1986, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/boottrace.h>
#include <sys/reboot.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 64862ecf17c6..f94b37503d18 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 60379e11d090..c39a13b252bb 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1989, 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/file.h>
#include <sys/socket.h>
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 491a40026345..49be52ccbdf4 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -35,9 +35,6 @@
#include <fcntl.h>
#include <sys/file.h>
-__COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993 "
- "The Regents of the University of California."
- " All rights reserved.");
pid_t mypid;
naddr myaddr; /* system address */
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index a6896b8e7362..24946a2b4c7a 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -50,20 +50,6 @@
#endif
#define UNUSED __attribute__((unused))
-#ifndef __COPYRIGHT
-#define __COPYRIGHT(_s) static const char copyright[] UNUSED = _s
-#endif
-__COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n"
- "The Regents of the University of California."
- " All rights reserved.\n");
-#ifdef __NetBSD__
-__RCSID("$NetBSD$");
-#elif defined(__FreeBSD__)
-#else
-__RCSID("$Revision: 2.26 $");
-#ident "$Revision: 2.26 $"
-#endif
-
#ifndef sgi
#define _HAVE_SIN_LEN
#endif
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 9e01d54ae21d..80a9e14fc8d3 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/boottrace.h>
#include <sys/resource.h>
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 039356541b78..26a7dc22654a 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/disk.h>
#include <sys/disklabel.h>
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index 803ef1c7aab4..6f6df8446cd9 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* tunefs: change layout parameters to an existing file system.
*/
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index 097f558e7f13..7db3c5ec39e0 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/socket.h>
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index 9cf21905487f..fcd41eafaadb 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
/*
* banner - prints large signs
* banner [-w#] [-d] [-t] message ...
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index 354f9f4542fe..31d7c2ab4175 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <capsicum_helpers.h>
#include <err.h>
#include <libgen.h>
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 601e10a8fa55..b1cdd5186e7e 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/stat.h>
#include <err.h>
diff --git a/usr.bin/bintrans/uudecode.c b/usr.bin/bintrans/uudecode.c
index e58d20631f94..56128d230b00 100644
--- a/usr.bin/bintrans/uudecode.c
+++ b/usr.bin/bintrans/uudecode.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* uudecode [file ...]
*
diff --git a/usr.bin/bintrans/uuencode.c b/usr.bin/bintrans/uuencode.c
index d8d5dd4228d0..221811c56d4d 100644
--- a/usr.bin/bintrans/uuencode.c
+++ b/usr.bin/bintrans/uuencode.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* uuencode [input] output
*
diff --git a/usr.bin/caesar/caesar.c b/usr.bin/caesar/caesar.c
index fdd531034092..011f9c8e0630 100644
--- a/usr.bin/caesar/caesar.c
+++ b/usr.bin/caesar/caesar.c
@@ -35,15 +35,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#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 */
-
-#endif
-#include <sys/cdefs.h>
#include <errno.h>
#include <math.h>
#include <stdio.h>
diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 2c9b90051abf..7610ad034759 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -29,16 +29,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
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index e11527e4bc86..978027895dfe 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -29,16 +29,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
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/usr.bin/calendar/pom.c b/usr.bin/calendar/pom.c
index 7f10f93ada4d..188dae09ffd3 100644
--- a/usr.bin/calendar/pom.c
+++ b/usr.bin/calendar/pom.c
@@ -31,15 +31,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#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 */
-
-#endif
-#include <sys/cdefs.h>
/*
* Phase of the Moon. Calculates the current phase of the moon.
* Based on routines from `Practical Astronomy with Your Calculator',
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 20ea20347815..7ee6d2ddd2b3 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -29,16 +29,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
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index b2d3050bf253..e0d1945dd080 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -40,15 +40,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 19da7c22de90..ce69246e1861 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -32,16 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index c0b20bb32d5e..c22e4d4121ac 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 95b5127316b5..6665bf8e7f9b 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -32,16 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 8eafaf3c4ad3..ffedc429eeb1 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <err.h>
#include <errno.h>
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index 5971e821e90f..d1322312f8fa 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -29,16 +29,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
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/param.h>
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index f12ae24813da..b8fb10ccddb4 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -32,16 +32,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
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <err.h>
#include <limits.h>
#include <locale.h>
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index 2fada92e2c3e..005f1b5a97e1 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -29,16 +29,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
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index a3bd7222939a..1f8966a409db 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index c08d13825f5c..ff2310b4bb27 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -29,13 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <capsicum_helpers.h>
#include <err.h>
#include <libgen.h>
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 80d67df85998..cda2470ccca9 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -32,15 +32,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
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index c76851b92a87..762c5dc4d551 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 3af04c456266..08104926a78d 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <ctype.h>
#include <err.h>
#include <locale.h>
diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c
index 2522ecf88230..2a0129159755 100644
--- a/usr.bin/false/false.c
+++ b/usr.bin/false/false.c
@@ -29,13 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#include <sys/cdefs.h>
int
main(void)
{
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index cc21f77740d4..746bd91d80b7 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -32,12 +32,6 @@
* SUCH DAMAGE.
*/
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 29cc67326290..406d65541df4 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -42,16 +42,6 @@
* login time is < 6 days.
*/
-#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 */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
/*
* Finger prints out information about users. It is not portable since
* certain fields (e.g. the full user name, office, and phone numbers) are
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 0cf5913ef637..4487a21485c3 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -32,16 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <err.h>
#include <limits.h>
#include <locale.h>
diff --git a/usr.bin/fortune/fortune/fortune.c b/usr.bin/fortune/fortune/fortune.c
index 6afb29208bac..4989f11f1085 100644
--- a/usr.bin/fortune/fortune/fortune.c
+++ b/usr.bin/fortune/fortune/fortune.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1986, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/stat.h>
#include <sys/endian.h>
diff --git a/usr.bin/fortune/strfile/strfile.c b/usr.bin/fortune/strfile/strfile.c
index d9af60cac15d..e389b621c638 100644
--- a/usr.bin/fortune/strfile/strfile.c
+++ b/usr.bin/fortune/strfile/strfile.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#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 */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
#include <ctype.h>
diff --git a/usr.bin/fortune/unstr/unstr.c b/usr.bin/fortune/unstr/unstr.c
index df29f4851aa2..7cf7e1321cd7 100644
--- a/usr.bin/fortune/unstr/unstr.c
+++ b/usr.bin/fortune/unstr/unstr.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* This program un-does what "strfile" makes, thereby obtaining the
* original file again. This can be invoked with the name of the output
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index e9ecfc737294..031803ebae16 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <ctype.h>
#include <err.h>
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 0c526dbec589..956d012d04d0 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -29,15 +29,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 */
-
-#if 0
-#endif
-#include <sys/cdefs.h>
/*
* Originally written by Eric Cooper in Fall 1981.
* Inspired by a version 6 program by Len Levin, 1978.
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index bee63b40b698..044567d09269 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <err.h>
#include <limits.h>
#include <stdint.h>
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c
index 8eddac4adcdd..fd8026af6a81 100644
--- a/usr.bin/gzip/gzip.c
+++ b/usr.bin/gzip/gzip.c
@@ -30,12 +30,6 @@
*
*/
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008,\
- 2009, 2010, 2011, 2015, 2017 Matthew R. Green. All rights reserved.");
-#endif /* not lint */
-
/*
* gzip.c -- GPL free gzip using zlib.
*
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index 3c5c78dfa4c8..598d54b1c1ed 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/capsicum.h>
#include <sys/types.h>
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index 513235c12cb9..7fd6ff107afd 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -29,15 +29,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
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index b68e6a62c56c..dfd2e89a7e78 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mac.h>
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index a931b18475b2..09263ea16c22 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -33,15 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <err.h>
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 1f732f692a76..b77e3943a45c 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif
-#include <sys/cdefs.h>
/*
* jot - print sequential or random data
*
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index fdcc5429a6c7..ce68f4522e0f 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#define _WANT_KERNEL_ERRNO
#ifdef __LP64__
#define _WANT_KEVENT32
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 627da65b138f..fcc50fd7f9ca 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 45aebe21a987..68cb4b946575 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
/*
* lam - laminate files
* Author: John Kunze, UCB
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index 116fc10855eb..c6b1b646ab70 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -30,13 +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 */
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/queue.h>
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index ad27491e29a0..36ef0bbb992e 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/acct.h>
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 10548805b227..c83eb02a0b8e 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <err.h>
#include <ctype.h>
#include <locale.h>
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index a6bbe1aa19ae..494aa2299c7d 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -35,16 +35,6 @@
* locate.bigram - list bigrams for /usr/libexec/locate.mklocatedb script
*/
-#if 0
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-
-
#include <capsicum_helpers.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index cfd63a859b07..08bbee9a2b1f 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -33,15 +33,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-
/*
* PURPOSE: sorted list compressor (works with a modified 'find'
* to encode/decode a filename database)
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index aa2c5af4f3d2..f2b78f9a3501 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -33,16 +33,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1995-1996 Wolfram Schneider, Berlin.\n\
-@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
/*
* Ref: Usenix ;login:, Vol 8, No 1, February/March, 1983, p. 8.
*
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 4644939c789f..f2f13f6e56f8 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
/*
* Lock a terminal up until the given key is entered or the given
* interval times out.
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index ca6263b22233..d16f387291e6 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/capsicum.h>
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index 35040d8a0fdd..e5eb81ff61ed 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -29,13 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <capsicum_helpers.h>
#include <err.h>
#include <unistd.h>
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index ac7a200841c7..9486fed65b56 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
/*
* look -- find lines in a sorted list.
*
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index edd7848dfbe6..86a1a964ac3c 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include "rcv.h"
#include <fcntl.h>
#include "extern.h"
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index cbe39a8e37ad..833cf6f036df 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -34,15 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 0bec097a36d8..9fdc298f980d 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 446ff48a185c..43ddd5fb5574 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <err.h>
#include <errno.h>
#include <stdio.h>
diff --git a/usr.bin/morse/morse.c b/usr.bin/morse/morse.c
index 8e9a616746ce..7d9fcde1e5e3 100644
--- a/usr.bin/morse/morse.c
+++ b/usr.bin/morse/morse.c
@@ -32,11 +32,6 @@
* <lyndon@orthanc.ca>
*/
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-
-
#include <sys/time.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index 21a0d9356d12..c9183df27610 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
/*
* msgs - a user bulletin board program
*
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index 7d98e95bf8da..266bf88c0f72 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -59,16 +59,6 @@
* Authors: Ken Merry (Spectra Logic Corporation)
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
/*
* mt --
* magnetic tape manipulation program
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index c7f6b3672d8e..b5d8754777cb 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1983, 1988, 1993\n\
- Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/file.h>
#ifdef JAIL
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index fbb104d21fc0..7802754cc0c7 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -60,15 +60,6 @@
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/module.h>
#include <sys/mount.h>
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index 9a65290f0e50..d6fda3fc3884 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -29,16 +29,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 */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index de4314155ff1..a6a14239f582 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -29,13 +29,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT(
-"@(#) Copyright (c) 1999\
- The NetBSD Foundation, Inc. All rights reserved.");
-#endif
-
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index d81e56508ed8..8300836c857b 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#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 */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/number/number.c b/usr.bin/number/number.c
index c8cd7c1321bb..1a1123ec7f94 100644
--- a/usr.bin/number/number.c
+++ b/usr.bin/number/number.c
@@ -27,15 +27,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 59774ad35e94..8114a85a869a 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -32,16 +32,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 */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/pom/pom.c b/usr.bin/pom/pom.c
index 94bea3d207cb..db0033373b47 100644
--- a/usr.bin/pom/pom.c
+++ b/usr.bin/pom/pom.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#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 */
-
-#endif
-#include <sys/cdefs.h>
/*
* Phase of the Moon. Calculates the current phase of the moon.
* Based on routines from `Practical Astronomy with Your Calculator',
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 6cd690ee6004..7f08d3cd8b71 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -37,16 +37,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
diff --git a/usr.bin/primes/primes.c b/usr.bin/primes/primes.c
index b2c866d1a6da..d556a19a1553 100644
--- a/usr.bin/primes/primes.c
+++ b/usr.bin/primes/primes.c
@@ -30,15 +30,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
-#endif /* not lint */
-
/*
* primes - generate a table of primes between two values
*
diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index 833adbc46bae..43dbdb0c1378 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 7c51decd483c..4d12caee154a 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -36,17 +36,6 @@
* and as a builtin for /bin/sh (#define SHELL).
*/
-#ifndef SHELL
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-#endif
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 89ad45cb9d91..dd061d54809b 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -32,13 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
/*
* Disk quota reporting program.
*/
diff --git a/usr.bin/random/random.c b/usr.bin/random/random.c
index 86107e422e0e..3c45da0b92ac 100644
--- a/usr.bin/random/random.c
+++ b/usr.bin/random/random.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 5f8dcfdb4e4d..4931a39c0f67 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index 926f2e4b12dc..4bb113d4b532 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <err.h>
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 8c6dde8b527c..4978e928b5e7 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <protocols/rwhod.h>
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 3227ab7e051e..f4df2580d166 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
-
-
-#include <sys/cdefs.h>
/*
* This program is not related to David Wall, whose Stanford Ph.D. thesis
* is entitled "Mechanisms for Broadcast and Selective Broadcast".
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index 350070fa4bd2..debc1f8567f1 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -30,16 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <sys/capsicum.h>
#include <sys/param.h>
#include <sys/file.h>
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 8e183be07603..a1fd6967c35c 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -31,12 +31,6 @@
*/
#include <sys/param.h>
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 055112ebceb7..7cc01eb18147 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/param.h>
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 83c060c44133..df067c36e678 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993, 1995\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/file.h>
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index 669e95da4933..0241637c93ad 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 224068316f66..312a248b11f5 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -59,16 +59,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index 6b97c6395e1e..ce16e10b1be7 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -33,13 +33,6 @@
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <sys/capsicum.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 5d4cb7ef6e9c..3aaa79373b32 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
#include <locale.h>
#include <unistd.h>
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index bbbf2abeb18c..aa39bce77845 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1985, 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index d9b35c8f4f3c..384fabf40f33 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/capsicum.h>
#include <sys/queue.h>
#include <sys/stat.h>
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index ce228e40f3ee..8e36c9e04f9b 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
/*
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index e1de269dfd73..92148ab2e35b 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/resource.h>
#include <sys/signal.h>
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 97d48db4165c..00ce25f52b5c 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -33,16 +33,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#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
-#endif /* not lint */
-
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 991ce9fc86c3..9315bffddc84 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -32,16 +32,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
/*
* tip - UNIX link to other systems
* tip [-v] [-speed] system-name
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index bd6b810f94fd..b43420e4f3ef 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index a7450e72f7cc..d31a51a73542 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <sys/types.h>
#include <sys/capsicum.h>
diff --git a/usr.bin/true/true.c b/usr.bin/true/true.c
index 107620e376b0..5ff915d5e820 100644
--- a/usr.bin/true/true.c
+++ b/usr.bin/true/true.c
@@ -29,13 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-
int
main(void)
{
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 88f86f1de098..1be014f8125d 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -32,14 +32,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 */
-
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index ffc517589b0c..a77dca6ca653 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index b5b28a44a25e..68a320b398b7 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <err.h>
#include <locale.h>
#include <stdio.h>
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index b15eee1afaaf..131d4d25088e 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -34,14 +34,6 @@
* SUCH DAMAGE.
*/
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <sys/param.h>
#include <sys/sysctl.h>
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index aa8cfb335db6..cab933cd9d13 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
/*
* unexpand - put tabs into a file replacing blanks
*/
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 576e3899c2de..55766f7e987e 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -32,15 +32,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
-#endif /* not lint */
-
#include <sys/capsicum.h>
#include <capsicum_helpers.h>
diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index 1b11d9bf4bee..0cd616569ae2 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -30,14 +30,6 @@
* SUCH DAMAGE.
*/
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <ctype.h>
#include <stdlib.h>
#include <stdbool.h>
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index aeaa8e855ca8..9a45ec35253b 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 058430b56bcb..f0da9044c204 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1986, 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/uio.h>
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 35e3da26d1cb..8bce6d8427e6 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
/*
* w - print system status (who and what)
*
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 1c74336935ca..fcfcdcb3fbce 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
/*
* This program is not related to David Wall, whose Stanford Ph.D. thesis
* is entitled "Mechanisms for Broadcast and Selective Broadcast".
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index e6607b6dcf66..7cb72212d1cb 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1991, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/capsicum.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index ccbbb7411c59..9ebefe02d842 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -29,14 +29,6 @@
* SUCH DAMAGE.
*/
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <err.h>
#include <stdbool.h>
#include <stdio.h>
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 6223d7a4daf5..5d88cf4d9821 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/poll.h>
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index 15a5916c0c03..cbdc34ec0f4f 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -32,16 +32,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
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/filio.h>
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 3973cc2d0da9..d2c7d087645f 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -34,15 +34,6 @@
* $xMach: xargs.c,v 1.6 2002/02/23 05:27:47 tim Exp $
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/time.h>
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 89e2a9fe225f..66f2c165c683 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -30,16 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mman.h>
#include <sys/mount.h>
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index a9bfe86381c1..39acc77333b9 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -30,13 +30,6 @@
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif
-
-
#include <sys/types.h>
#include <ctype.h>
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index e19da42ff7bc..d9e896b6ea27 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1987, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <capsicum_helpers.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c
index 545a7543c1a3..98f5e9861286 100644
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <err.h>
#include <stdio.h>
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 62f4ebf156d7..562d982196c3 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1984, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* arp - display, set, and delete arp table entries
*/
diff --git a/usr.sbin/bluetooth/btpand/btpand.c b/usr.sbin/bluetooth/btpand/btpand.c
index 0d2eece68747..d4bc15823290 100644
--- a/usr.sbin/bluetooth/btpand/btpand.c
+++ b/usr.sbin/bluetooth/btpand/btpand.c
@@ -28,10 +28,6 @@
*/
-#include <sys/cdefs.h>
-__COPYRIGHT("@(#) Copyright (c) 2008 Iain Hibbert. All rights reserved.");
-__RCSID("$NetBSD: btpand.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
-
#include <sys/wait.h>
#define L2CAP_SOCKET_CHECKED
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index dfcb6bd230ff..4e497714c1b3 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index 57a7f2acaa74..32becaf12588 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/procctl.h>
diff --git a/usr.sbin/config/main.cc b/usr.sbin/config/main.cc
index 1e61a44c1d71..0c0b9bb27dc3 100644
--- a/usr.sbin/config/main.cc
+++ b/usr.sbin/config/main.cc
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
diff --git a/usr.sbin/cron/cron/globals.h b/usr.sbin/cron/cron/globals.h
index 3d1797905590..77b9bf7798ae 100644
--- a/usr.sbin/cron/cron/globals.h
+++ b/usr.sbin/cron/cron/globals.h
@@ -30,9 +30,6 @@
XTRN const char *copyright[]
#ifdef MAIN_PROGRAM
= {
- "@(#) Copyright 1988,1989,1990,1993,1994 by Paul Vixie",
- "@(#) Copyright 1997 by Internet Software Consortium",
- "@(#) All rights reserved",
NULL
}
#endif
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index b71508955b8b..6c209cd23716 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -32,16 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-
-#include <sys/cdefs.h>
/*
* Disk quota editor.
*/
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 13ee4b91d650..2ebc9fe02a81 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1983, 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n");
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
/*
* Inetd - Internet super-server
*
diff --git a/usr.sbin/lpr/filters/lpf.c b/usr.sbin/lpr/filters/lpf.c
index 361f86e69831..5a036de4fb6d 100644
--- a/usr.sbin/lpr/filters/lpf.c
+++ b/usr.sbin/lpr/filters/lpf.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* filter which reads the output of nroff and converts lines
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index 820fda1b44e5..30e091577732 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* lpc -- line printer control program -- commands:
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index 0412ce5ebb70..a3da852de46e 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
#include <sys/param.h>
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 1821b6f0a0f7..b78077dfa225 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* lpd -- line printer daemon.
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 90fba40ead9f..1c6736097492 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* printjob -- print jobs in the queue.
diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c
index 495f2877cafe..f103829b19e8 100644
--- a/usr.sbin/lpr/lpd/recvjob.c
+++ b/usr.sbin/lpr/lpd/recvjob.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* Receive printer jobs from the network, queue them and
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 7cb8f06504e0..6899b691ee3a 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* Spool Queue examination program
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 6f1cfe30500f..7d71bb2fa45c 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -39,15 +39,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1989, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* lpr -- off line print
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 5cfba40f5b5f..fd7b5ccec365 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* lprm - remove the current user's spool entry
diff --git a/usr.sbin/lpr/lptest/lptest.c b/usr.sbin/lpr/lptest/lptest.c
index 26816f38ccde..771652de4892 100644
--- a/usr.sbin/lpr/lptest/lptest.c
+++ b/usr.sbin/lpr/lptest/lptest.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
#include <stdlib.h>
#include <stdio.h>
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 1d1cc74ff5c0..1cc0e050a99e 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -30,15 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
#include "lp.cdefs.h" /* A cross-platform version of <sys/cdefs.h> */
/*
* Do Printer accounting summary.
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index 7de7715be899..73a4dbfe39b3 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -32,16 +32,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*/
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index 9e4c8065dff7..563a36983547 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -32,15 +32,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
-#endif /* not lint */
-
#include <sys/param.h>
#include <sys/syslog.h>
#include <sys/wait.h>
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index bcb007301fd7..aab7e902cc4c 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -36,15 +36,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/file.h>
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 7180d2397f1a..6e3cc6cf9604 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -29,16 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1991, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/stat.h>
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 9d07bdc1b328..724eb42fc358 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* Turn quota on/off for a filesystem.
*/
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index 14b45c1d8996..6281fbfd0c6b 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -16,14 +16,6 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1991, 1992, 1993, 1996\n\
-The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-#endif
-#include <sys/cdefs.h>
/*
* rarpd - Reverse ARP Daemon
*
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 2d24fa0beb06..e5ae7832f0a6 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -32,15 +32,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* Quota report
*/
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index 41c07601b9e4..3746a63810eb 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -29,15 +29,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#endif
-#include <sys/cdefs.h>
/*
* rmt
*/
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 216ecd885bfa..2f589e2492e3 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -30,16 +30,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#if 0
-#endif
-
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/ioctl.h>
diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c
index e19fc00aaa90..e36f082e0e6c 100644
--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@@ -30,14 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if 0
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1994 Christopher G. Demetriou\n\
- All rights reserved.\n";
-#endif
-#endif
-#include <sys/cdefs.h>
/*
* sa: system accounting
*/
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 37f0d69e2f4d..7770e97e7a2d 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -56,16 +56,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1988, 1993, 1994\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
-#include <sys/cdefs.h>
/*
* syslogd -- log system messages
*
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index 68e1bae3004f..c6f7279691de 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -63,15 +63,6 @@
* SUCH DAMAGE.
*/
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
- The Regents of the University of California. All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#endif /* not lint */
-
/*
* traceroute host - trace the route ip packets follow going to "host".
*
diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c
index 5b64a51b337c..7e5e760bf3c5 100644
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@@ -36,15 +36,6 @@
* SUCH DAMAGE.
*/
-#if 0
-#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 */
-
-#endif
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/stat.h>