From 8719c58fefefd5ceebb076be7e40b2a2be317c36 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sun, 30 Sep 2001 22:35:07 +0000 Subject: [PATCH] Add __FBSDID()s to libutil --- lib/libc/posix1e/extattr.c | 6 ++++-- lib/libutil/_secure_path.c | 4 ++-- lib/libutil/auth.c | 7 +++---- lib/libutil/extattr.c | 6 ++++-- lib/libutil/fparseln.c | 4 +--- lib/libutil/login.c | 7 ++++--- lib/libutil/login_auth.c | 5 +++-- lib/libutil/login_cap.c | 5 +++-- lib/libutil/login_class.c | 5 +++-- lib/libutil/login_crypt.c | 5 +++-- lib/libutil/login_ok.c | 5 +++-- lib/libutil/login_times.c | 5 +++-- lib/libutil/login_tty.c | 6 +++--- lib/libutil/logout.c | 6 +++--- lib/libutil/logwtmp.c | 6 +++--- lib/libutil/property.c | 6 +++--- lib/libutil/pty.c | 6 +++--- lib/libutil/realhostname.c | 5 +++-- lib/libutil/stub.c | 5 +++-- lib/libutil/trimdomain.c | 6 ++---- lib/libutil/uucplock.c | 6 +++--- 21 files changed, 62 insertions(+), 54 deletions(-) diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c index d315a7f5bef5..eb27bb7d33a6 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 +__FBSDID("$FreeBSD$"); + /* * TrustedBSD: Utility functions for extended attributes. */ diff --git a/lib/libutil/_secure_path.c b/lib/libutil/_secure_path.c index c27003c46661..5c6572dec3d4 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libutil/auth.c b/lib/libutil/auth.c index 9d0adce1798a..8f3842ee8d56 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libutil/extattr.c b/lib/libutil/extattr.c index d315a7f5bef5..eb27bb7d33a6 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 +__FBSDID("$FreeBSD$"); + /* * TrustedBSD: Utility functions for extended attributes. */ diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c index 87c1c03db77b..ba7c4b45f291 100644 --- a/lib/libutil/fparseln.c +++ b/lib/libutil/fparseln.c @@ -30,9 +30,7 @@ */ #include -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$FreeBSD$"); -#endif +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libutil/login.c b/lib/libutil/login.c index 322c9a69d94e..894d555411b4 100644 --- a/lib/libutil/login.c +++ b/lib/libutil/login.c @@ -31,12 +31,13 @@ * SUCH DAMAGE. */ + +#include +__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 1fb21caee1f2..70227a9b392f 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c index f84196138419..cb8adedc9604 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 36c5c50539e3..b8b956b43f5f 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libutil/login_crypt.c b/lib/libutil/login_crypt.c index e080ba9f28e2..f3d83a8ec9c8 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 +__FBSDID("$FreeBSD$"); + #include #include diff --git a/lib/libutil/login_ok.c b/lib/libutil/login_ok.c index 4c4724e62120..e66110c1e8c4 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libutil/login_times.c b/lib/libutil/login_times.c index af58974db250..add9135222ac 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c index eb32fc723073..5981198e33b3 100644 --- a/lib/libutil/login_tty.c +++ b/lib/libutil/login_tty.c @@ -31,12 +31,12 @@ * SUCH DAMAGE. */ +#include +__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 c0bd85983f16..b3341f137cea 100644 --- a/lib/libutil/logout.c +++ b/lib/libutil/logout.c @@ -31,12 +31,12 @@ * SUCH DAMAGE. */ +#include +__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 d77f8a4fae47..9f12870f8803 100644 --- a/lib/libutil/logwtmp.c +++ b/lib/libutil/logwtmp.c @@ -31,12 +31,12 @@ * SUCH DAMAGE. */ +#include +__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 91189d9d8e09..815ce6cd0b9f 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 +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c index 60ca6ed3a9e5..a82ef077aa7d 100644 --- a/lib/libutil/pty.c +++ b/lib/libutil/pty.c @@ -31,12 +31,12 @@ * SUCH DAMAGE. */ +#include +__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 c41b896166e7..9c033e993134 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 +__FBSDID("$FreeBSD$"); + #include #include diff --git a/lib/libutil/stub.c b/lib/libutil/stub.c index e8ffa19e5528..ef1927639774 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 +__FBSDID("$FreeBSD$"); + #include #include diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c index 61e0fdba1a55..a2cdf190423b 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 +__FBSDID("$FreeBSD$"); #include diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c index a81d91a56ebc..6b2e2c5a6a1a 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 +__FBSDID("$FreeBSD$"); + #ifndef lint static const char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */