diff options
| author | obrien <obrien@FreeBSD.org> | 2002-06-30 05:25:07 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2002-06-30 05:25:07 +0000 |
| commit | bc61fc95d838ba5e5b48f6ee9848c03ec72a5af3 (patch) | |
| tree | 41763f513f184b022b2875b747c2d1e83d4ed74f /usr.bin | |
| parent | b7edb33754da2677f5954d960946833612ef6c51 (diff) | |
| download | FreeBSD-src-bc61fc95d838ba5e5b48f6ee9848c03ec72a5af3.zip FreeBSD-src-bc61fc95d838ba5e5b48f6ee9848c03ec72a5af3.tar.gz | |
Consistently use FBSDID
Diffstat (limited to 'usr.bin')
109 files changed, 222 insertions, 208 deletions
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c index 52e9bb8..fede308 100644 --- a/usr.bin/chpass/table.c +++ b/usr.bin/chpass/table.c @@ -34,7 +34,6 @@ #ifndef lint static const char sccsid[] = "@(#)table.c 8.3 (Berkeley) 4/2/94"; #endif /* not lint */ - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c index 8460576..ac105aa 100644 --- a/usr.bin/chpass/util.c +++ b/usr.bin/chpass/util.c @@ -39,9 +39,10 @@ */ #ifndef lint -static const char sccsid[] = "@(#)util.c 8.4 (Berkeley) 4/2/94"; +#if 0 +static char sccsid[] = "@(#)util.c 8.4 (Berkeley) 4/2/94"; +#endif #endif /* not lint */ - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c index 6021829..3c7f17a 100644 --- a/usr.bin/cksum/cksum.c +++ b/usr.bin/cksum/cksum.c @@ -44,9 +44,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)cksum.c 8.2 (Berkeley) 4/28/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c index ba43660..569304d 100644 --- a/usr.bin/cksum/crc.c +++ b/usr.bin/cksum/crc.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <unistd.h> diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c index f290d69..2c4666b 100644 --- a/usr.bin/cksum/crc32.c +++ b/usr.bin/cksum/crc32.c @@ -11,10 +11,8 @@ * Spencer Garrett <srg@quick.com> */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c index d3b8ce4..ca04996 100644 --- a/usr.bin/cksum/print.c +++ b/usr.bin/cksum/print.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <stdio.h> diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c index aaba1e8..a981330 100644 --- a/usr.bin/cksum/sum1.c +++ b/usr.bin/cksum/sum1.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)sum1.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <unistd.h> diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c index a14c4d3..2514272 100644 --- a/usr.bin/cksum/sum2.c +++ b/usr.bin/cksum/sum2.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)sum2.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <unistd.h> diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c index cbee925..67719cf 100644 --- a/usr.bin/dirname/dirname.c +++ b/usr.bin/dirname/dirname.c @@ -29,8 +29,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef lint @@ -42,6 +40,8 @@ static const char copyright[] = #ifndef lint static const char sccsid[] = "@(#)dirname.c 8.4 (Berkeley) 5/4/95"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <libgen.h> diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c index 7bf007c..d6cbb4f 100644 --- a/usr.bin/du/du.c +++ b/usr.bin/du/du.c @@ -44,10 +44,9 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ - +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/queue.h> diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c index ced9c01..1d80b96 100644 --- a/usr.bin/ee/ee.c +++ b/usr.bin/ee/ee.c @@ -50,10 +50,8 @@ | copyright. All rights are reserved. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); char *ee_copyright_message = "Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996 Hugh Mahon "; diff --git a/usr.bin/ee/new_curse.c b/usr.bin/ee/new_curse.c index f3a124b..22e1a84 100644 --- a/usr.bin/ee/new_curse.c +++ b/usr.bin/ee/new_curse.c @@ -44,10 +44,8 @@ char *copyright_message[] = { "Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993, 1994, 1995 Hugh Mahon", "All rights are reserved."}; -#ifndef lint -statis const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "new_curse.h" #include <signal.h> diff --git a/usr.bin/enigma/enigma.c b/usr.bin/enigma/enigma.c index e1c2f94..655536c 100644 --- a/usr.bin/enigma/enigma.c +++ b/usr.bin/enigma/enigma.c @@ -10,10 +10,8 @@ * Upgraded to function properly on 64-bit machines. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/wait.h> diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c index e5a63c5..70e1247 100644 --- a/usr.bin/expand/expand.c +++ b/usr.bin/expand/expand.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <err.h> diff --git a/usr.bin/false/false.c b/usr.bin/false/false.c index da950f9..27b2c25 100644 --- a/usr.bin/false/false.c +++ b/usr.bin/false/false.c @@ -29,8 +29,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef lint @@ -42,6 +40,8 @@ static const char copyright[] = #ifndef lint static const char sccsid[] = "@(#)false.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); int main(void) diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c index 38f97d8..4338c45 100644 --- a/usr.bin/file2c/file2c.c +++ b/usr.bin/file2c/file2c.c @@ -5,11 +5,11 @@ * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- - * - * $FreeBSD$ - * */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdio.h> int diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c index 6215cfa..0ad2bbc 100644 --- a/usr.bin/fmt/fmt.c +++ b/usr.bin/fmt/fmt.c @@ -169,11 +169,11 @@ */ #ifndef lint -static const char rcsid[] = - "$FreeBSD$"; static const char copyright[] = "Copyright (c) 1997 Gareth McCaughan. All rights reserved.\n"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <err.h> diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c index 1dd0449e..5fc726f 100644 --- a/usr.bin/from/from.c +++ b/usr.bin/from/from.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <ctype.h> diff --git a/usr.bin/fstat/cd9660.c b/usr.bin/fstat/cd9660.c index 1b4f22f..a11a9c4 100644 --- a/usr.bin/fstat/cd9660.c +++ b/usr.bin/fstat/cd9660.c @@ -32,8 +32,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -42,6 +40,9 @@ * conflicts with UFS. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/param.h> #include <sys/stat.h> #include <sys/time.h> diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index 9d26aea..0a51c59 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)fstat.c 8.3 (Berkeley) 5/2/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/time.h> diff --git a/usr.bin/fstat/msdosfs.c b/usr.bin/fstat/msdosfs.c index 019d208..c428e57 100644 --- a/usr.bin/fstat/msdosfs.c +++ b/usr.bin/fstat/msdosfs.c @@ -32,10 +32,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/param.h> #include <sys/time.h> #include <sys/stat.h> diff --git a/usr.bin/fsync/fsync.c b/usr.bin/fsync/fsync.c index 4e542b8..95bacfb 100644 --- a/usr.bin/fsync/fsync.c +++ b/usr.bin/fsync/fsync.c @@ -25,9 +25,9 @@ */ #ifndef lint -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <fcntl.h> diff --git a/usr.bin/gcore/aoutcore.c b/usr.bin/gcore/aoutcore.c index 00f2967..9d55536 100644 --- a/usr.bin/gcore/aoutcore.c +++ b/usr.bin/gcore/aoutcore.c @@ -41,8 +41,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)gcore.c 8.2 (Berkeley) 9/23/93"; #endif -#endif /* not lint */ - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c index 00f2967..9d55536 100644 --- a/usr.bin/gcore/gcore.c +++ b/usr.bin/gcore/gcore.c @@ -41,8 +41,6 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)gcore.c 8.2 (Berkeley) 9/23/93"; #endif -#endif /* not lint */ - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/usr.bin/gcore/md-nop.c b/usr.bin/gcore/md-nop.c index 331901c..67310a3 100644 --- a/usr.bin/gcore/md-nop.c +++ b/usr.bin/gcore/md-nop.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)md-nop.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/sysctl.h> diff --git a/usr.bin/gcore/md-sparc.c b/usr.bin/gcore/md-sparc.c index 1557fb5..ef14361 100644 --- a/usr.bin/gcore/md-sparc.c +++ b/usr.bin/gcore/md-sparc.c @@ -38,6 +38,8 @@ #ifndef lint static char sccsid[] = "@(#)md-sparc.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/time.h> diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c index 721eaa7..fba5bf1 100644 --- a/usr.bin/getconf/getconf.c +++ b/usr.bin/getconf/getconf.c @@ -25,10 +25,11 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <err.h> diff --git a/usr.bin/getopt/getopt.c b/usr.bin/getopt/getopt.c index 7ce9c4f..269a578 100644 --- a/usr.bin/getopt/getopt.c +++ b/usr.bin/getopt/getopt.c @@ -1,4 +1,5 @@ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <stdlib.h> diff --git a/usr.bin/gprof/alpha.c b/usr.bin/gprof/alpha.c index 6a47408..c35cd63 100644 --- a/usr.bin/gprof/alpha.c +++ b/usr.bin/gprof/alpha.c @@ -1,3 +1,6 @@ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "gprof.h" /* diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c index 3905563..b3bdfba 100644 --- a/usr.bin/gprof/arcs.c +++ b/usr.bin/gprof/arcs.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)arcs.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include "gprof.h" diff --git a/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c index 8bea2c2..9d2a08a 100644 --- a/usr.bin/gprof/dfn.c +++ b/usr.bin/gprof/dfn.c @@ -38,6 +38,8 @@ static char sccsid[] = "@(#)dfn.c 8.1 (Berkeley) 6/6/93"; static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include "gprof.h" diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c index 400d974..745da76 100644 --- a/usr.bin/gprof/gprof.c +++ b/usr.bin/gprof/gprof.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)gprof.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <limits.h> diff --git a/usr.bin/gprof/ia64.c b/usr.bin/gprof/ia64.c index 967feda..c35cd63 100644 --- a/usr.bin/gprof/ia64.c +++ b/usr.bin/gprof/ia64.c @@ -1,4 +1,6 @@ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include "gprof.h" /* diff --git a/usr.bin/gprof/kernel.c b/usr.bin/gprof/kernel.c index c8df0d0..fc14087 100644 --- a/usr.bin/gprof/kernel.c +++ b/usr.bin/gprof/kernel.c @@ -1,7 +1,5 @@ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/linker.h> diff --git a/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c index 9badc6c..3c5f2b0 100644 --- a/usr.bin/gprof/lookup.c +++ b/usr.bin/gprof/lookup.c @@ -38,6 +38,8 @@ static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/6/93"; static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "gprof.h" diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c index d9f0d58..2440c8c 100644 --- a/usr.bin/gprof/printgprof.c +++ b/usr.bin/gprof/printgprof.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)printgprof.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include "gprof.h" diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c index c77b19f..74be0e4 100644 --- a/usr.bin/gprof/printlist.c +++ b/usr.bin/gprof/printlist.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)printlist.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include "gprof.h" diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c index 9f0e77a..e8eed85 100644 --- a/usr.bin/head/head.c +++ b/usr.bin/head/head.c @@ -42,6 +42,8 @@ static const char copyright[] = static char sccsid[] = "@(#)head.c 8.2 (Berkeley) 5/4/95"; #endif #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/usr.bin/hesinfo/hesinfo.c b/usr.bin/hesinfo/hesinfo.c index 717b915..98c700d 100644 --- a/usr.bin/hesinfo/hesinfo.c +++ b/usr.bin/hesinfo/hesinfo.c @@ -19,10 +19,7 @@ #include <sys/cdefs.h> -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +__FBSDID("$FreeBSD$"); #include <err.h> #include <errno.h> diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c index d2e32fc..4c7d863 100644 --- a/usr.bin/hexdump/display.c +++ b/usr.bin/hexdump/display.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c index 7a7434b..660a2d9 100644 --- a/usr.bin/hexdump/hexdump.c +++ b/usr.bin/hexdump/hexdump.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)hexdump.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <locale.h> diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c index 74b64c6..fad2fa8 100644 --- a/usr.bin/hexdump/hexsyntax.c +++ b/usr.bin/hexdump/hexsyntax.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)hexsyntax.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c index c371f1e..0a37d01 100644 --- a/usr.bin/hexdump/odsyntax.c +++ b/usr.bin/hexdump/odsyntax.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)odsyntax.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c index d928a3f..25ef032 100644 --- a/usr.bin/hexdump/parse.c +++ b/usr.bin/hexdump/parse.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index e8c9b71..4e5ca00 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)id.c 8.2 (Berkeley) 2/16/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c index b7515fd..7998fc7 100644 --- a/usr.bin/indent/args.c +++ b/usr.bin/indent/args.c @@ -37,9 +37,9 @@ #if 0 static char sccsid[] = "@(#)args.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Argument scanning and profile reading code. Default parameters are set diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c index 25c3635..82dad36 100644 --- a/usr.bin/indent/indent.c +++ b/usr.bin/indent/indent.c @@ -45,9 +45,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)indent.c 5.17 (Berkeley) 6/7/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <err.h> diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c index e1e846e..d1bfcf3 100644 --- a/usr.bin/indent/io.c +++ b/usr.bin/indent/io.c @@ -37,9 +37,9 @@ #if 0 static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <err.h> diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c index 7133a6f..68f76da 100644 --- a/usr.bin/indent/lexi.c +++ b/usr.bin/indent/lexi.c @@ -36,10 +36,10 @@ #if 0 #ifndef lint static char sccsid[] = "@(#)lexi.c 8.1 (Berkeley) 6/6/93"; -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Here we have the token scanner for indent. It scans off one token and puts diff --git a/usr.bin/indent/parse.c b/usr.bin/indent/parse.c index b8c9a39..d83176a 100644 --- a/usr.bin/indent/parse.c +++ b/usr.bin/indent/parse.c @@ -35,10 +35,10 @@ #if 0 #ifndef lint static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93"; -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include "indent_globs.h" diff --git a/usr.bin/indent/pr_comment.c b/usr.bin/indent/pr_comment.c index f626205..32365dd 100644 --- a/usr.bin/indent/pr_comment.c +++ b/usr.bin/indent/pr_comment.c @@ -32,13 +32,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#if 0 + #ifndef lint +#if 0 static char sccsid[] = "@(#)pr_comment.c 8.1 (Berkeley) 6/6/93"; -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ #endif +#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <stdio.h> #include <stdlib.h> #include "indent_globs.h" diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c index cde581f..7f0f89b 100644 --- a/usr.bin/ipcrm/ipcrm.c +++ b/usr.bin/ipcrm/ipcrm.c @@ -29,10 +29,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include <err.h> diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c index 950be25..9611f23 100644 --- a/usr.bin/ipcs/ipcs.c +++ b/usr.bin/ipcs/ipcs.c @@ -25,10 +25,8 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <assert.h> #include <err.h> diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index 59c37fa..8d936c7 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -45,9 +45,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c index 14f69df..ebaa3b4 100644 --- a/usr.bin/jot/jot.c +++ b/usr.bin/jot/jot.c @@ -42,7 +42,6 @@ static const char copyright[] = static char sccsid[] = "@(#)jot.c 8.1 (Berkeley) 6/6/93"; #endif #endif - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 34d2bb6..c6c5602 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)kdump.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #define _KERNEL extern int errno; diff --git a/usr.bin/kenv/kenv.c b/usr.bin/kenv/kenv.c index 622458d..edd022c 100644 --- a/usr.bin/kenv/kenv.c +++ b/usr.bin/kenv/kenv.c @@ -21,9 +21,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/sysctl.h> #include <stdlib.h> diff --git a/usr.bin/keylogin/keylogin.c b/usr.bin/keylogin/keylogin.c index 6bad09a..8e10d95 100644 --- a/usr.bin/keylogin/keylogin.c +++ b/usr.bin/keylogin/keylogin.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -31,6 +30,8 @@ #if !defined(lint) && defined(SCCSIDS) static char sccsid[] = "@(#)keylogin.c 1.4 91/03/11 Copyr 1986 Sun Micro"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Copyright (C) 1986, Sun Microsystems, Inc. diff --git a/usr.bin/keylogout/keylogout.c b/usr.bin/keylogout/keylogout.c index 8050df9..e4fcf21 100644 --- a/usr.bin/keylogout/keylogout.c +++ b/usr.bin/keylogout/keylogout.c @@ -31,10 +31,8 @@ * Copyright (C) 1986, Sun Microsystems, Inc. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * unset the secret key on local machine diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c index c7d34f2..3ca3b5c 100644 --- a/usr.bin/killall/killall.c +++ b/usr.bin/killall/killall.c @@ -23,11 +23,12 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/cdefs.h> #include <sys/param.h> #include <sys/stat.h> #include <sys/user.h> diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c index a71136b..67f01d2 100644 --- a/usr.bin/ktrace/ktrace.c +++ b/usr.bin/ktrace/ktrace.c @@ -42,7 +42,6 @@ static const char copyright[] = static char sccsid[] = "@(#)ktrace.c 8.1 (Berkeley) 6/6/93"; #endif #endif /* not lint */ - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c index 3996914..c56aa29 100644 --- a/usr.bin/ktrace/subr.c +++ b/usr.bin/ktrace/subr.c @@ -36,6 +36,8 @@ static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 6/6/93"; #endif #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c index e01fc9d..1171153 100644 --- a/usr.bin/lam/lam.c +++ b/usr.bin/lam/lam.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)lam.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * lam - laminate files diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index 41e2492..b3325cc 100644 --- a/usr.bin/last/last.c +++ b/usr.bin/last/last.c @@ -29,8 +29,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef lint @@ -42,6 +40,8 @@ static const char copyright[] = #ifndef lint static const char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c index e627be9..5583b99 100644 --- a/usr.bin/lastcomm/lastcomm.c +++ b/usr.bin/lastcomm/lastcomm.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)lastcomm.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/stat.h> diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c index 4880fb7..6931582 100644 --- a/usr.bin/leave/leave.c +++ b/usr.bin/leave/leave.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <ctype.h> diff --git a/usr.bin/lex/ccl.c b/usr.bin/lex/ccl.c index ea482ac..025a914 100644 --- a/usr.bin/lex/ccl.c +++ b/usr.bin/lex/ccl.c @@ -27,7 +27,8 @@ */ /* $Header: /home/daffy/u0/vern/flex/RCS/ccl.c,v 2.9 93/09/16 20:32:14 vern Exp $ */ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "flexdef.h" diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c index 810c149..0853466 100644 --- a/usr.bin/lex/dfa.c +++ b/usr.bin/lex/dfa.c @@ -27,7 +27,8 @@ */ /* $Header: /home/daffy/u0/vern/flex/RCS/dfa.c,v 2.26 95/04/20 13:53:14 vern Exp $ */ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "flexdef.h" diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c index cdef5c8..d647142 100644 --- a/usr.bin/lex/ecs.c +++ b/usr.bin/lex/ecs.c @@ -27,7 +27,8 @@ */ /* $Header: /home/daffy/u0/vern/flex/RCS/ecs.c,v 2.9 93/12/07 10:18:20 vern Exp $ */ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "flexdef.h" diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c index 437471c..0e20544 100644 --- a/usr.bin/lex/gen.c +++ b/usr.bin/lex/gen.c @@ -27,7 +27,8 @@ */ /* $Header: /home/daffy/u0/vern/flex/RCS/gen.c,v 2.56 96/05/25 20:43:38 vern Exp $ */ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "flexdef.h" diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c index c2ee1f6..b81d43b 100644 --- a/usr.bin/lex/initscan.c +++ b/usr.bin/lex/initscan.c @@ -4,6 +4,8 @@ /* Scanner skeleton version: * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c index 97eff98..f6adaa7 100644 --- a/usr.bin/lex/main.c +++ b/usr.bin/lex/main.c @@ -33,7 +33,8 @@ char copyright[] = #endif /* not lint */ /* $Header: /home/daffy/u0/vern/flex/RCS/main.c,v 2.64 96/05/25 20:42:42 vern Exp $ */ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "flexdef.h" diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c index 6a05078..3eda579 100644 --- a/usr.bin/lex/misc.c +++ b/usr.bin/lex/misc.c @@ -27,7 +27,8 @@ */ /* $Header: /home/daffy/u0/vern/flex/RCS/misc.c,v 2.47 95/04/28 11:39:39 vern Exp $ */ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "flexdef.h" diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c index d101f37..4b81284 100644 --- a/usr.bin/lex/nfa.c +++ b/usr.bin/lex/nfa.c @@ -27,7 +27,8 @@ */ /* $Header: /home/daffy/u0/vern/flex/RCS/nfa.c,v 2.17 95/03/04 16:11:42 vern Exp $ */ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "flexdef.h" diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c index ac1c4b2..077015b 100644 --- a/usr.bin/lex/sym.c +++ b/usr.bin/lex/sym.c @@ -27,7 +27,8 @@ */ /* $Header: /home/daffy/u0/vern/flex/RCS/sym.c,v 2.19 95/03/04 16:11:04 vern Exp $ */ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "flexdef.h" diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c index be5491a..89973f0 100644 --- a/usr.bin/lex/tblcmp.c +++ b/usr.bin/lex/tblcmp.c @@ -27,7 +27,8 @@ */ /* $Header: /home/daffy/u0/vern/flex/RCS/tblcmp.c,v 2.11 94/11/05 17:08:28 vern Exp $ */ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "flexdef.h" diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c index 6c7ee3e..e90c5d4f 100644 --- a/usr.bin/lex/yylex.c +++ b/usr.bin/lex/yylex.c @@ -27,7 +27,8 @@ */ /* $Header: /home/daffy/u0/vern/flex/RCS/yylex.c,v 2.13 95/03/04 16:10:41 vern Exp $ */ -/* $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <ctype.h> #include "flexdef.h" diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c index 6a2a205..454b718 100644 --- a/usr.bin/limits/limits.c +++ b/usr.bin/limits/limits.c @@ -19,10 +19,11 @@ * conditions are met. * * Display/change(+runprogram)/eval resource limits. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <err.h> #include <stdio.h> #include <string.h> diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c index f40afda..a8eaf6f 100644 --- a/usr.bin/lock/lock.c +++ b/usr.bin/lock/lock.c @@ -44,9 +44,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Lock a terminal up until the given key is entered, until the root diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index 6c08ff9..257af52 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -21,10 +21,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <sys/types.h> #include <sys/wait.h> diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c index fc81b76..25692af 100644 --- a/usr.bin/logger/logger.c +++ b/usr.bin/logger/logger.c @@ -42,7 +42,6 @@ static const char copyright[] = static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93"; #endif #endif /* not lint */ - #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c index f834228..ebbce49 100644 --- a/usr.bin/logname/logname.c +++ b/usr.bin/logname/logname.c @@ -29,8 +29,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #ifndef lint @@ -42,6 +40,8 @@ static const char copyright[] = #ifndef lint static const char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <err.h> #include <errno.h> diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c index d43e6ae..402ec9f 100644 --- a/usr.bin/look/look.c +++ b/usr.bin/look/look.c @@ -44,9 +44,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * look -- find lines in a sorted list. diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c index 0b53a2d..909636e 100644 --- a/usr.bin/lsvfs/lsvfs.c +++ b/usr.bin/lsvfs/lsvfs.c @@ -3,9 +3,11 @@ * Garrett A. Wollman, September 1994 * This file is in the public domain. * - * $FreeBSD$ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #define _NEW_VFSCONF #include <sys/param.h> diff --git a/usr.bin/mail/aux.c b/usr.bin/mail/aux.c index c73d952..82ad0dd 100644 --- a/usr.bin/mail/aux.c +++ b/usr.bin/mail/aux.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/time.h> diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c index 8c51077..5ec6d7a 100644 --- a/usr.bin/mail/cmd1.c +++ b/usr.bin/mail/cmd1.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)cmd1.c 8.2 (Berkeley) 4/20/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include "extern.h" diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c index b25af30..15cf04a 100644 --- a/usr.bin/mail/cmd2.c +++ b/usr.bin/mail/cmd2.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include <sys/wait.h> diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c index 312b80c..c9b7c6a 100644 --- a/usr.bin/mail/cmd3.c +++ b/usr.bin/mail/cmd3.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)cmd3.c 8.2 (Berkeley) 4/20/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include "extern.h" diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c index 7c49205..b350cce 100644 --- a/usr.bin/mail/cmdtab.c +++ b/usr.bin/mail/cmdtab.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "def.h" #include "extern.h" diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c index 30d8533..6a09263 100644 --- a/usr.bin/mail/collect.c +++ b/usr.bin/mail/collect.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Mail -- a mail program diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c index 8e5e14a..d50c43a 100644 --- a/usr.bin/mail/edit.c +++ b/usr.bin/mail/edit.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)edit.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include <fcntl.h> diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c index a10021b..b00f485 100644 --- a/usr.bin/mail/fio.c +++ b/usr.bin/mail/fio.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include <sys/file.h> diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c index 4062e93..5851985 100644 --- a/usr.bin/mail/getname.c +++ b/usr.bin/mail/getname.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)getname.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include <pwd.h> diff --git a/usr.bin/mail/head.c b/usr.bin/mail/head.c index 61f43da..0924944 100644 --- a/usr.bin/mail/head.c +++ b/usr.bin/mail/head.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)head.c 8.2 (Berkeley) 4/20/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include "extern.h" diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c index 46255b8..518c25b 100644 --- a/usr.bin/mail/lex.c +++ b/usr.bin/mail/lex.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include <errno.h> diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c index 5eacfb5..abff92a 100644 --- a/usr.bin/mail/list.c +++ b/usr.bin/mail/list.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)list.c 8.4 (Berkeley) 5/1/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include <ctype.h> diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c index a95c705..c4d0704 100644 --- a/usr.bin/mail/main.c +++ b/usr.bin/mail/main.c @@ -41,9 +41,9 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/20/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include <fcntl.h> diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c index 976bfa4..a4d64c6 100644 --- a/usr.bin/mail/names.c +++ b/usr.bin/mail/names.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)names.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Mail -- a mail program diff --git a/usr.bin/mail/popen.c b/usr.bin/mail/popen.c index 73678ee..b6dc30a 100644 --- a/usr.bin/mail/popen.c +++ b/usr.bin/mail/popen.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)popen.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include <sys/wait.h> diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c index ea92dab..4507c59 100644 --- a/usr.bin/mail/quit.c +++ b/usr.bin/mail/quit.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)quit.c 8.2 (Berkeley) 4/28/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include <fcntl.h> diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c index a4fa9a1..1addf07 100644 --- a/usr.bin/mail/send.c +++ b/usr.bin/mail/send.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)send.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include "extern.h" diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c index 684a6d1..d3a816f 100644 --- a/usr.bin/mail/strings.c +++ b/usr.bin/mail/strings.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)strings.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Mail -- a mail program diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c index a3ced98..0d7424e 100644 --- a/usr.bin/mail/temp.c +++ b/usr.bin/mail/temp.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)temp.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include "extern.h" diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c index c1e19d7..6948d04 100644 --- a/usr.bin/mail/tty.c +++ b/usr.bin/mail/tty.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Mail -- a mail program diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c index 3007a49..34f9d80 100644 --- a/usr.bin/mail/v7.local.c +++ b/usr.bin/mail/v7.local.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)v7.local.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Mail -- a mail program diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c index fdf3f40..ab171c1 100644 --- a/usr.bin/mail/vars.c +++ b/usr.bin/mail/vars.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "rcv.h" #include "extern.h" diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c index 58f5638..e41c25c 100644 --- a/usr.bin/mail/version.c +++ b/usr.bin/mail/version.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)version.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Just keep track of the date/sid of this version of Mail. diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c index dcd14c3..6c4a1e2 100644 --- a/usr.bin/mesg/mesg.c +++ b/usr.bin/mesg/mesg.c @@ -46,9 +46,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)mesg.c 8.2 (Berkeley) 1/21/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c index cf66e58..e2aa1cd 100644 --- a/usr.bin/mkfifo/mkfifo.c +++ b/usr.bin/mkfifo/mkfifo.c @@ -41,9 +41,9 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)mkfifo.c 8.2 (Berkeley) 1/5/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> |
