From c73d77cef9b173f448ce1db4669dd75d794d7ad9 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 3 Feb 2002 20:55:54 +0000
Subject: [PATCH] Use __FBSDID() and clean up the vendor tags.

---
 bin/ls/cmp.c   | 11 ++++++-----
 bin/ls/lomac.c |  4 +++-
 bin/ls/ls.c    | 11 ++++++-----
 bin/ls/print.c | 11 ++++++-----
 bin/ls/util.c  | 11 ++++++-----
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index 155edcca277..981f1fcaf94 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)cmp.c	8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ls/lomac.c b/bin/ls/lomac.c
index 2505da244c6..ed7e88281b0 100644
--- a/bin/ls/lomac.c
+++ b/bin/ls/lomac.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  * $Id: lomac.c,v 1.5 2001/11/26 19:25:52 bfeldman Exp $
- * $FreeBSD$
  */
 
 /*
@@ -40,6 +39,9 @@
  * this interface to determine the LOMAC attributes of files.
  */
 
+#include <sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/lomacio.h>
 
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index c5216f3228b..466539be7dc 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -34,20 +34,21 @@
  * 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 */
 
-#ifndef lint
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)ls.c	8.5 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/ls/print.c b/bin/ls/print.c
index c4ebbc0dab1..bcaf6118dc0 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 34b5b186651..172884c70af 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
+#include <sys/types.h>
+
+__FBSDID("$FreeBSD$");
+
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>