diff options
93 files changed, 384 insertions, 335 deletions
diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c index bac0496a0aca..bc2ca62f3187 100644 --- a/bin/chflags/chflags.c +++ b/bin/chflags/chflags.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif +#if 0 #ifndef lint -static const char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; +static char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/lib/libpam/modules/pam_login_access/login_access.c b/lib/libpam/modules/pam_login_access/login_access.c index c058bbefc5a5..b8cdf051e434 100644 --- a/lib/libpam/modules/pam_login_access/login_access.c +++ b/lib/libpam/modules/pam_login_access/login_access.c @@ -7,14 +7,15 @@ * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #ifdef LOGIN_ACCESS +#if 0 #ifndef lint -static const char sccsid[] = "%Z% %M% %I% %E% %U%"; +static char sccsid[] = "%Z% %M% %I% %E% %U%"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <ctype.h> diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile index 48871b959aa6..362442a7d81e 100644 --- a/usr.bin/apply/Makefile +++ b/usr.bin/apply/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= apply diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c index 6926388d420b..e2f808aeb2d1 100644 --- a/usr.bin/apply/apply.c +++ b/usr.bin/apply/apply.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94"; +static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/wait.h> diff --git a/usr.bin/ar/append.c b/usr.bin/ar/append.c index 151ae0abf19e..b891b9ef7f08 100644 --- a/usr.bin/ar/append.c +++ b/usr.bin/ar/append.c @@ -34,14 +34,15 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)append.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)append.c 8.3 (Berkeley) 4/2/94"; +#endif #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c index f4bc76a5e739..b951d67266b6 100644 --- a/usr.bin/ar/ar.c +++ b/usr.bin/ar/ar.c @@ -34,19 +34,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)ar.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)ar.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/usr.bin/ar/archive.c b/usr.bin/ar/archive.c index e85695a39085..b347fb779413 100644 --- a/usr.bin/ar/archive.c +++ b/usr.bin/ar/archive.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)archive.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)archive.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/ar/contents.c b/usr.bin/ar/contents.c index 6243984d276e..c53c3235703e 100644 --- a/usr.bin/ar/contents.c +++ b/usr.bin/ar/contents.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)contents.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)contents.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/ar/delete.c b/usr.bin/ar/delete.c index 7174845b630e..53e7f926d39a 100644 --- a/usr.bin/ar/delete.c +++ b/usr.bin/ar/delete.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)delete.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)delete.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/ar/extract.c b/usr.bin/ar/extract.c index 36c31e3de6af..9d53f9705233 100644 --- a/usr.bin/ar/extract.c +++ b/usr.bin/ar/extract.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)extract.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)extract.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/time.h> diff --git a/usr.bin/ar/misc.c b/usr.bin/ar/misc.c index 5e76b192a16e..d3c3ba21280a 100644 --- a/usr.bin/ar/misc.c +++ b/usr.bin/ar/misc.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/usr.bin/ar/move.c b/usr.bin/ar/move.c index d416b8a535db..8240b5c39158 100644 --- a/usr.bin/ar/move.c +++ b/usr.bin/ar/move.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)move.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)move.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/ar/print.c b/usr.bin/ar/print.c index 6854cee2df68..19ef47e68e55 100644 --- a/usr.bin/ar/print.c +++ b/usr.bin/ar/print.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/usr.bin/ar/replace.c b/usr.bin/ar/replace.c index e14be9466bd5..3dffd04105c9 100644 --- a/usr.bin/ar/replace.c +++ b/usr.bin/ar/replace.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)replace.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)replace.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c index a909dff75e39..a9749ce00ae7 100644 --- a/usr.bin/at/at.c +++ b/usr.bin/at/at.c @@ -27,7 +27,6 @@ */ #include <sys/cdefs.h> - __FBSDID("$FreeBSD$"); #define _USE_BSD 1 diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c index 61584426ca91..8921e11e8c14 100644 --- a/usr.bin/at/panic.c +++ b/usr.bin/at/panic.c @@ -24,7 +24,6 @@ */ #include <sys/cdefs.h> - __FBSDID("$FreeBSD$"); /* System Headers */ diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c index 4d738d0c640d..4590ad120448 100644 --- a/usr.bin/at/parsetime.c +++ b/usr.bin/at/parsetime.c @@ -34,7 +34,6 @@ */ #include <sys/cdefs.h> - __FBSDID("$FreeBSD$"); /* System Headers */ diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c index b22b3abbb3b0..91176b471249 100644 --- a/usr.bin/at/perm.c +++ b/usr.bin/at/perm.c @@ -24,7 +24,6 @@ */ #include <sys/cdefs.h> - __FBSDID("$FreeBSD$"); /* System Headers */ diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c index c39c087b4e39..81388d8c0841 100644 --- a/usr.bin/banner/banner.c +++ b/usr.bin/banner/banner.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95"; +static char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * banner - prints large signs diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c index c7e4b47e5e2c..cc407c953f0b 100644 --- a/usr.bin/basename/basename.c +++ b/usr.bin/basename/basename.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95"; +static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95"; #endif /* not lint */ +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <libgen.h> diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c index 9b198b1e3e19..a32b57dae7b2 100644 --- a/usr.bin/biff/biff.c +++ b/usr.bin/biff/biff.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93"; +static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c index 451dcd3c530b..90d4416d7455 100644 --- a/usr.bin/brandelf/brandelf.c +++ b/usr.bin/brandelf/brandelf.c @@ -28,7 +28,6 @@ */ #include <sys/cdefs.h> - __FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/c89/c89.c b/usr.bin/c89/c89.c index d47f2ad41fef..82d64275ed84 100644 --- a/usr.bin/c89/c89.c +++ b/usr.bin/c89/c89.c @@ -28,7 +28,6 @@ */ #include <sys/cdefs.h> - __FBSDID("$FreeBSD$"); #include <err.h> diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index 8a900f9512e4..dc5b6d982147 100644 --- a/usr.bin/calendar/calendar.c +++ b/usr.bin/calendar/calendar.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; +static char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <errno.h> diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c index 44f8bb400368..2216b56d84c8 100644 --- a/usr.bin/calendar/day.c +++ b/usr.bin/calendar/day.c @@ -32,7 +32,6 @@ */ #include <sys/cdefs.h> - __FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c index 51b539c75ed5..c590886ea564 100644 --- a/usr.bin/calendar/io.c +++ b/usr.bin/calendar/io.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; +static char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/param.h> diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c index bf7f366a81a5..f000f7d5311b 100644 --- a/usr.bin/calendar/ostern.c +++ b/usr.bin/calendar/ostern.c @@ -25,7 +25,6 @@ */ #include <sys/cdefs.h> - __FBSDID("$FreeBSD$"); #include <stdio.h> diff --git a/usr.bin/calendar/paskha.c b/usr.bin/calendar/paskha.c index c5b31ba5008f..3999d31c92bb 100644 --- a/usr.bin/calendar/paskha.c +++ b/usr.bin/calendar/paskha.c @@ -25,7 +25,6 @@ */ #include <sys/cdefs.h> - __FBSDID("$FreeBSD$"); #include <stdio.h> diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c index 31813b37e5a2..8b111b1663a1 100644 --- a/usr.bin/cap_mkdb/cap_mkdb.c +++ b/usr.bin/cap_mkdb/cap_mkdb.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)cap_mkdb.c 8.1 (Berkeley) 6/6/93"; +static char sccsid[] = "@(#)cap_mkdb.c 8.1 (Berkeley) 6/6/93"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/chflags/chflags.c b/usr.bin/chflags/chflags.c index bac0496a0aca..bc2ca62f3187 100644 --- a/usr.bin/chflags/chflags.c +++ b/usr.bin/chflags/chflags.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; #endif +#if 0 #ifndef lint -static const char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; +static char sccsid[] = "@(#)chflags.c 8.5 (Berkeley) 4/1/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/usr.bin/chkey/chkey.c b/usr.bin/chkey/chkey.c index 68d3ae840eac..06875ceafbb0 100644 --- a/usr.bin/chkey/chkey.c +++ b/usr.bin/chkey/chkey.c @@ -28,13 +28,14 @@ * Mountain View, California 94043 */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)chkey.c 1.7 91/03/11 Copyr 1986 Sun Micro"; +static char sccsid[] = "@(#)chkey.c 1.7 91/03/11 Copyr 1986 Sun Micro"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Copyright (C) 1986, Sun Microsystems, Inc. diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile index 90a4c8e17c20..c6f9ebebe2e4 100644 --- a/usr.bin/cmp/Makefile +++ b/usr.bin/cmp/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= cmp SRCS= cmp.c misc.c regular.c special.c diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index 7a3d514a7fd8..ca732c6325e5 100644 --- a/usr.bin/cmp/cmp.c +++ b/usr.bin/cmp/cmp.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c index 1d5db6cf4491..1211f3b6f3b4 100644 --- a/usr.bin/cmp/misc.c +++ b/usr.bin/cmp/misc.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c index f8345cab2519..014657e45987 100644 --- a/usr.bin/cmp/regular.c +++ b/usr.bin/cmp/regular.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/mman.h> diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c index 5fe0ed18b09f..f08cae58fcb8 100644 --- a/usr.bin/cmp/special.c +++ b/usr.bin/cmp/special.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c index 402bcf530e5e..85a6eac6579a 100644 --- a/usr.bin/col/col.c +++ b/usr.bin/col/col.c @@ -34,19 +34,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95"; +static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <err.h> diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c index ccfb1793d923..b6705702c2dd 100644 --- a/usr.bin/colcrt/colcrt.c +++ b/usr.bin/colcrt/colcrt.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)colcrt.c 8.1 (Berkeley) 6/6/93"; +static char sccsid[] = "@(#)colcrt.c 8.1 (Berkeley) 6/6/93"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <stdio.h> diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index 16035cc02944..226c2fe6fd58 100644 --- a/usr.bin/colrm/colrm.c +++ b/usr.bin/colrm/colrm.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95"; +static char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <err.h> diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c index 21bff28d31ca..39b9c2a94f65 100644 --- a/usr.bin/column/column.c +++ b/usr.bin/column/column.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95"; +static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/ioctl.h> diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c index 941233ee9068..bdf30e36afe5 100644 --- a/usr.bin/comm/comm.c +++ b/usr.bin/comm/comm.c @@ -34,19 +34,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "From: @(#)comm.c 8.4 (Berkeley) 5/4/95"; +static char sccsid[] = "From: @(#)comm.c 8.4 (Berkeley) 5/4/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <err.h> diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c index ebb6c79856ed..9b814ebe0915 100644 --- a/usr.bin/compress/compress.c +++ b/usr.bin/compress/compress.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94"; +static char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c index b8beb7ecfbb0..1251d1bbe286 100644 --- a/usr.bin/compress/zopen.c +++ b/usr.bin/compress/zopen.c @@ -35,14 +35,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + /*- * fcompress.c - File compression ala IEEE Computer, June 1984. * diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c index fcc037a05bdb..f7394c5fd024 100644 --- a/usr.bin/ctags/C.c +++ b/usr.bin/ctags/C.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static char sccsid[] = "@(#)C.c 8.4 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <limits.h> #include <stdio.h> diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c index 3f7433214c90..199ffb64e1ea 100644 --- a/usr.bin/ctags/ctags.c +++ b/usr.bin/ctags/ctags.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95"; +static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <limits.h> diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c index 16845e5c592b..2195606242c4 100644 --- a/usr.bin/ctags/fortran.c +++ b/usr.bin/ctags/fortran.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <limits.h> diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c index 293149ad71a3..b00a2a8caee9 100644 --- a/usr.bin/ctags/lisp.c +++ b/usr.bin/ctags/lisp.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)lisp.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)lisp.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <limits.h> diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c index b27ca541e02c..36c790bd85b6 100644 --- a/usr.bin/ctags/print.c +++ b/usr.bin/ctags/print.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <limits.h> #include <stdio.h> diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c index 2be32a42826c..ac99639cf371 100644 --- a/usr.bin/ctags/tree.c +++ b/usr.bin/ctags/tree.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <limits.h> diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c index 4a0020b29007..f6f2c3f6ebfb 100644 --- a/usr.bin/ctags/yacc.c +++ b/usr.bin/ctags/yacc.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)yacc.c 8.3 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)yacc.c 8.3 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <limits.h> diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c index 3240dcf5d520..138021a53b26 100644 --- a/usr.bin/finger/finger.c +++ b/usr.bin/finger/finger.c @@ -44,19 +44,20 @@ * login time is < 6 days. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)finger.c 8.5 (Berkeley) 5/4/95"; +static char sccsid[] = "@(#)finger.c 8.5 (Berkeley) 5/4/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Finger prints out information about users. It is not portable since diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c index 26f55c361646..d8f649f93853 100644 --- a/usr.bin/finger/lprint.c +++ b/usr.bin/finger/lprint.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)lprint.c 8.3 (Berkeley) 4/28/95"; +static char sccsid[] = "@(#)lprint.c 8.3 (Berkeley) 4/28/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/stat.h> #include <ctype.h> diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c index 4bcb31ba163a..67a7087761c0 100644 --- a/usr.bin/finger/net.c +++ b/usr.bin/finger/net.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)net.c 8.4 (Berkeley) 4/28/95"; +static char sccsid[] = "@(#)net.c 8.4 (Berkeley) 4/28/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c index aaa74da4ae37..67fdcbb2ab17 100644 --- a/usr.bin/finger/sprint.c +++ b/usr.bin/finger/sprint.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)sprint.c 8.3 (Berkeley) 4/28/95"; +static char sccsid[] = "@(#)sprint.c 8.3 (Berkeley) 4/28/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <db.h> #include <err.h> diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c index 8f81f50913ff..3a001a2869ea 100644 --- a/usr.bin/finger/util.c +++ b/usr.bin/finger/util.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/28/95"; +static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/28/95"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index 4f24d371eb22..59707b51a408 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint -static const char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94"; +static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * login [ name ] diff --git a/usr.bin/login/login_access.c b/usr.bin/login/login_access.c index c058bbefc5a5..b8cdf051e434 100644 --- a/usr.bin/login/login_access.c +++ b/usr.bin/login/login_access.c @@ -7,14 +7,15 @@ * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #ifdef LOGIN_ACCESS +#if 0 #ifndef lint -static const char sccsid[] = "%Z% %M% %I% %E% %U%"; +static char sccsid[] = "%Z% %M% %I% %E% %U%"; #endif +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <ctype.h> diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c index 599e3a631e56..a62c6eff570e 100644 --- a/usr.bin/login/login_fbtab.c +++ b/usr.bin/login/login_fbtab.c @@ -59,7 +59,6 @@ */ #include <sys/cdefs.h> - __FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/logname/Makefile b/usr.bin/logname/Makefile index 717bf8c8cc2b..1ef3cf0aed0f 100644 --- a/usr.bin/logname/Makefile +++ b/usr.bin/logname/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/9/93 +# $FreeBSD$ PROG= logname WARNS?= 2 diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile index 75ce758bb20b..b9e5ad45103a 100644 --- a/usr.bin/mkstr/Makefile +++ b/usr.bin/mkstr/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= mkstr WARNS?= 2 diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index 0b47e40780aa..f1bd3d8c5f05 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/12/93 +# $FreeBSD$ PROG= netstat SRCS= if.c inet.c inet6.c main.c mbuf.c mroute.c ipx.c route.c \ diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile index cfe0e1efb432..ce4c7c6136fb 100644 --- a/usr.bin/nfsstat/Makefile +++ b/usr.bin/nfsstat/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= nfsstat CFLAGS+=-DNFS diff --git a/usr.bin/nice/Makefile b/usr.bin/nice/Makefile index a6f87174baf9..dc72a89d73f8 100644 --- a/usr.bin/nice/Makefile +++ b/usr.bin/nice/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= nice WARNS?= 2 diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c index 85fffbf552b4..ea1ec440789f 100644 --- a/usr.bin/nice/nice.c +++ b/usr.bin/nice/nice.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)nice.c 8.2 (Berkeley) 4/16/94"; +static char sccsid[] = "@(#)nice.c 8.2 (Berkeley) 4/16/94"; #endif /* not lint */ +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/time.h> diff --git a/usr.bin/nohup/Makefile b/usr.bin/nohup/Makefile index 74c86a07d90e..d9aa8563a4d3 100644 --- a/usr.bin/nohup/Makefile +++ b/usr.bin/nohup/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= nohup WARNS?= 2 diff --git a/usr.bin/printenv/Makefile b/usr.bin/printenv/Makefile index b8fbd6a1cf19..402dc58b57ef 100644 --- a/usr.bin/printenv/Makefile +++ b/usr.bin/printenv/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= printenv MLINKS= printenv.1 env.1 diff --git a/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c index 72722a363362..cf825c274602 100644 --- a/usr.bin/printenv/printenv.c +++ b/usr.bin/printenv/printenv.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)printenv.c 8.2 (Berkeley) 5/4/95"; +static char sccsid[] = "@(#)printenv.c 8.2 (Berkeley) 5/4/95"; #endif /* not lint */ +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile index 1e57f837a75e..53fd56c6e081 100644 --- a/usr.bin/printf/Makefile +++ b/usr.bin/printf/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= printf WARNS?= 2 diff --git a/usr.bin/rev/Makefile b/usr.bin/rev/Makefile index ef9723fa3d01..adfc4e160d96 100644 --- a/usr.bin/rev/Makefile +++ b/usr.bin/rev/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/9/93 +# $FreeBSD$ PROG= rev WARNS?= 2 diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c index c023d8e55e40..50921e7b4665 100644 --- a/usr.bin/rev/rev.c +++ b/usr.bin/rev/rev.c @@ -31,19 +31,20 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD$"); - #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 #ifndef lint -static const char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95"; +static char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95"; #endif /* not lint */ +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/sasc/Makefile b/usr.bin/sasc/Makefile index 2f359d36af90..c44998a32dd6 100644 --- a/usr.bin/sasc/Makefile +++ b/usr.bin/sasc/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= sasc WARNS?= 2 diff --git a/usr.bin/script/Makefile b/usr.bin/script/Makefile index 61f94350afae..ac3a59c83c78 100644 --- a/usr.bin/script/Makefile +++ b/usr.bin/script/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= script WARNS?= 2 diff --git a/usr.bin/soelim/Makefile b/usr.bin/soelim/Makefile index cde738997eeb..9d28c126bca1 100644 --- a/usr.bin/soelim/Makefile +++ b/usr.bin/soelim/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= soelim WARNS?= 2 diff --git a/usr.bin/tee/Makefile b/usr.bin/tee/Makefile index 49cb861cd7f6..52baa4cb0108 100644 --- a/usr.bin/tee/Makefile +++ b/usr.bin/tee/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= tee WARNS?= 2 diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile index 644dc908c892..3cea5179a3ed 100644 --- a/usr.bin/tsort/Makefile +++ b/usr.bin/tsort/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/9/93 +# $FreeBSD$ PROG= tsort WARNS?= 2 diff --git a/usr.bin/tty/Makefile b/usr.bin/tty/Makefile index 14ed68fa5ebf..1c4f6d3a92a5 100644 --- a/usr.bin/tty/Makefile +++ b/usr.bin/tty/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= tty WARNS?= 2 diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile index a28e590234b3..5a85744d15b9 100644 --- a/usr.bin/ul/Makefile +++ b/usr.bin/ul/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= ul WARNS?= 2 diff --git a/usr.bin/uniq/Makefile b/usr.bin/uniq/Makefile index fa73ea4cfe16..2bc6ad4450da 100644 --- a/usr.bin/uniq/Makefile +++ b/usr.bin/uniq/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= uniq WARNS?= 2 diff --git a/usr.bin/unvis/Makefile b/usr.bin/unvis/Makefile index d50d3441446b..755d9c4b1f13 100644 --- a/usr.bin/unvis/Makefile +++ b/usr.bin/unvis/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= unvis WARNS?= 2 diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile index 5b440308cdee..be3a99abfe8b 100644 --- a/usr.bin/uudecode/Makefile +++ b/usr.bin/uudecode/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= uudecode WARNS?= 2 diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c index 5921c781441c..f7e7b55cb3bc 100644 --- a/usr.bin/yacc/closure.c +++ b/usr.bin/yacc/closure.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)closure.c 5.3 (Berkeley) 5/24/93"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)closure.c 5.3 (Berkeley) 5/24/93"; -#endif - #include <stdlib.h> #include "defs.h" diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c index 7158000f4779..e563693e2e5c 100644 --- a/usr.bin/yacc/error.c +++ b/usr.bin/yacc/error.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)error.c 5.3 (Berkeley) 6/1/90"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)error.c 5.3 (Berkeley) 6/1/90"; -#endif - /* routines for printing error messages */ #include "defs.h" diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c index 73be8feca180..861644a89b91 100644 --- a/usr.bin/yacc/lalr.c +++ b/usr.bin/yacc/lalr.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)lalr.c 5.3 (Berkeley) 6/1/90"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)lalr.c 5.3 (Berkeley) 6/1/90"; -#endif - #include <stdlib.h> #include "defs.h" diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c index 94698a07176c..6f642fde44ab 100644 --- a/usr.bin/yacc/lr0.c +++ b/usr.bin/yacc/lr0.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)lr0.c 5.3 (Berkeley) 1/20/91"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)lr0.c 5.3 (Berkeley) 1/20/91"; -#endif - #include <stdlib.h> #include "defs.h" diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c index 4c427c363acc..cd1d5b84461e 100644 --- a/usr.bin/yacc/main.c +++ b/usr.bin/yacc/main.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)main.c 5.5 (Berkeley) 5/24/93"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)main.c 5.5 (Berkeley) 5/24/93"; -#endif - #include <signal.h> #include <stdlib.h> #include <string.h> diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c index 34aa81d9ed96..7d61246e87ce 100644 --- a/usr.bin/yacc/mkpar.c +++ b/usr.bin/yacc/mkpar.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)mkpar.c 5.3 (Berkeley) 1/20/91"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)mkpar.c 5.3 (Berkeley) 1/20/91"; -#endif - #include <stdlib.h> #include "defs.h" diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c index d6134c9cee9c..e7687c354163 100644 --- a/usr.bin/yacc/output.c +++ b/usr.bin/yacc/output.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)output.c 5.7 (Berkeley) 5/24/93"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)output.c 5.7 (Berkeley) 5/24/93"; -#endif - #include <stdlib.h> #include <string.h> #include "defs.h" diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c index 23a060fc30b4..8d54e925c8b5 100644 --- a/usr.bin/yacc/reader.c +++ b/usr.bin/yacc/reader.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)reader.c 5.7 (Berkeley) 1/20/91"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)reader.c 5.7 (Berkeley) 1/20/91"; -#endif - #include <stdlib.h> #include <string.h> #include "defs.h" diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c index 5e7ce1456697..11a1855894da 100644 --- a/usr.bin/yacc/skeleton.c +++ b/usr.bin/yacc/skeleton.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)skeleton.c 5.8 (Berkeley) 4/29/95"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)skeleton.c 5.8 (Berkeley) 4/29/95"; -#endif - #include "defs.h" /* The definition of yysccsid in the banner should be replaced with */ diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c index 8b8298c19ae2..c808d6ad7028 100644 --- a/usr.bin/yacc/symtab.c +++ b/usr.bin/yacc/symtab.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)symtab.c 5.3 (Berkeley) 6/1/90"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)symtab.c 5.3 (Berkeley) 6/1/90"; -#endif - #include <stdlib.h> #include <string.h> #include "defs.h" diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c index 2b37eef0c704..e6206506256d 100644 --- a/usr.bin/yacc/verbose.c +++ b/usr.bin/yacc/verbose.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)verbose.c 5.3 (Berkeley) 1/20/91"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)verbose.c 5.3 (Berkeley) 1/20/91"; -#endif - #include <stdlib.h> #include "defs.h" diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c index 8f1cd1cb38f4..3c7bf1c7ab5a 100644 --- a/usr.bin/yacc/warshall.c +++ b/usr.bin/yacc/warshall.c @@ -34,16 +34,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> +#if 0 +#ifndef lint +static char sccsid[] = "@(#)warshall.c 5.4 (Berkeley) 5/24/93"; +#endif +#endif +#include <sys/cdefs.h> #ifdef __FBSDID __FBSDID("$FreeBSD$"); #endif -#ifndef lint -static char const sccsid[] = "@(#)warshall.c 5.4 (Berkeley) 5/24/93"; -#endif - #include "defs.h" static void transitive_closure __P((unsigned *, int)); diff --git a/usr.bin/yes/Makefile b/usr.bin/yes/Makefile index 8e91b4459c2c..247bfae4e7d1 100644 --- a/usr.bin/yes/Makefile +++ b/usr.bin/yes/Makefile @@ -1,5 +1,5 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= yes WARNS?= 2 |