diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index a8abea4004e5..83bb68d63afc 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index ac6cb112863c..118614aaca9b 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c index 401e6236e226..6e85b079c6cd 100644 --- a/bin/pax/buf_subs.c +++ b/bin/pax/buf_subs.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/cache.c b/bin/pax/cache.c index a7f3538086a0..28bb895c00fb 100644 --- a/bin/pax/cache.c +++ b/bin/pax/cache.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index ae51a370b44c..ed403dbbc1e6 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 44d9064e6cb6..711c5deadba1 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index 0eb3c3594798..91331d45016d 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c index 6daefa4c355a..86e729fa0aa9 100644 --- a/bin/pax/gen_subs.c +++ b/bin/pax/gen_subs.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c index 291e1554716a..ca18d9174401 100644 --- a/bin/pax/getoldopt.c +++ b/bin/pax/getoldopt.c @@ -10,9 +10,8 @@ * in the Pubic Domain for your edification and enjoyment. */ -#ifndef lint -static const char rcsid[] = "$FreeBSD$"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/options.c b/bin/pax/options.c index 45ca520abaf4..26eadaa64a5d 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -40,6 +40,8 @@ static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #endif #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include __FBSDID("$FreeBSD$"); diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index b4998edfe34f..e7dc4f3972b9 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/pax.c b/bin/pax/pax.c index d3bf18feae62..649ad3e16dec 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -45,9 +45,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index 1dfa6167ab96..130b8e96e401 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/tables.c b/bin/pax/tables.c index 48d535052fd6..9696181414ea 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/tar.c b/bin/pax/tar.c index b869cfa5d24c..43dcdda92af3 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c index c8200c437afa..a56d56b09a78 100644 --- a/bin/pax/tty_subs.c +++ b/bin/pax/tty_subs.c @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c index 92638869227d..fd8d4e77bd4d 100644 --- a/bin/ps/fmt.c +++ b/bin/ps/fmt.c @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #if 0 #ifndef lint static char sccsid[] = "@(#)fmt.c 8.4 (Berkeley) 4/15/94"; #endif #endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index e27a09d538ca..4bc00fc7e8a6 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #if 0 #ifndef lint static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; #endif /* not lint */ #endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/ps/lomac.c b/bin/ps/lomac.c index 5a09b3a2e805..f6519554795b 100644 --- a/bin/ps/lomac.c +++ b/bin/ps/lomac.c @@ -40,7 +40,6 @@ */ #include - __FBSDID("$FreeBSD$"); #include diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c index 19acfb840a82..30de18edfd42 100644 --- a/bin/ps/nlist.c +++ b/bin/ps/nlist.c @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #if 0 #ifndef lint static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ #endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/ps/print.c b/bin/ps/print.c index a38cd25053ef..87b2e5ddd25a 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - #if 0 #ifndef lint static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #endif /* not lint */ #endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 515e9f352f34..8b23a1da4a3c 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -31,9 +31,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("$FreeBSD$"); - #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1990, 1993, 1994\n\ @@ -45,6 +42,8 @@ static const char copyright[] = static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; #endif /* not lint */ #endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index c66276d379bd..6d517924eefb 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -41,9 +41,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index b34506df2205..f36af01035b1 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -48,9 +48,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/rcp/util.c b/bin/rcp/util.c index 41745890ad18..2e63c05a8085 100644 --- a/bin/rcp/util.c +++ b/bin/rcp/util.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)util.c 8.2 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/rm/rm.c b/bin/rm/rm.c index f2665ed8245e..34574543a1e6 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -40,11 +40,10 @@ static const char copyright[] = #ifndef lint #if 0 static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94"; -#else -static const char rcsid[] = - "$FreeBSD$"; #endif #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c index 3ab22dd5d7ee..f869c3f20f4a 100644 --- a/bin/rmdir/rmdir.c +++ b/bin/rmdir/rmdir.c @@ -41,9 +41,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/setfacl/file.c b/bin/setfacl/file.c index d2cdb9894318..c9d21d61d5ee 100644 --- a/bin/setfacl/file.c +++ b/bin/setfacl/file.c @@ -22,10 +22,11 @@ * CONTRACT, STRICT 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 +__FBSDID("$FreeBSD$"); + #include #include diff --git a/bin/setfacl/mask.c b/bin/setfacl/mask.c index 21065487dd17..e4d18f73bdfd 100644 --- a/bin/setfacl/mask.c +++ b/bin/setfacl/mask.c @@ -22,10 +22,11 @@ * CONTRACT, STRICT 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/bin/setfacl/merge.c b/bin/setfacl/merge.c index 45e03ee49473..b9d45f8c188d 100644 --- a/bin/setfacl/merge.c +++ b/bin/setfacl/merge.c @@ -22,10 +22,11 @@ * CONTRACT, STRICT 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/bin/setfacl/remove.c b/bin/setfacl/remove.c index e4f2f3536fac..dc0c3a8f784a 100644 --- a/bin/setfacl/remove.c +++ b/bin/setfacl/remove.c @@ -22,10 +22,11 @@ * CONTRACT, STRICT 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c index b008e1db9924..367909b2c0e7 100644 --- a/bin/setfacl/setfacl.c +++ b/bin/setfacl/setfacl.c @@ -22,10 +22,11 @@ * CONTRACT, STRICT 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/bin/setfacl/util.c b/bin/setfacl/util.c index 2c1a6e273b04..4976301bd5c4 100644 --- a/bin/setfacl/util.c +++ b/bin/setfacl/util.c @@ -22,10 +22,11 @@ * CONTRACT, STRICT 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/bin/sh/alias.c b/bin/sh/alias.c index f6b462b38d2e..1e4b81ccabce 100644 --- a/bin/sh/alias.c +++ b/bin/sh/alias.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)alias.c 8.3 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include "shell.h" diff --git a/bin/sh/cd.c b/bin/sh/cd.c index 2c0e6dcd456b..9121dc4215ca 100644 --- a/bin/sh/cd.c +++ b/bin/sh/cd.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)cd.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/error.c b/bin/sh/error.c index 96e653459776..77ade563b0c0 100644 --- a/bin/sh/error.c +++ b/bin/sh/error.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); /* * Errors and exceptions. diff --git a/bin/sh/eval.c b/bin/sh/eval.c index 0c3f85bf480e..5d8f309f32bc 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/exec.c b/bin/sh/exec.c index c503617c5703..cd6c7005b0cb 100644 --- a/bin/sh/exec.c +++ b/bin/sh/exec.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)exec.c 8.4 (Berkeley) 6/8/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/expand.c b/bin/sh/expand.c index 46214b994ad2..eaab1bd870d6 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 51e419cf0b36..37a10bff5cd0 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/input.c b/bin/sh/input.c index b1b9e797a5b6..9f8df53013b6 100644 --- a/bin/sh/input.c +++ b/bin/sh/input.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)input.c 8.3 (Berkeley) 6/9/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include /* defines BUFSIZ */ #include diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index 9be3e04f0393..efdb69e413e3 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/mail.c b/bin/sh/mail.c index 1b3594fe9648..482b501b6376 100644 --- a/bin/sh/mail.c +++ b/bin/sh/mail.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)mail.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); /* * Routines to check for mail. (Perhaps make part of main.c?) diff --git a/bin/sh/main.c b/bin/sh/main.c index 460693a1f76d..962546b6a02c 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -44,9 +44,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/28/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c index 651501c42a15..a50d6617debc 100644 --- a/bin/sh/memalloc.c +++ b/bin/sh/memalloc.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)memalloc.c 8.3 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include "shell.h" #include "output.h" diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index 21fc11e43c7e..2b7ab9c75b0a 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); /* * Miscellaneous builtins. diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c index 4aa29fc89b99..5902fe6ce4e0 100644 --- a/bin/sh/mkinit.c +++ b/bin/sh/mkinit.c @@ -44,9 +44,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)mkinit.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); /* * This program scans all the source files for code to handle various diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c index 1f14eab3c5c5..371ca16ddd97 100644 --- a/bin/sh/mknodes.c +++ b/bin/sh/mknodes.c @@ -44,9 +44,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)mknodes.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); /* * This program reads the nodetypes file and nodes.c.pat file. It generates diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c index 778ab3cb4506..0b5971d92843 100644 --- a/bin/sh/mksyntax.c +++ b/bin/sh/mksyntax.c @@ -44,9 +44,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)mksyntax.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); /* * This program creates syntax.h and syntax.c. diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c index 993cbd213a9a..bc3d1cac84da 100644 --- a/bin/sh/mystring.c +++ b/bin/sh/mystring.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)mystring.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); /* * String functions. diff --git a/bin/sh/options.c b/bin/sh/options.c index 07ca3dbaaf03..54fdd72c6514 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/output.c b/bin/sh/output.c index ab56b427ace0..f6c0ef0a6ddf 100644 --- a/bin/sh/output.c +++ b/bin/sh/output.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)output.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); /* * Shell output routines. We use our own output routines because: diff --git a/bin/sh/parser.c b/bin/sh/parser.c index e88584814995..ac6b2885ffda 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include diff --git a/bin/sh/redir.c b/bin/sh/redir.c index 60a61517f3e3..ec9e5cc02a04 100644 --- a/bin/sh/redir.c +++ b/bin/sh/redir.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)redir.c 8.2 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/show.c b/bin/sh/show.c index 0e9a181609b7..e6bf574c18e9 100644 --- a/bin/sh/show.c +++ b/bin/sh/show.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)show.c 8.3 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/trap.c b/bin/sh/trap.c index 20bd9f9817cb..67f30778fd4f 100644 --- a/bin/sh/trap.c +++ b/bin/sh/trap.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)trap.c 8.5 (Berkeley) 6/5/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sh/var.c b/bin/sh/var.c index 8a3abb7dbf51..a4241af223a7 100644 --- a/bin/sh/var.c +++ b/bin/sh/var.c @@ -38,9 +38,9 @@ #if 0 static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index 94263e550d05..7b1fb2a25e3e 100644 --- a/bin/sleep/sleep.c +++ b/bin/sleep/sleep.c @@ -41,9 +41,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c index 297ba6b4eee9..bb909ad45b54 100644 --- a/bin/stty/cchar.c +++ b/bin/stty/cchar.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)cchar.c 8.5 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c index be0218a2411e..dbf2532faea3 100644 --- a/bin/stty/gfmt.c +++ b/bin/stty/gfmt.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)gfmt.c 8.6 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include diff --git a/bin/stty/key.c b/bin/stty/key.c index 1b9ce2bc99b9..78bc2edc2868 100644 --- a/bin/stty/key.c +++ b/bin/stty/key.c @@ -34,11 +34,10 @@ #ifndef lint #if 0 static char sccsid[] = "@(#)key.c 8.3 (Berkeley) 4/2/94"; -#else -static const char rcsid[] = - "$FreeBSD$"; #endif #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include diff --git a/bin/stty/modes.c b/bin/stty/modes.c index 9cfcfea065b2..d5400e7ba8b9 100644 --- a/bin/stty/modes.c +++ b/bin/stty/modes.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)modes.c 8.3 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/stty/print.c b/bin/stty/print.c index 63fe8d6ce1be..064d4e70688a 100644 --- a/bin/stty/print.c +++ b/bin/stty/print.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include diff --git a/bin/stty/stty.c b/bin/stty/stty.c index 049667adcf1e..75d05ffe391e 100644 --- a/bin/stty/stty.c +++ b/bin/stty/stty.c @@ -41,9 +41,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)stty.c 8.3 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include diff --git a/bin/stty/util.c b/bin/stty/util.c index a5b6790d4082..a2678d8be087 100644 --- a/bin/stty/util.c +++ b/bin/stty/util.c @@ -35,9 +35,9 @@ #if 0 static char sccsid[] = "@(#)util.c 8.3 (Berkeley) 4/2/94"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/sync/sync.c b/bin/sync/sync.c index 54ea61ea4178..42a7abd119d2 100644 --- a/bin/sync/sync.c +++ b/bin/sync/sync.c @@ -41,9 +41,9 @@ static char const copyright[] = #if 0 static char sccsid[] = "@(#)sync.c 8.1 (Berkeley) 5/31/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/bin/test/test.c b/bin/test/test.c index 4086bd75d97b..912b845d5fbb 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -10,10 +10,8 @@ * This program is in the Public Domain. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include #include