From 0b8224d1cc9dc6c9778ba04a75b2c8d47e5d7481 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 24 Nov 2023 00:45:36 -0700 Subject: [PATCH] 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 7b39caa84d0..852617010ce 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 #include #include diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c index 6704f569cd3..b92d5b6439f 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 #include #include diff --git a/bin/chio/chio.c b/bin/chio/chio.c index eaa46775eda..4feafe5ce72 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 #include #include #include diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c index 67dc03e1f99..78bf3137b9e 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 #include #include diff --git a/bin/cp/cp.c b/bin/cp/cp.c index f8610229e4c..1510943ab5f 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 /* * Cp copies source files to target files. * diff --git a/bin/date/date.c b/bin/date/date.c index abc51c307f4..9f6a2336de9 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 #include #include diff --git a/bin/dd/dd.c b/bin/dd/dd.c index a2997ea1224..ca79b684bf1 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 #include #include #include diff --git a/bin/df/df.c b/bin/df/df.c index f59b21963eb..db5b8b18bea 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 #include #include #include diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c index 54be9939286..dbf8f9b8d29 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 #include #include diff --git a/bin/echo/echo.c b/bin/echo/echo.c index b2e82e9990d..b8f7507c416 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 #include #include diff --git a/bin/ed/main.c b/bin/ed/main.c index bddf6c1e9c2..fefb83b7bc7 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 /* * CREDITS * diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c index 3b2d5123095..c122656ec23 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 #include #include diff --git a/bin/kill/kill.c b/bin/kill/kill.c index 500f9384cbb..f3d323a1ff4 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 #include #include #include diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 3481d40ccb4..2a4597b5fe3 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 #include #include diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 1bd5b7f2c88..6af7715fa5f 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 #include #include #include diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index 725d8823564..e67c99ce2a3 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 #include #include diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 1104a271017..1dee9348cc3 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 #include #include #include diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 1a42013e492..70611e54be9 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 #include #include #include diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 075856187de..cbee10c20d5 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 #include #include #include diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index 4edef62fe96..a49c638b1de 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 #include #include #include diff --git a/bin/rm/rm.c b/bin/rm/rm.c index c139955e217..16bbf7403fd 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 #include #include #include diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c index 9e27c9832c0..c5d3db83130 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 #include #include #include diff --git a/bin/sh/main.c b/bin/sh/main.c index b4759b67ee0..23147c1db0b 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 #include #include #include diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c index 4fbf01906cb..0c5dfb1accf 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 /* * 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 a8a671ffa0a..60570d0f60a 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 /* * This program creates syntax.h and syntax.c. */ diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index 7922ebff661..20e525ce093 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 #include #include #include diff --git a/bin/stty/stty.c b/bin/stty/stty.c index ecee736ccca..38834aaccea 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 #include #include diff --git a/bin/sync/sync.c b/bin/sync/sync.c index 7eb4368531d..7560e794d35 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 #include #include diff --git a/lib/libc/db/test/dbtest.c b/lib/libc/db/test/dbtest.c index 233153e88ef..8ce8239f41b 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 #include diff --git a/lib/libc/db/test/hash.tests/driver2.c b/lib/libc/db/test/hash.tests/driver2.c index d557968b019..eb05a6da2da 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 8c6f930e22d..163992dd17a 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 #include #include diff --git a/lib/libc/db/test/hash.tests/tdel.c b/lib/libc/db/test/hash.tests/tdel.c index 3488f23ac4c..78a5618995a 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 #include #include diff --git a/lib/libc/db/test/hash.tests/thash4.c b/lib/libc/db/test/hash.tests/thash4.c index 311ddcf00c5..8dfdf003eaf 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 #include #include diff --git a/lib/libc/db/test/hash.tests/tread2.c b/lib/libc/db/test/hash.tests/tread2.c index 2d175f46ffa..eead3b3105f 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 #include #include diff --git a/lib/libc/db/test/hash.tests/tseq.c b/lib/libc/db/test/hash.tests/tseq.c index c96b118f4f5..5b27d80881e 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 #include #include diff --git a/lib/libc/db/test/hash.tests/tverify.c b/lib/libc/db/test/hash.tests/tverify.c index 4b42d045724..6a2342c96bd 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 #include #include diff --git a/lib/libc/quad/TESTS/divrem.c b/lib/libc/quad/TESTS/divrem.c index 4a213f7a26e..728c0786f46 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 main() diff --git a/lib/libc/quad/TESTS/mul.c b/lib/libc/quad/TESTS/mul.c index 3d4657fafb2..9306284f3fa 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 main() diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c index 8196f1bd81f..8e0bbcb6d1d 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 848b94545dd..c988d968d58 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 -#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 #include diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index 6d3c47d2761..2d2141238a4 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 #include #include diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c index 79a006ec99a..c30d5e5e0ef 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 #include #include diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index d71ba541578..8004d51a457 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 /* * FTP server. */ diff --git a/libexec/getty/main.c b/libexec/getty/main.c index 29bd7532a91..0e8a08f81b5 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 #include #include #include diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c index 5b2a37365ce..4eb945741a0 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 #include #include #include diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c index 10232ba3452..356985a08a8 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 92dd6c44370..9b56029797e 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 /* * Trivial file transfer protocol server. * diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c index 7ed46f9c4d8..b231e1647b3 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 /* * Andrey A. Chernov Dec 20 1993 * diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index bc0dec3bc39..2c03117e344 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 #include #include #include diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c index 8eeafbda70a..331975b4cdc 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 #include #include diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c index 4e243d2f51c..65005a90315 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 #include #include #include diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 945c38e519a..0ff622125fd 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 #include #include diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index 9eb1cba2682..c4988ded88d 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 #include #include diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index 20a9246496a..dd772ca7504 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 #include #include #include diff --git a/sbin/ffsinfo/ffsinfo.c b/sbin/ffsinfo/ffsinfo.c index 539cbd1631e..f2b25e582bd 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 #include diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c index 8c69b8db44e..1f04311e2e5 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 #include #include #include diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 63446f63a11..aabab489573 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 #define _WANT_P_OSREL #include #include diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c index a63002271af..daa3931df30 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 #include #include #include diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index cd91cf7991b..5ee41bb24b7 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 #include #ifdef JAIL diff --git a/sbin/init/init.c b/sbin/init/init.c index a78bfac073d..b6908f19fd8 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 #include #include diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c index aeee4c12508..a9eb65e7a76 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 #include diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 0b22056118a..c950574719a 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 #include #define _WANT_MNTOPTNAMES #include diff --git a/sbin/mount/mount_fs.c b/sbin/mount/mount_fs.c index b7000c46e57..6035857578a 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 #include diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index 0c01c41b429..e4c469eff0a 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 #include #include #include diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c index dbaa295d5df..b5782dc24e4 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 #include #include diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c index ff5650efb02..28f224ae0f6 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 #include #include diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 820874b5570..38781368e8c 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 /* * newfs: friendly front end to mkfs */ diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c index 330f5efce78..c34671a8c55 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 #include #include #include diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 5c97496aa1f..d9d544bc75c 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 /* * P I N G . C * diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c index 50254c3eeeb..99de4f608d6 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 /* * 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 1488fdfeb06..e723f690be2 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 #include #include "utils.h" diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c index 952c101a603..1fb4789ae34 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 /* * Fix up / report on disk quotas & usage */ diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 5cfbacef184..7daf38b88a3 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 #include #include #include diff --git a/sbin/restore/main.c b/sbin/restore/main.c index 64862ecf17c..f94b37503d1 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 #include #include diff --git a/sbin/route/route.c b/sbin/route/route.c index 60379e11d09..c39a13b252b 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 #include #include #include diff --git a/sbin/routed/main.c b/sbin/routed/main.c index 491a4002634..49be52ccbdf 100644 --- a/sbin/routed/main.c +++ b/sbin/routed/main.c @@ -35,9 +35,6 @@ #include #include -__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 a6896b8e736..24946a2b4c7 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 9e01d54ae21..80a9e14fc8d 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 #include #include #include diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index 039356541b7..26a7dc22654 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 #include #include #include diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index 803ef1c7aab..6f6df8446cd 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 /* * tunefs: change layout parameters to an existing file system. */ diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index 097f558e7f1..7db3c5ec39e 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 #include #include diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c index 9cf21905487..fcd41eafaad 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 /* * banner - prints large signs * banner [-w#] [-d] [-t] message ... diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c index 354f9f4542f..31d7c2ab417 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 #include #include #include diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c index 601e10a8fa5..b1cdd5186e7 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 #include #include diff --git a/usr.bin/bintrans/uudecode.c b/usr.bin/bintrans/uudecode.c index e58d20631f9..56128d230b0 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 /* * uudecode [file ...] * diff --git a/usr.bin/bintrans/uuencode.c b/usr.bin/bintrans/uuencode.c index d8d5dd4228d..221811c56d4 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 /* * uuencode [input] output * diff --git a/usr.bin/caesar/caesar.c b/usr.bin/caesar/caesar.c index fdd53103409..011f9c8e063 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 #include #include #include diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index 2c9b90051ab..7610ad03475 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 #include #include #include diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c index e11527e4bc8..978027895df 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 #include #include #include diff --git a/usr.bin/calendar/pom.c b/usr.bin/calendar/pom.c index 7f10f93ada4..188dae09ffd 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 /* * 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 20ea2034781..7ee6d2ddd2b 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 #include #include diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c index b2d3050bf25..e0d1945dd08 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 #include #include diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c index 19da7c22de9..ce69246e186 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 #include #include diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index c0b20bb32d5..c22e4d4121a 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 #include #include diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c index 95b5127316b..6665bf8e7f9 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 #include #include diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index 8eafaf3c4ad..ffedc429eeb 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 #include #include #include diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c index 5971e821e90..d1322312f8f 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 #include #include #include diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c index f12ae24813d..b8fb10ccddb 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 #include #include #include diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c index 2fada92e2c3..005f1b5a97e 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 #include #include #include diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c index a3bd7222939..1f8966a409d 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 #include #include #include diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c index c08d13825f5..ff2310b4bb2 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 #include #include #include diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c index 80d67df8599..cda2470ccca 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 #include #include #include diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c index c76851b92a8..762c5dc4d55 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 #include #include diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c index 3af04c45626..08104926a78 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 #include #include #include diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c index 2522ecf8823..2a012915975 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 int main(void) { diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c index cc21f77740d..746bd91d80b 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 #include #include diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c index 29cc6732629..406d65541df 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 /* * 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 0cf5913ef63..4487a21485c 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 #include #include #include diff --git a/usr.bin/fortune/fortune/fortune.c b/usr.bin/fortune/fortune/fortune.c index 6afb29208ba..4989f11f108 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 #include #include diff --git a/usr.bin/fortune/strfile/strfile.c b/usr.bin/fortune/strfile/strfile.c index d9af60cac15..e389b621c63 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 #include #include #include diff --git a/usr.bin/fortune/unstr/unstr.c b/usr.bin/fortune/unstr/unstr.c index df29f4851aa..7cf7e1321cd 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 /* * 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 e9ecfc73729..031803ebae1 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 #include #include #include diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c index 0c526dbec58..956d012d04d 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 /* * 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 bee63b40b69..044567d0926 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 #include #include #include diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c index 8eddac4adcd..fd8026af6a8 100644 --- a/usr.bin/gzip/gzip.c +++ b/usr.bin/gzip/gzip.c @@ -30,12 +30,6 @@ * */ -#include -#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 3c5c78dfa4c..598d54b1c1e 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 #include #include diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c index 513235c12cb..7fd6ff107af 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 #include #include #include diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index b68e6a62c56..dfd2e89a7e7 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 #include #include diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index a931b18475b..09263ea16c2 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 #include #include diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c index 1f732f692a7..b77e3943a45 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 /* * jot - print sequential or random data * diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index fdcc5429a6c..ce68f4522e0 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 #define _WANT_KERNEL_ERRNO #ifdef __LP64__ #define _WANT_KEVENT32 diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c index 627da65b138..fcc50fd7f9c 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 #include #include #include diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c index 45aebe21a98..68cb4b94657 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 /* * lam - laminate files * Author: John Kunze, UCB diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index 116fc10855e..c6b1b646ab7 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 #include #include #include diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c index ad27491e29a..36ef0bbb992 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 #include #include #include diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c index 10548805b22..c83eb02a0b8 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 #include #include #include diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c index a6bbe1aa19a..494aa2299c7 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 #include #include diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c index cfd63a859b0..08bbee9a2b1 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 aa2c5af4f3d..f2b78f9a350 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 4644939c789..f2f13f6e56f 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 /* * 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 ca6263b2223..d16f387291e 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 #include #include #include diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c index 35040d8a0fd..e5eb81ff61e 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 #include #include #include diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c index ac7a200841c..9486fed65b5 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 /* * look -- find lines in a sorted list. * diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c index edd7848dfbe..86a1a964ac3 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 #include "rcv.h" #include #include "extern.h" diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c index cbe39a8e37a..833cf6f036d 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 #include #include diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c index 0bec097a36d..9fdc298f980 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 #include #include diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c index 446ff48a185..43ddd5fb557 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 #include #include #include diff --git a/usr.bin/morse/morse.c b/usr.bin/morse/morse.c index 8e9a616746c..7d9fcde1e5e 100644 --- a/usr.bin/morse/morse.c +++ b/usr.bin/morse/morse.c @@ -32,11 +32,6 @@ * */ -static const char copyright[] = -"@(#) Copyright (c) 1988, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; - - #include #include diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c index 21a0d9356d1..c9183df2761 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 /* * msgs - a user bulletin board program * diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c index 7d98e95bf8d..266bf88c0f7 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 /* * mt -- * magnetic tape manipulation program diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index c7f6b3672d8..b5d8754777c 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 #include #include #ifdef JAIL diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index fbb104d21fc..7802754cc0c 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 #include #include diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c index 9a65290f0e5..d6fda3fc388 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 #include #include #include diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c index de4314155ff..a6a14239f58 100644 --- a/usr.bin/nl/nl.c +++ b/usr.bin/nl/nl.c @@ -29,13 +29,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include -#ifndef lint -__COPYRIGHT( -"@(#) Copyright (c) 1999\ - The NetBSD Foundation, Inc. All rights reserved."); -#endif - #include #include diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c index d81e56508ed..8300836c857 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 #include #include diff --git a/usr.bin/number/number.c b/usr.bin/number/number.c index c8cd7c1321b..1a1123ec7f9 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 #include diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index 59774ad35e9..8114a85a869 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 #include #include diff --git a/usr.bin/pom/pom.c b/usr.bin/pom/pom.c index 94bea3d207c..db0033373b4 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 /* * 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 6cd690ee600..7f08d3cd8b7 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 #include #include #include diff --git a/usr.bin/primes/primes.c b/usr.bin/primes/primes.c index b2c866d1a6d..d556a19a155 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 833adbc46ba..43dbdb0c137 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 #include #include diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c index 7c51decd483..4d12caee154 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 #include diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c index 89ad45cb9d9..dd061d54809 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 86107e422e0..3c45da0b92a 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 #include #include diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c index 5f8dcfdb4e4..4931a39c0f6 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 #include #include #include diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c index 926f2e4b12d..4bb113d4b53 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 #include #include diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c index 8c6dde8b527..4978e928b5e 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 #include #include diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c index 3227ab7e051..f4df2580d16 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 /* * 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 350070fa4bd..debc1f8567f 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 #include #include #include diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index 8e183be0760..a1fd6967c35 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -31,12 +31,6 @@ */ #include -#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 #include #include diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c index 055112ebceb..7cc01eb1814 100644 --- a/usr.bin/sed/main.c +++ b/usr.bin/sed/main.c @@ -34,14 +34,6 @@ * SUCH DAMAGE. */ -#include -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1992, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif - - #include #include #include diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c index 83c060c4413..df067c36e67 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 #include #include diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 669e95da493..0241637c93a 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -29,14 +29,6 @@ * SUCH DAMAGE. */ -#include -#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 #include diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c index 224068316f6..312a248b11f 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 #include #include #include diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c index 6b97c6395e1..ce16e10b1be 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 #include #include diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c index 5d4cb7ef6e9..3aaa79373b3 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 #include diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c index bbbf2abeb18..aa39bce7784 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 #include #include diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c index d9b35c8f4f3..384fabf40f3 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 #include #include diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index ce228e40f3e..8e36c9e04f9 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 /* Many bug fixes are from Jim Guyton */ /* diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c index e1de269dfd7..92148ab2e35 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 #include #include diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c index 97d48db4165..00ce25f52b5 100644 --- a/usr.bin/tip/tip/remote.c +++ b/usr.bin/tip/tip/remote.c @@ -33,16 +33,6 @@ * SUCH DAMAGE. */ -#include -#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 #include diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c index 991ce9fc86c..9315bffddc8 100644 --- a/usr.bin/tip/tip/tip.c +++ b/usr.bin/tip/tip/tip.c @@ -32,16 +32,6 @@ * SUCH DAMAGE. */ -#include -#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 bd6b810f94f..b43420e4f3e 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 #include #include diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index a7450e72f7c..d31a51a7354 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 #include diff --git a/usr.bin/true/true.c b/usr.bin/true/true.c index 107620e376b..5ff915d5e82 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 88f86f1de09..1be014f8125 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 #include #include diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c index ffc517589b0..a77dca6ca65 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 #include #include #include diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c index b5b28a44a25..68a320b398b 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 #include #include diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c index b15eee1afaa..131d4d25088 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 #include diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c index aa8cfb335db..cab933cd9d1 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 576e3899c2d..55766f7e987 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 #include diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c index 1b11d9bf4be..0cd616569ae 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 #include #include diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c index aeaa8e855ca..9a45ec35253 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 #include #include diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 058430b56bc..f0da9044c20 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 #include #include #include diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 35e3da26d1c..8bce6d8427e 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 1c74336935c..fcfcdcb3fbc 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 e6607b6dcf6..7cb72212d1c 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 #include #include #include diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c index ccbbb7411c5..9ebefe02d84 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 #include #include diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c index 6223d7a4daf..5d88cf4d982 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 #include #include #include diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c index 15a5916c0c0..cbdc34ec0f4 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 #include #include #include diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 3973cc2d0da..d2c7d087645 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 #include #include #include diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 89e2a9fe225..66f2c165c68 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 #include #include #include diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c index a9bfe86381c..39acc77333b 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 #include diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c index e19da42ff7b..d9e896b6ea2 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 #include #include diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c index 545a7543c1a..98f5e986128 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 #include #include #include diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 62f4ebf156d..562d982196c 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 /* * 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 0d2eece6874..d4bc1582329 100644 --- a/usr.sbin/bluetooth/btpand/btpand.c +++ b/usr.sbin/bluetooth/btpand/btpand.c @@ -28,10 +28,6 @@ */ -#include -__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 #define L2CAP_SOCKET_CHECKED diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c index dfcb6bd230f..4e497714c1b 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 #include #include diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c index 57a7f2acaa7..32becaf1258 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 #include #include diff --git a/usr.sbin/config/main.cc b/usr.sbin/config/main.cc index 1e61a44c1d7..0c0b9bb27dc 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 #include #include diff --git a/usr.sbin/cron/cron/globals.h b/usr.sbin/cron/cron/globals.h index 3d179790559..77b9bf7798a 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 b71508955b8..6c209cd2371 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 /* * Disk quota editor. */ diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 13ee4b91d65..2ebc9fe02a8 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -29,15 +29,6 @@ * SUCH DAMAGE. */ -#include -#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 361f86e6983..5a036de4fb6 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 */ /* * 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 820fda1b44e..30e09157773 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 */ /* * lpc -- line printer control program -- commands: diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c index 0412ce5ebb7..a3da852de46 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 */ #include diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index 1821b6f0a0f..b78077dfa22 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 */ /* * lpd -- line printer daemon. diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index 90fba40ead9..1c673609749 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 */ /* * printjob -- print jobs in the queue. diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c index 495f2877caf..f103829b19e 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 */ /* * 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 7cb8f06504e..6899b691ee3 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 */ /* * Spool Queue examination program diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c index 6f1cfe30500..7d71bb2fa45 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 */ /* * lpr -- off line print diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c index 5cfba40f5b5..fd7b5ccec36 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 */ /* * 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 26816f38ccd..771652de489 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 */ #include #include diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 1d1cc74ff5c..1cc0e050a99 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 */ /* * Do Printer accounting summary. diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 7de7715be89..73a4dbfe39b 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 #include #include #include diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c index 9e4c8065dff..563a3698354 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 #include #include diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index bcb007301fd..aab7e902cc4 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 #include #include #include diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c index 7180d2397f1..6e3cc6cf960 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 #include #include #include diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c index 9d07bdc1b32..724eb42fc35 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 /* * Turn quota on/off for a filesystem. */ diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 14b45c1d899..6281fbfd0c6 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 /* * rarpd - Reverse ARP Daemon * diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c index 2d24fa0beb0..e5ae7832f0a 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 /* * Quota report */ diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c index 41c07601b9e..3746a63810e 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 /* * rmt */ diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index 216ecd885bf..2f589e2492e 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 #include #include #include diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c index e19fc00aaa9..e36f082e0e6 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 /* * sa: system accounting */ diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 37f0d69e2f4..7770e97e7a2 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 /* * syslogd -- log system messages * diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index 68e1bae3004..c6f7279691d 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 5b64a51b337..7e5e760bf3c 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 #include #include