Add __FBSDID()s to libutil

21 files changed, 62 insertions, 54 deletions

diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c
index d315a7f..eb27bb7 100644
--- a/lib/libc/posix1e/extattr.c
+++ b/lib/libc/posix1e/extattr.c
@@ -22,9 +22,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$");
+
 /*
  * TrustedBSD: Utility functions for extended attributes.
  */
diff --git a/lib/libutil/_secure_path.c b/lib/libutil/_secure_path.c
index c27003c..5c6572d 100644
--- a/lib/libutil/_secure_path.c
+++ b/lib/libutil/_secure_path.c
@@ -17,10 +17,10 @@
  * 4. Absolutely no warranty of function or purpose is made by the authors.
  * 5. Modifications may be freely made to this file providing the above
  *    conditions are met.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c
index 9d0adce..8f3842e 100644
--- a/lib/libutil/auth.c
+++ b/lib/libutil/auth.c
@@ -1,5 +1,4 @@
 /*
- *
  * Simple authentication database handling code.
  *
  * Copyright (c) 1998
@@ -27,11 +26,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 <unistd.h>
 #include <syslog.h>
 #include <sys/types.h>
diff --git a/lib/libutil/extattr.c b/lib/libutil/extattr.c
index d315a7f..eb27bb7 100644
--- a/lib/libutil/extattr.c
+++ b/lib/libutil/extattr.c
@@ -22,9 +22,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$");
+
 /*
  * TrustedBSD: Utility functions for extended attributes.
  */
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index 87c1c03..ba7c4b4 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -30,9 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$FreeBSD$");
-#endif
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <assert.h>
diff --git a/lib/libutil/login.c b/lib/libutil/login.c
index 322c9a6..894d555 100644
--- a/lib/libutil/login.c
+++ b/lib/libutil/login.c
@@ -31,12 +31,13 @@
  * SUCH DAMAGE.
  */
 
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)login.c	8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/login_auth.c b/lib/libutil/login_auth.c
index 1fb21ca..70227a9 100644
--- a/lib/libutil/login_auth.c
+++ b/lib/libutil/login_auth.c
@@ -24,10 +24,11 @@
  *    conditions are met.
  *
  * Low-level routines relating to the user capabilities database
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c
index f841961..cb8aded 100644
--- a/lib/libutil/login_cap.c
+++ b/lib/libutil/login_cap.c
@@ -24,10 +24,11 @@
  *    conditions are met.
  *
  * Low-level routines relating to the user capabilities database
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index 36c5c50..b8b956b 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -20,10 +20,11 @@
  *    conditions are met.
  *
  * High-level routines relating to use of the user capabilities database
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libutil/login_crypt.c b/lib/libutil/login_crypt.c
index e080ba9..f3d83a8 100644
--- a/lib/libutil/login_crypt.c
+++ b/lib/libutil/login_crypt.c
@@ -22,10 +22,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 <login_cap.h>
diff --git a/lib/libutil/login_ok.c b/lib/libutil/login_ok.c
index 4c4724e..e66110c 100644
--- a/lib/libutil/login_ok.c
+++ b/lib/libutil/login_ok.c
@@ -19,10 +19,11 @@
  *    conditions are met.
  *
  * Support allow/deny lists in login class capabilities
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/lib/libutil/login_times.c b/lib/libutil/login_times.c
index af58974..add9135 100644
--- a/lib/libutil/login_times.c
+++ b/lib/libutil/login_times.c
@@ -19,10 +19,11 @@
  *    conditions are met.
  *
  * Login period parsing and comparison functions.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index eb32fc7..5981198 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -31,12 +31,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)login_tty.c	8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/logout.c b/lib/libutil/logout.c
index c0bd859..b3341f1 100644
--- a/lib/libutil/logout.c
+++ b/lib/libutil/logout.c
@@ -31,12 +31,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)logout.c	8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/logwtmp.c b/lib/libutil/logwtmp.c
index d77f8a4..9f12870 100644
--- a/lib/libutil/logwtmp.c
+++ b/lib/libutil/logwtmp.c
@@ -31,12 +31,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/property.c b/lib/libutil/property.c
index 91189d9..815ce6c 100644
--- a/lib/libutil/property.c
+++ b/lib/libutil/property.c
@@ -27,11 +27,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 <ctype.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 60ca6ed..a82ef07 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -31,12 +31,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)pty.c	8.3 (Berkeley) 5/16/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c
index c41b896..9c033e9 100644
--- a/lib/libutil/realhostname.c
+++ b/lib/libutil/realhostname.c
@@ -22,10 +22,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/socket.h>
diff --git a/lib/libutil/stub.c b/lib/libutil/stub.c
index e8ffa19..ef19276 100644
--- a/lib/libutil/stub.c
+++ b/lib/libutil/stub.c
@@ -22,10 +22,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 <stdio.h>
 #include <stdlib.h>
 
diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
index 61e0fdb..a2cdf19 100644
--- a/lib/libutil/trimdomain.c
+++ b/lib/libutil/trimdomain.c
@@ -26,10 +26,8 @@
  *
  */
 
-#if !defined(lint)
-static const char rcsid[] =
- "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c
index a81d91a..6b2e2c5 100644
--- a/lib/libutil/uucplock.c
+++ b/lib/libutil/uucplock.c
@@ -29,11 +29,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$");
+
 #ifndef lint
 static const char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */