git: 0b8224d1cc9d - main - Remove copyright strings ifdef'd out
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Nov 2023 05:24:55 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=0b8224d1cc9dc6c9778ba04a75b2c8d47e5d7481
commit 0b8224d1cc9dc6c9778ba04a75b2c8d47e5d7481
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-11-24 07:45:36 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-11-27 05:23:58 +0000
Remove copyright strings ifdef'd out
We've ifdef'd out the copyright strings for some time now. Go ahead and
remove the ifdefs. Plus whatever other detritis was left over from other
recent removals. These copyright strings are present in the comments and
are largely from CSRG's attempt at adding their copyright to every
binary file (which modern interpretations of the license doesn't
require).
Sponsored by: Netflix
---
bin/cat/cat.c | 10 ----------
bin/chflags/chflags.c | 10 ----------
bin/chio/chio.c | 8 --------
bin/chmod/chmod.c | 9 ---------
bin/cp/cp.c | 9 ---------
bin/date/date.c | 9 ---------
bin/dd/dd.c | 9 ---------
bin/df/df.c | 9 ---------
bin/domainname/domainname.c | 9 ---------
bin/echo/echo.c | 9 ---------
bin/ed/main.c | 9 ---------
bin/hostname/hostname.c | 9 ---------
bin/kill/kill.c | 9 ---------
bin/ln/ln.c | 9 ---------
bin/ls/ls.c | 9 ---------
bin/mkdir/mkdir.c | 9 ---------
bin/mv/mv.c | 9 ---------
bin/pax/pax.c | 9 ---------
bin/ps/ps.c | 10 ----------
bin/pwd/pwd.c | 9 ---------
bin/rm/rm.c | 9 ---------
bin/rmdir/rmdir.c | 9 ---------
bin/sh/main.c | 9 ---------
bin/sh/mknodes.c | 9 ---------
bin/sh/mksyntax.c | 9 ---------
bin/sleep/sleep.c | 9 ---------
bin/stty/stty.c | 9 ---------
bin/sync/sync.c | 9 ---------
lib/libc/db/test/dbtest.c | 6 ------
lib/libc/db/test/hash.tests/driver2.c | 6 ------
lib/libc/db/test/hash.tests/tcreat3.c | 6 ------
lib/libc/db/test/hash.tests/tdel.c | 6 ------
lib/libc/db/test/hash.tests/thash4.c | 6 ------
lib/libc/db/test/hash.tests/tread2.c | 6 ------
lib/libc/db/test/hash.tests/tseq.c | 6 ------
lib/libc/db/test/hash.tests/tverify.c | 6 ------
lib/libc/quad/TESTS/divrem.c | 6 ------
lib/libc/quad/TESTS/mul.c | 6 ------
lib/libc/stdtime/strftime.c | 10 ----------
lib/libc/stdtime/strptime.c | 8 --------
libexec/comsat/comsat.c | 9 ---------
libexec/fingerd/fingerd.c | 9 ---------
libexec/ftpd/ftpd.c | 12 ------------
libexec/getty/main.c | 9 ---------
libexec/rbootd/rbootd.c | 9 ---------
libexec/talkd/talkd.c | 9 ---------
libexec/tftpd/tftpd.c | 9 ---------
sbin/adjkerntz/adjkerntz.c | 8 --------
sbin/bsdlabel/bsdlabel.c | 9 ---------
sbin/clri/clri.c | 10 ----------
sbin/dmesg/dmesg.c | 9 ---------
sbin/dump/main.c | 9 ---------
sbin/dumpfs/dumpfs.c | 9 ---------
sbin/dumpon/dumpon.c | 9 ---------
sbin/ffsinfo/ffsinfo.c | 7 -------
sbin/fsck_ffs/globs.c | 9 ---------
sbin/fsck_ffs/main.c | 9 ---------
sbin/growfs/growfs.c | 8 --------
sbin/ifconfig/ifconfig.c | 6 ------
sbin/init/init.c | 9 ---------
sbin/mknod/mknod.c | 9 ---------
sbin/mount/mount.c | 7 -------
sbin/mount/mount_fs.c | 9 ---------
sbin/mount_nfs/mount_nfs.c | 9 ---------
sbin/mount_nullfs/mount_nullfs.c | 9 ---------
sbin/mount_unionfs/mount_unionfs.c | 9 ---------
sbin/newfs/newfs.c | 9 ---------
sbin/nfsiod/nfsiod.c | 9 ---------
sbin/ping/ping.c | 9 ---------
sbin/ping/ping6.c | 10 ----------
sbin/ping/utils.c | 9 ---------
sbin/quotacheck/quotacheck.c | 9 ---------
sbin/reboot/reboot.c | 9 ---------
sbin/restore/main.c | 10 ----------
sbin/route/route.c | 10 ----------
sbin/routed/main.c | 3 ---
sbin/routed/rtquery/rtquery.c | 14 --------------
sbin/shutdown/shutdown.c | 9 ---------
sbin/swapon/swapon.c | 9 ---------
sbin/tunefs/tunefs.c | 9 ---------
sbin/umount/umount.c | 9 ---------
usr.bin/banner/banner.c | 10 ----------
usr.bin/basename/basename.c | 10 ----------
usr.bin/biff/biff.c | 10 ----------
usr.bin/bintrans/uudecode.c | 9 ---------
usr.bin/bintrans/uuencode.c | 9 ---------
usr.bin/caesar/caesar.c | 9 ---------
usr.bin/calendar/calendar.c | 10 ----------
usr.bin/calendar/io.c | 10 ----------
usr.bin/calendar/pom.c | 9 ---------
usr.bin/cap_mkdb/cap_mkdb.c | 10 ----------
usr.bin/chpass/chpass.c | 9 ---------
usr.bin/cksum/cksum.c | 10 ----------
usr.bin/cmp/cmp.c | 10 ----------
usr.bin/col/col.c | 10 ----------
usr.bin/colrm/colrm.c | 10 ----------
usr.bin/column/column.c | 10 ----------
usr.bin/comm/comm.c | 10 ----------
usr.bin/compress/compress.c | 10 ----------
usr.bin/ctags/ctags.c | 10 ----------
usr.bin/dirname/dirname.c | 7 -------
usr.bin/du/du.c | 9 ---------
usr.bin/env/env.c | 10 ----------
usr.bin/expand/expand.c | 9 ---------
usr.bin/false/false.c | 7 -------
usr.bin/find/main.c | 6 ------
usr.bin/finger/finger.c | 10 ----------
usr.bin/fold/fold.c | 10 ----------
usr.bin/fortune/fortune/fortune.c | 9 ---------
usr.bin/fortune/strfile/strfile.c | 9 ---------
usr.bin/fortune/unstr/unstr.c | 9 ---------
usr.bin/from/from.c | 9 ---------
usr.bin/gcore/gcore.c | 9 ---------
usr.bin/gprof/gprof.c | 10 ----------
usr.bin/gzip/gzip.c | 6 ------
usr.bin/head/head.c | 9 ---------
usr.bin/hexdump/hexdump.c | 9 ---------
usr.bin/id/id.c | 9 ---------
usr.bin/join/join.c | 9 ---------
usr.bin/jot/jot.c | 9 ---------
usr.bin/kdump/kdump.c | 9 ---------
usr.bin/ktrace/ktrace.c | 10 ----------
usr.bin/lam/lam.c | 9 ---------
usr.bin/last/last.c | 7 -------
usr.bin/lastcomm/lastcomm.c | 9 ---------
usr.bin/leave/leave.c | 9 ---------
usr.bin/locate/bigram/locate.bigram.c | 10 ----------
usr.bin/locate/code/locate.code.c | 9 ---------
usr.bin/locate/locate/locate.c | 10 ----------
usr.bin/lock/lock.c | 9 ---------
usr.bin/logger/logger.c | 10 ----------
usr.bin/logname/logname.c | 7 -------
usr.bin/look/look.c | 9 ---------
usr.bin/mail/main.c | 9 ---------
usr.bin/mesg/mesg.c | 9 ---------
usr.bin/mkfifo/mkfifo.c | 9 ---------
usr.bin/mkstr/mkstr.c | 10 ----------
usr.bin/morse/morse.c | 5 -----
usr.bin/msgs/msgs.c | 10 ----------
usr.bin/mt/mt.c | 10 ----------
usr.bin/netstat/main.c | 10 ----------
usr.bin/nfsstat/nfsstat.c | 9 ---------
usr.bin/nice/nice.c | 10 ----------
usr.bin/nl/nl.c | 7 -------
usr.bin/nohup/nohup.c | 9 ---------
usr.bin/number/number.c | 9 ---------
usr.bin/paste/paste.c | 10 ----------
usr.bin/pom/pom.c | 9 ---------
usr.bin/pr/pr.c | 10 ----------
usr.bin/primes/primes.c | 9 ---------
usr.bin/printenv/printenv.c | 10 ----------
usr.bin/printf/printf.c | 11 -----------
usr.bin/quota/quota.c | 7 -------
usr.bin/random/random.c | 9 ---------
usr.bin/renice/renice.c | 10 ----------
usr.bin/rev/rev.c | 10 ----------
usr.bin/ruptime/ruptime.c | 8 --------
usr.bin/rwall/rwall.c | 8 --------
usr.bin/rwho/rwho.c | 10 ----------
usr.bin/script/script.c | 6 ------
usr.bin/sed/main.c | 8 --------
usr.bin/showmount/showmount.c | 9 ---------
usr.bin/split/split.c | 8 --------
usr.bin/su/su.c | 10 ----------
usr.bin/tail/tail.c | 7 -------
usr.bin/talk/talk.c | 8 --------
usr.bin/tcopy/tcopy.c | 8 --------
usr.bin/tee/tee.c | 9 ---------
usr.bin/tftp/main.c | 10 ----------
usr.bin/time/time.c | 9 ---------
usr.bin/tip/tip/remote.c | 10 ----------
usr.bin/tip/tip/tip.c | 10 ----------
usr.bin/touch/touch.c | 8 --------
usr.bin/tr/tr.c | 8 --------
usr.bin/true/true.c | 7 -------
usr.bin/tsort/tsort.c | 8 --------
usr.bin/tty/tty.c | 10 ----------
usr.bin/ul/ul.c | 9 ---------
usr.bin/uname/uname.c | 8 --------
usr.bin/unexpand/unexpand.c | 8 --------
usr.bin/uniq/uniq.c | 9 ---------
usr.bin/vgrind/regexp.c | 8 --------
usr.bin/vgrind/vfontedpr.c | 8 --------
usr.bin/vmstat/vmstat.c | 10 ----------
usr.bin/w/w.c | 8 --------
usr.bin/wall/wall.c | 8 --------
usr.bin/wc/wc.c | 10 ----------
usr.bin/what/what.c | 8 --------
usr.bin/whois/whois.c | 10 ----------
usr.bin/write/write.c | 10 ----------
usr.bin/xargs/xargs.c | 9 ---------
usr.bin/xinstall/xinstall.c | 10 ----------
usr.bin/xstr/xstr.c | 7 -------
usr.bin/yes/yes.c | 9 ---------
usr.sbin/accton/accton.c | 9 ---------
usr.sbin/arp/arp.c | 9 ---------
usr.sbin/bluetooth/btpand/btpand.c | 4 ----
usr.sbin/chown/chown.c | 10 ----------
usr.sbin/chroot/chroot.c | 9 ---------
usr.sbin/config/main.cc | 9 ---------
usr.sbin/cron/cron/globals.h | 3 ---
usr.sbin/edquota/edquota.c | 10 ----------
usr.sbin/inetd/inetd.c | 9 ---------
usr.sbin/lpr/filters/lpf.c | 9 ---------
usr.sbin/lpr/lpc/cmds.c | 9 ---------
usr.sbin/lpr/lpc/lpc.c | 9 ---------
usr.sbin/lpr/lpd/lpd.c | 9 ---------
usr.sbin/lpr/lpd/printjob.c | 9 ---------
usr.sbin/lpr/lpd/recvjob.c | 9 ---------
usr.sbin/lpr/lpq/lpq.c | 9 ---------
usr.sbin/lpr/lpr/lpr.c | 9 ---------
usr.sbin/lpr/lprm/lprm.c | 9 ---------
usr.sbin/lpr/lptest/lptest.c | 9 ---------
usr.sbin/lpr/pac/pac.c | 9 ---------
usr.sbin/mountd/mountd.c | 10 ----------
usr.sbin/nfsd/nfsd.c | 9 ---------
usr.sbin/pstat/pstat.c | 9 ---------
usr.sbin/pwd_mkdb/pwd_mkdb.c | 10 ----------
usr.sbin/quotaon/quotaon.c | 9 ---------
usr.sbin/rarpd/rarpd.c | 8 --------
usr.sbin/repquota/repquota.c | 9 ---------
usr.sbin/rmt/rmt.c | 9 ---------
usr.sbin/rwhod/rwhod.c | 10 ----------
usr.sbin/sa/main.c | 8 --------
usr.sbin/syslogd/syslogd.c | 10 ----------
usr.sbin/traceroute6/traceroute6.c | 9 ---------
usr.sbin/vipw/vipw.c | 9 ---------
227 files changed, 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
*** 3764 LINES SKIPPED ***