Consistently use __FBSDID

34 files changed, 72 insertions, 95 deletions

diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 3d626f6..6424f73 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -44,9 +44,9 @@ static char const copyright[] =
 #if 0
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #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/bin/chio/chio.c b/bin/chio/chio.c
index b0f160f..b89209a 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -39,6 +39,8 @@
 static const char copyright[] =
 	"@(#) Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index ff77de9..27695f3 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -41,9 +41,9 @@ static char const copyright[] =
 #if 0
 static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/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/bin/cp/cp.c b/bin/cp/cp.c
index be20cbb..2df30698 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -44,9 +44,9 @@ static char const copyright[] =
 #if 0
 static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Cp copies source files to target files.
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index aea1ce3..f894c00 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -35,9 +35,9 @@
 #if 0
 static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #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/bin/date/date.c b/bin/date/date.c
index 0cf1d1e..a8fa441 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -41,9 +41,9 @@ static char const copyright[] =
 #if 0
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/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/bin/date/netdate.c b/bin/date/netdate.c
index 14716df..0a67ade 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -35,9 +35,9 @@
 #if 0
 static char sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
 #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/bin/date/vary.c b/bin/date/vary.c
index 2e0bb88..a314e48 100644
--- a/bin/date/vary.c
+++ b/bin/date/vary.c
@@ -24,12 +24,9 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
 #include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <err.h>
 #include <time.h>
 #include <string.h>
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 1727404..490e33d 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -39,9 +39,9 @@
 #if 0
 static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index 5b56c57..734513a 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -39,9 +39,9 @@
 #if 0
 static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index bd951a7..7d163f8 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -39,9 +39,9 @@
 #if 0
 static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index d2d3a26..f797a7b 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -45,9 +45,9 @@ static char const copyright[] =
 #if 0
 static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #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/bin/dd/misc.c b/bin/dd/misc.c
index dcd68d5..f95a811 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -39,9 +39,9 @@
 #if 0
 static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index 90019e7..51eafde 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -39,9 +39,9 @@
 #if 0
 static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/mtio.h>
diff --git a/bin/df/df.c b/bin/df/df.c
index 063963e..b91dc66 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -45,11 +45,10 @@ static const char copyright[] =
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index 80137fa..7418749 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -41,9 +41,9 @@ static char const copyright[] =
 #if 0
 static char const sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index 989aaa3..6a7a2b1 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -41,9 +41,9 @@ static char const copyright[] =
 #if 0
 static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index 4f36602..db1f0e9 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -26,10 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] = 
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 9802bd6..b0b0153 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -35,10 +35,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <errno.h>
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index 06c6848..11dcc19 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -26,13 +26,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 
diff --git a/bin/ed/io.c b/bin/ed/io.c
index b0edf24..9ea8303 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -25,10 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "ed.h"
 
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 13e0b8a..349dbbf 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -32,10 +32,8 @@ static const char copyright[] =
  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * CREDITS
diff --git a/bin/ed/re.c b/bin/ed/re.c
index 5cd43fa..234824e 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -26,10 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "ed.h"
 
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index b8d215b..1c44328 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -26,10 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "ed.h"
 
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index 73d488c..6a8ca9e 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -25,10 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "ed.h"
 
diff --git a/bin/getfacl/getfacl.c b/bin/getfacl/getfacl.c
index 4c9550c..7becd17 100644
--- a/bin/getfacl/getfacl.c
+++ b/bin/getfacl/getfacl.c
@@ -24,18 +24,21 @@
  * 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$
  */
 /*
  * getfacl -- POSIX.1e utility to extract ACLs from files and directories
  * and send the results to stdout
  */
 
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/acl.h>
 #include <sys/stat.h>
+
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 7700bdd..ada7b43 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -41,9 +41,9 @@ static char const copyright[] =
 #if 0
 static char sccsid[] = "@(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index 865c9db..b170d35 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -41,9 +41,9 @@ static char const copyright[] =
 #if 0
 static char sccsid[] = "@(#)kill.c	8.4 (Berkeley) 4/28/95";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index 0b0b46b..288a5a8 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -41,9 +41,9 @@ static char const copyright[] =
 #if 0
 static char sccsid[] = "@(#)ln.c	8.2 (Berkeley) 3/31/94";
 #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/bin/ls/cmp.c b/bin/ls/cmp.c
index 981f1fc..38690fe 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -34,15 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)cmp.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 #endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 496c980..fb6eb1e 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -34,10 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993, 1994\n\
@@ -49,6 +45,8 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ls.c	8.5 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ls/print.c b/bin/ls/print.c
index 5068419..136012d 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -34,15 +34,13 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
 #endif /* not lint */
 #endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 65841b3..bbfe474 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -34,15 +34,13 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-
-__FBSDID("$FreeBSD$");
-
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 #endif
+#include <sys/types.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index 5f86588..2a0f05b 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -41,9 +41,9 @@ static char const copyright[] =
 #if 0
 static char sccsid[] = "@(#)mkdir.c	8.2 (Berkeley) 1/25/94";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/stat.h>