From c1920558b3c4efbeea4d0c833aa9cb4091533ff1 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 3 Jul 2018 17:31:45 +0000
Subject: [PATCH] Clean up the vcs ID strings in libc's gen/ directory.

- Move CSRG IDs into __SCCSID().
- When a file has been copied, consistently use 'From: <tag>' for strings
  referencing the version of the source file copied from in the license
  block comment.
- Some of the 'From:' tags were using $FreeBSD$ that was being expanded on
  each checkout.  Fix those to hardcode the FreeBSD tag from the file that
  was copied at the time of the copy.
- When multiple strings are present list them in "chronological" order,
  so CSRG (__SCCSID) before FreeBSD (__FBSDID).  If a file came from
  OtherBSD and contains a CSRG ID from the OtherBSD file, use the order
  CSRG -> OtherBSD -> FreeBSD.

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D15831
---
 lib/libc/gen/__xuname.c            | 5 ++---
 lib/libc/gen/alarm.c               | 4 +---
 lib/libc/gen/assert.c              | 4 +---
 lib/libc/gen/clock.c               | 4 +---
 lib/libc/gen/closedir.c            | 4 +---
 lib/libc/gen/confstr.c             | 4 +---
 lib/libc/gen/crypt.c               | 5 +----
 lib/libc/gen/daemon.c              | 4 +---
 lib/libc/gen/devname.c             | 4 +---
 lib/libc/gen/disklabel.c           | 4 +---
 lib/libc/gen/err.c                 | 4 +---
 lib/libc/gen/errlst.c              | 4 +---
 lib/libc/gen/exec.c                | 4 +---
 lib/libc/gen/fnmatch.c             | 4 +---
 lib/libc/gen/fstab.c               | 4 +---
 lib/libc/gen/fts-compat.c          | 9 ++-------
 lib/libc/gen/fts-compat11.c        | 9 ++-------
 lib/libc/gen/fts.c                 | 7 +------
 lib/libc/gen/ftw-compat11.c        | 2 +-
 lib/libc/gen/getbootfile.c         | 5 ++---
 lib/libc/gen/getbsize.c            | 4 +---
 lib/libc/gen/getcap.c              | 4 +---
 lib/libc/gen/getcwd.c              | 4 +---
 lib/libc/gen/getdomainname.c       | 4 +---
 lib/libc/gen/getgrouplist.c        | 4 +---
 lib/libc/gen/gethostname.c         | 4 +---
 lib/libc/gen/getloadavg.c          | 4 +---
 lib/libc/gen/getlogin.c            | 4 +---
 lib/libc/gen/getmntinfo-compat11.c | 5 ++---
 lib/libc/gen/getmntinfo.c          | 4 +---
 lib/libc/gen/getnetgrent.c         | 4 +---
 lib/libc/gen/getosreldate.c        | 4 +---
 lib/libc/gen/getpagesize.c         | 4 +---
 lib/libc/gen/getttyent.c           | 4 +---
 lib/libc/gen/getusershell.c        | 6 ++----
 lib/libc/gen/getvfsbyname.c        | 4 +---
 lib/libc/gen/glob-compat11.c       | 6 ++----
 lib/libc/gen/glob.c                | 4 +---
 lib/libc/gen/initgroups.c          | 4 +---
 lib/libc/gen/isatty.c              | 4 +---
 lib/libc/gen/nftw-compat11.c       | 4 ++--
 lib/libc/gen/nice.c                | 4 +---
 lib/libc/gen/nlist.c               | 4 +---
 lib/libc/gen/opendir.c             | 4 +---
 lib/libc/gen/pause.c               | 4 +---
 lib/libc/gen/popen.c               | 4 +---
 lib/libc/gen/psignal.c             | 4 +---
 lib/libc/gen/pw_scan.c             | 4 +---
 lib/libc/gen/raise.c               | 4 +---
 lib/libc/gen/readdir-compat11.c    | 7 ++-----
 lib/libc/gen/readdir.c             | 4 +---
 lib/libc/gen/rewinddir.c           | 4 +---
 lib/libc/gen/scandir-compat11.c    | 7 ++-----
 lib/libc/gen/scandir.c             | 4 +---
 lib/libc/gen/seekdir.c             | 4 +---
 lib/libc/gen/setdomainname.c       | 4 +---
 lib/libc/gen/sethostname.c         | 4 +---
 lib/libc/gen/setjmperr.c           | 4 +---
 lib/libc/gen/setmode.c             | 4 +---
 lib/libc/gen/siginterrupt.c        | 4 +---
 lib/libc/gen/siglist.c             | 4 +---
 lib/libc/gen/signal.c              | 4 +---
 lib/libc/gen/sigsetops.c           | 6 +-----
 lib/libc/gen/sleep.c               | 4 +---
 lib/libc/gen/stringlist.c          | 4 +---
 lib/libc/gen/strtofflags.c         | 4 +---
 lib/libc/gen/sysconf.c             | 4 +---
 lib/libc/gen/sysctl.c              | 4 +---
 lib/libc/gen/syslog.c              | 4 +---
 lib/libc/gen/telldir.c             | 4 +---
 lib/libc/gen/termios.c             | 4 +---
 lib/libc/gen/time.c                | 4 +---
 lib/libc/gen/times.c               | 4 +---
 lib/libc/gen/timezone.c            | 4 +---
 lib/libc/gen/ttyname.c             | 4 +---
 lib/libc/gen/ttyslot.c             | 4 +---
 lib/libc/gen/ualarm.c              | 4 +---
 lib/libc/gen/uname.c               | 4 +---
 lib/libc/gen/usleep.c              | 4 +---
 lib/libc/gen/utime.c               | 4 +---
 lib/libc/gen/valloc.c              | 4 +---
 lib/libc/gen/wait.c                | 4 +---
 lib/libc/gen/wait3.c               | 4 +---
 lib/libc/gen/waitpid.c             | 4 +---
 84 files changed, 94 insertions(+), 269 deletions(-)

diff --git a/lib/libc/gen/__xuname.c b/lib/libc/gen/__xuname.c
index 38ea8f345bcf..fba5eaeebc88 100644
--- a/lib/libc/gen/__xuname.c
+++ b/lib/libc/gen/__xuname.c
@@ -27,11 +27,10 @@
  * 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.
+ *
+ * From: @(#)uname.c	8.1 (Berkeley) 1/4/94
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";*/
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c
index 49b2f4500873..64bc7a86ebb5 100644
--- a/lib/libc/gen/alarm.c
+++ b/lib/libc/gen/alarm.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)alarm.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)alarm.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/lib/libc/gen/assert.c b/lib/libc/gen/assert.c
index 1c73337c6a2a..1a6ef1a8404b 100644
--- a/lib/libc/gen/assert.c
+++ b/lib/libc/gen/assert.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)assert.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)assert.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <assert.h>
diff --git a/lib/libc/gen/clock.c b/lib/libc/gen/clock.c
index 2fb813ddb24d..d20bbf878f50 100644
--- a/lib/libc/gen/clock.c
+++ b/lib/libc/gen/clock.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)clock.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)clock.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c
index 9fec1649df22..b83ef273895b 100644
--- a/lib/libc/gen/closedir.c
+++ b/lib/libc/gen/closedir.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)closedir.c	8.1 (Berkeley) 6/10/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)closedir.c	8.1 (Berkeley) 6/10/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/confstr.c b/lib/libc/gen/confstr.c
index 7e826f5b3978..dc8ffff0d68f 100644
--- a/lib/libc/gen/confstr.c
+++ b/lib/libc/gen/confstr.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)confstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)confstr.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c
index 11b79d58ed37..65033091d8ed 100644
--- a/lib/libc/gen/crypt.c
+++ b/lib/libc/gen/crypt.c
@@ -32,11 +32,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/* from static char sccsid[] = "@(#)crypt.c	5.11 (Berkeley) 6/25/91"; */
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/cdefs.h>
+__SCCSID("@(#)crypt.c	5.11 (Berkeley) 6/25/91");
 __FBSDID("$FreeBSD$");
 
 #include <stdio.h>
diff --git a/lib/libc/gen/daemon.c b/lib/libc/gen/daemon.c
index 467f0027700b..f6753a84c44a 100644
--- a/lib/libc/gen/daemon.c
+++ b/lib/libc/gen/daemon.c
@@ -30,10 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)daemon.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
index eff073568c57..e519b505f1f8 100644
--- a/lib/libc/gen/devname.c
+++ b/lib/libc/gen/devname.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)devname.c	8.2 (Berkeley) 4/29/95";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)devname.c	8.2 (Berkeley) 4/29/95");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index bcb4ce0aa499..d02644e1e1ce 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 5/3/95";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)disklabel.c	8.2 (Berkeley) 5/3/95");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
index 1ca92a9397c9..4193eca77f60 100644
--- a/lib/libc/gen/err.c
+++ b/lib/libc/gen/err.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)err.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/errlst.c b/lib/libc/gen/errlst.c
index e8825db4ec8d..c75a7a8405d2 100644
--- a/lib/libc/gen/errlst.c
+++ b/lib/libc/gen/errlst.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)errlst.c	8.2 (Berkeley) 11/16/93");
 __FBSDID("$FreeBSD$");
 
 #include <stdio.h>
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
index fcc229617a4a..799a89d5c7e3 100644
--- a/lib/libc/gen/exec.c
+++ b/lib/libc/gen/exec.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)exec.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index ffba8d3396e7..a14905cc0747 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -37,10 +37,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)fnmatch.c	8.2 (Berkeley) 4/16/94");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index 27e71ae701bb..3813202afb15 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fstab.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)fstab.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/fts-compat.c b/lib/libc/gen/fts-compat.c
index e5694d34fe01..c5bf060964c2 100644
--- a/lib/libc/gen/fts-compat.c
+++ b/lib/libc/gen/fts-compat.c
@@ -28,15 +28,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
+ * From: @(#)fts.c	8.6 (Berkeley) 8/14/94
+ * From: $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
  */
 
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
-#endif /* LIBC_SCCS and not lint */
-#endif
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/lib/libc/gen/fts-compat11.c b/lib/libc/gen/fts-compat11.c
index 1fc63d0d73ec..5de570a179bb 100644
--- a/lib/libc/gen/fts-compat11.c
+++ b/lib/libc/gen/fts-compat11.c
@@ -26,15 +26,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * from: $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
+ * From: @(#)fts.c	8.6 (Berkeley) 8/14/94
+ * From: $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
  */
 
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
-#endif /* LIBC_SCCS and not lint */
-#endif
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index eda1722139c6..8d93d8e169b9 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -31,13 +31,8 @@
  * $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
  */
 
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
-#endif /* LIBC_SCCS and not lint */
-#endif
-
 #include <sys/cdefs.h>
+__SCCSID("@(#)fts.c	8.6 (Berkeley) 8/14/94");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/ftw-compat11.c b/lib/libc/gen/ftw-compat11.c
index cad536d2dcd6..9678c70d0a8e 100644
--- a/lib/libc/gen/ftw-compat11.c
+++ b/lib/libc/gen/ftw-compat11.c
@@ -19,7 +19,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  *
- * from: $FreeBSD$
+ * From: FreeBSD: head/lib/libc/gen/ftw.c 239151 2012-08-09 15:11:38Z jilles
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c
index d08e82735ce9..983199471792 100644
--- a/lib/libc/gen/getbootfile.c
+++ b/lib/libc/gen/getbootfile.c
@@ -27,11 +27,10 @@
  * 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.
+ *
+ * From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c
index a977bf5fd3c4..e91c12282ddf 100644
--- a/lib/libc/gen/getbsize.c
+++ b/lib/libc/gen/getbsize.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getbsize.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)getbsize.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <err.h>
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index fde4fecd368a..364423fff0e0 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -32,10 +32,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getcap.c	8.3 (Berkeley) 3/25/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)getcap.c	8.3 (Berkeley) 3/25/94");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index 03fab839c01f..42a6c204ba06 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getcwd.c	8.5 (Berkeley) 2/7/95";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)getcwd.c	8.5 (Berkeley) 2/7/95");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
index 365a3b6dfd99..3df611b7e4c7 100644
--- a/lib/libc/gen/getdomainname.c
+++ b/lib/libc/gen/getdomainname.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)gethostname.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
index e66e2e0f61b1..c3c4af5f7cdb 100644
--- a/lib/libc/gen/getgrouplist.c
+++ b/lib/libc/gen/getgrouplist.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getgrouplist.c	8.2 (Berkeley) 12/8/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)getgrouplist.c	8.2 (Berkeley) 12/8/94");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/lib/libc/gen/gethostname.c b/lib/libc/gen/gethostname.c
index 1bb0c1cbedc8..8af10d6d0624 100644
--- a/lib/libc/gen/gethostname.c
+++ b/lib/libc/gen/gethostname.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)gethostname.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getloadavg.c b/lib/libc/gen/getloadavg.c
index aa9f235a9362..a0a707b6db9d 100644
--- a/lib/libc/gen/getloadavg.c
+++ b/lib/libc/gen/getloadavg.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getloadavg.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)getloadavg.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
index f2ac9c5b35d5..3a07ca36bca7 100644
--- a/lib/libc/gen/getlogin.c
+++ b/lib/libc/gen/getlogin.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getlogin.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)getlogin.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getmntinfo-compat11.c b/lib/libc/gen/getmntinfo-compat11.c
index 05ffb74dc8c5..b18da03133fd 100644
--- a/lib/libc/gen/getmntinfo-compat11.c
+++ b/lib/libc/gen/getmntinfo-compat11.c
@@ -25,11 +25,10 @@
  * 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.
+ *
+ * From: @(#)getmntinfo.c	8.1 (Berkeley) 6/4/93
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
index 5f5c33286671..250be99c27c5 100644
--- a/lib/libc/gen/getmntinfo.c
+++ b/lib/libc/gen/getmntinfo.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index 99d07b5f9cad..733fe024ee28 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -32,10 +32,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetgrent.c	8.2 (Berkeley) 4/27/95";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)getnetgrent.c	8.2 (Berkeley) 4/27/95");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/getosreldate.c b/lib/libc/gen/getosreldate.c
index 0e34087e1a7d..6a54df907546 100644
--- a/lib/libc/gen/getosreldate.c
+++ b/lib/libc/gen/getosreldate.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)gethostid.c	8.1 (Berkeley) 6/2/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/getpagesize.c b/lib/libc/gen/getpagesize.c
index c71941a8f993..b722bd27c0a3 100644
--- a/lib/libc/gen/getpagesize.c
+++ b/lib/libc/gen/getpagesize.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getpagesize.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)getpagesize.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
index cc36201a2d20..4b152095a946 100644
--- a/lib/libc/gen/getttyent.c
+++ b/lib/libc/gen/getttyent.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getttyent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)getttyent.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index 9a2525d87026..7ea09df4d847 100644
--- a/lib/libc/gen/getusershell.c
+++ b/lib/libc/gen/getusershell.c
@@ -29,11 +29,9 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getusershell.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-/*	$NetBSD: getusershell.c,v 1.17 1999/01/25 01:09:34 lukem Exp $	*/
 #include <sys/cdefs.h>
+__SCCSID("@(#)getusershell.c	8.1 (Berkeley) 6/4/93");
+__RCSID("$NetBSD: getusershell.c,v 1.17 1999/01/25 01:09:34 lukem Exp $");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
index 64c31ce664ea..70c744c369ed 100644
--- a/lib/libc/gen/getvfsbyname.c
+++ b/lib/libc/gen/getvfsbyname.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)kvm_getvfsbyname.c	8.1 (Berkeley) 4/3/95";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)kvm_getvfsbyname.c	8.1 (Berkeley) 4/3/95");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/glob-compat11.c b/lib/libc/gen/glob-compat11.c
index 2bdf99a0bf64..2a16618dd56f 100644
--- a/lib/libc/gen/glob-compat11.c
+++ b/lib/libc/gen/glob-compat11.c
@@ -34,12 +34,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * from: $FreeBSD$
+ * From: @(#)glob.c	8.3 (Berkeley) 10/13/93
+ * From: FreeBSD: head/lib/libc/gen/glob.c 317913 2017-05-07 19:52:56Z jilles
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 4e761a4b55c4..b014c8b716fa 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -37,10 +37,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)glob.c	8.3 (Berkeley) 10/13/93");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
index 2c60c8f7ec6d..882dadbeb9ab 100644
--- a/lib/libc/gen/initgroups.c
+++ b/lib/libc/gen/initgroups.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)initgroups.c	8.1 (Berkeley) 6/4/93";
-#endif
 #include <sys/cdefs.h>
+__SCCSID("@(#)initgroups.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/isatty.c b/lib/libc/gen/isatty.c
index 496fe5950324..de55b67ac0d0 100644
--- a/lib/libc/gen/isatty.c
+++ b/lib/libc/gen/isatty.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)isatty.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)isatty.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <termios.h>
diff --git a/lib/libc/gen/nftw-compat11.c b/lib/libc/gen/nftw-compat11.c
index 5293f9ed6ad4..1cf9ba8cb9b6 100644
--- a/lib/libc/gen/nftw-compat11.c
+++ b/lib/libc/gen/nftw-compat11.c
@@ -17,8 +17,8 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  *
- * from: $OpenBSD: nftw.c,v 1.7 2006/03/31 19:41:44 millert Exp $
- * from: $FreeBSD$
+ * From: $OpenBSD: nftw.c,v 1.7 2006/03/31 19:41:44 millert Exp $
+ * From: FreeBSD: head/lib/libc/gen/nftw.c 239160 2012-08-09 22:05:40Z jilles
  */
 
 #include <sys/cdefs.h>
diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c
index 2c3a577a6d8d..7f217059fb11 100644
--- a/lib/libc/gen/nice.c
+++ b/lib/libc/gen/nice.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)nice.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)nice.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 7c3dbd379c38..38fb4be3a071 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)nlist.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index ceca6be1f2d8..f264dd956a4c 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)opendir.c	8.8 (Berkeley) 5/1/95";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)opendir.c	8.8 (Berkeley) 5/1/95");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c
index b0cedc176444..f6650a73a710 100644
--- a/lib/libc/gen/pause.c
+++ b/lib/libc/gen/pause.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)pause.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)pause.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <signal.h>
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index 38f2e6ce678e..4f94405c2ff4 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -32,10 +32,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 5/3/95";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)popen.c	8.3 (Berkeley) 5/3/95");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index 23a04fe39cac..f4cb1079a493 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)psignal.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)psignal.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
index 7e88a227cf43..a7dbdf2cb5b9 100644
--- a/lib/libc/gen/pw_scan.c
+++ b/lib/libc/gen/pw_scan.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)pw_scan.c	8.3 (Berkeley) 4/2/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)pw_scan.c	8.3 (Berkeley) 4/2/94");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c
index fba6f77cfada..1b987c5fdadf 100644
--- a/lib/libc/gen/raise.c
+++ b/lib/libc/gen/raise.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)raise.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)raise.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <signal.h>
diff --git a/lib/libc/gen/readdir-compat11.c b/lib/libc/gen/readdir-compat11.c
index c374d35e7392..ecdaf824cb78 100644
--- a/lib/libc/gen/readdir-compat11.c
+++ b/lib/libc/gen/readdir-compat11.c
@@ -26,13 +26,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * from:
- * $FreeBSD$
+ * From: @(#)readdir.c	8.3 (Berkeley) 9/29/94
+ * From: FreeBSD: head/lib/libc/gen/readdir.c 314436 2017-02-28 23:42:47Z imp
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
index c021bebf53d9..9a2fae2784af 100644
--- a/lib/libc/gen/readdir.c
+++ b/lib/libc/gen/readdir.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)readdir.c	8.3 (Berkeley) 9/29/94");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index 47b7280521ff..973e3e147cc7 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rewinddir.c	8.1 (Berkeley) 6/8/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)rewinddir.c	8.1 (Berkeley) 6/8/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/scandir-compat11.c b/lib/libc/gen/scandir-compat11.c
index 28120c0bc13d..712d14ee9c04 100644
--- a/lib/libc/gen/scandir-compat11.c
+++ b/lib/libc/gen/scandir-compat11.c
@@ -26,13 +26,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * from:
- * $FreeBSD$
+ * From: @(#)scandir.c	8.3 (Berkeley) 1/2/94
+ * From: FreeBSD: head/lib/libc/gen/scandir.c 317372 2017-04-24 14:56:41Z pfg
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)scandir.c	8.3 (Berkeley) 1/2/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index 3cd444916342..036a0166d48b 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)scandir.c	8.3 (Berkeley) 1/2/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)scandir.c	8.3 (Berkeley) 1/2/94");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
index cc589b764478..3974af7d73ee 100644
--- a/lib/libc/gen/seekdir.c
+++ b/lib/libc/gen/seekdir.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)seekdir.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)seekdir.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
index 6caafa666141..2a001b9ffa98 100644
--- a/lib/libc/gen/setdomainname.c
+++ b/lib/libc/gen/setdomainname.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)sethostname.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c
index 1f1498cb1fbd..0e120775afb9 100644
--- a/lib/libc/gen/sethostname.c
+++ b/lib/libc/gen/sethostname.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)sethostname.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/setjmperr.c b/lib/libc/gen/setjmperr.c
index a04a468969c3..abc13c0339f1 100644
--- a/lib/libc/gen/setjmperr.c
+++ b/lib/libc/gen/setjmperr.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setjmperr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)setjmperr.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index a41eaabf1d60..05fe58952e9d 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -32,10 +32,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)setmode.c	8.2 (Berkeley) 3/25/94");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c
index ff48aeae05d0..2d7f9950776e 100644
--- a/lib/libc/gen/siginterrupt.c
+++ b/lib/libc/gen/siginterrupt.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)siginterrupt.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)siginterrupt.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
index e8c5e7e78f72..796a0b702136 100644
--- a/lib/libc/gen/siglist.c
+++ b/lib/libc/gen/siglist.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)siglist.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)siglist.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <signal.h>
diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c
index f4abd2b9f035..62af2e95bc79 100644
--- a/lib/libc/gen/signal.c
+++ b/lib/libc/gen/signal.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)signal.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)signal.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
index a8ceb3a90d00..933bfa13ab01 100644
--- a/lib/libc/gen/sigsetops.c
+++ b/lib/libc/gen/sigsetops.c
@@ -27,14 +27,10 @@
  * 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.
- *
- *	@(#)sigsetops.c	8.1 (Berkeley) 6/4/93
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sigsetops.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)sigsetops.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <errno.h>
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
index 9415d66b0b22..620fda36ac10 100644
--- a/lib/libc/gen/sleep.c
+++ b/lib/libc/gen/sleep.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sleep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)sleep.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/stringlist.c b/lib/libc/gen/stringlist.c
index f79b892169d1..158f3d20705d 100644
--- a/lib/libc/gen/stringlist.c
+++ b/lib/libc/gen/stringlist.c
@@ -26,10 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__RCSID("$NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/strtofflags.c b/lib/libc/gen/strtofflags.c
index 7f2c8ae13af7..174c6742e232 100644
--- a/lib/libc/gen/strtofflags.c
+++ b/lib/libc/gen/strtofflags.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)stat_flags.c	8.1 (Berkeley) 5/31/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
index bc42c47a5bd7..c33c73dfb27a 100644
--- a/lib/libc/gen/sysconf.c
+++ b/lib/libc/gen/sysconf.c
@@ -32,10 +32,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)sysconf.c	8.2 (Berkeley) 3/20/94");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index 5c194ef05207..274e199dad5f 100644
--- a/lib/libc/gen/sysctl.c
+++ b/lib/libc/gen/sysctl.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sysctl.c	8.2 (Berkeley) 1/4/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)sysctl.c	8.2 (Berkeley) 1/4/94");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index dcabb7a16fc3..a0f1ddc97535 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)syslog.c	8.5 (Berkeley) 4/29/95");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
index 29299388f436..12309cf93266 100644
--- a/lib/libc/gen/telldir.c
+++ b/lib/libc/gen/telldir.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)telldir.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)telldir.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/termios.c b/lib/libc/gen/termios.c
index 77a6a3abfc54..7b98c486f472 100644
--- a/lib/libc/gen/termios.c
+++ b/lib/libc/gen/termios.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)termios.c	8.2 (Berkeley) 2/21/94");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c
index 92793c515b72..c08d58ed9a66 100644
--- a/lib/libc/gen/time.c
+++ b/lib/libc/gen/time.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)time.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
index 5ab847885203..d811b553b990 100644
--- a/lib/libc/gen/times.c
+++ b/lib/libc/gen/times.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)times.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)times.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/lib/libc/gen/timezone.c b/lib/libc/gen/timezone.c
index 98f82ff5bdec..f99a6f919262 100644
--- a/lib/libc/gen/timezone.c
+++ b/lib/libc/gen/timezone.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)timezone.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)timezone.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index 759b2eea687b..0984538eaf76 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ttyname.c	8.2 (Berkeley) 1/27/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)ttyname.c	8.2 (Berkeley) 1/27/94");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c
index 489c8b6957a4..fc1b0565afee 100644
--- a/lib/libc/gen/ttyslot.c
+++ b/lib/libc/gen/ttyslot.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ttyslot.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)ttyslot.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 int __ttyslot(void);
diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c
index 2aa816eb14b0..a0b149547573 100644
--- a/lib/libc/gen/ualarm.c
+++ b/lib/libc/gen/ualarm.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ualarm.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)ualarm.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/time.h>
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
index 3385d06ed67a..bc72ff9d3c39 100644
--- a/lib/libc/gen/uname.c
+++ b/lib/libc/gen/uname.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)uname.c	8.1 (Berkeley) 1/4/94");
 __FBSDID("$FreeBSD$");
 
 #define uname wrapped_uname
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
index 5360cd2e66e5..e800f6275617 100644
--- a/lib/libc/gen/usleep.c
+++ b/lib/libc/gen/usleep.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)usleep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)usleep.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
index fd104f2ebaaa..3474849571b7 100644
--- a/lib/libc/gen/utime.c
+++ b/lib/libc/gen/utime.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)utime.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)utime.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <sys/time.h>
diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c
index f7d20087ffe8..b058543f54ac 100644
--- a/lib/libc/gen/valloc.c
+++ b/lib/libc/gen/valloc.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)valloc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)valloc.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include <stdlib.h>
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
index 7f91d51b6615..b4fc17ee8113 100644
--- a/lib/libc/gen/wait.c
+++ b/lib/libc/gen/wait.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wait.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)wait.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c
index 4395a4649290..104ab8e5652e 100644
--- a/lib/libc/gen/wait3.c
+++ b/lib/libc/gen/wait3.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wait3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)wait3.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
index 8bcabd4d9e8e..c17cefa09ab3 100644
--- a/lib/libc/gen/waitpid.c
+++ b/lib/libc/gen/waitpid.c
@@ -29,10 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)waitpid.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
+__SCCSID("@(#)waitpid.c	8.1 (Berkeley) 6/4/93");
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"