Cleanup

lib/libutil/_secure_path.3

@@ -17,7 +17,6 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\"
 .Dd May 10, 2020
 .Dt _SECURE_PATH 3
 .Os

lib/libutil/_secure_path.c

@@ -20,8 +20,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/11/lib/libutil/_secure_path.c 139012 2004-12-18 12:31:12Z ru $");
-
 #include <sys/types.h>
 #include <sys/stat.h>
 

lib/libutil/auth.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Simple authentication database handling code.
  *
@@ -31,8 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$FreeBSD: src/lib/libutil/auth.c,v 1.6 2003/06/14 18:42:37 markm Exp $");
-
 #include <stdlib.h>
 
 #include <libutil.h>

lib/libutil/expand_number.3

@@ -23,9 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: stable/11/lib/libutil/expand_number.3 354034 2019-10-24 19:14:37Z jhb $
-.\"
-.Dd July 20, 2019
+.Dd June 13, 2023
 .Dt EXPAND_NUMBER 3
 .Os
 .Sh NAME
@@ -63,6 +61,15 @@ The suffixes are:
 .It Li P Ta No peta Ta 1125899906842624
 .It Li E Ta No exa  Ta 1152921504606846976
 .El
+.Pp
+For historical reasons, the
+.Fn expand_number
+function accepts and ignores a single
+.Dq B
+suffix at the end of the
+.Fa buf
+string.
+However, the usage of this suffix is discouraged.
 .Sh RETURN VALUES
 .Rv -std
 .Sh ERRORS

lib/libutil/expand_number.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2007 Eric Anderson <[email protected]>
  * Copyright (c) 2007 Pawel Jakub Dawidek <[email protected]>
@@ -28,8 +28,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/11/lib/libutil/expand_number.c 331722 2018-03-29 02:50:57Z eadler $");
-
 #include <sys/types.h>
 #include <ctype.h>
 #include <errno.h>
@@ -76,6 +74,8 @@ expand_number(const char *buf, uint64_t *num)
 		shift = 10;
 		break;
 	case 'b':
+		shift = 0;
+		break;
 	case '\0': /* No unit. */
 		*num = number;
 		return (0);
@@ -85,6 +85,18 @@ expand_number(const char *buf, uint64_t *num)
 		return (-1);
 	}
 
+	/*
+	 * Treat 'b' as an ignored suffix for all unit except 'b',
+	 * otherwise there should be no remaining character(s).
+	 */
+	endptr++;
+	if (shift != 0 && tolower((unsigned char)*endptr) == 'b')
+		endptr++;
+	if (*endptr != '\0') {
+		errno = EINVAL;
+		return (-1);
+	}
+
 	if ((number << shift) >> shift != number) {
 		/* Overflow */
 		errno = ERANGE;

lib/libutil/flopen.3

@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2007 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .Dd July 28, 2017
 .Dt FLOPEN 3
 .Os

lib/libutil/flopen.c

@@ -1,7 +1,7 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2007-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,6 @@
  */
 
 #include <sys/cdefs.h>
-
 #include <sys/file.h>
 #include <sys/stat.h>
 

lib/libutil/fparseln.3

@@ -1,5 +1,4 @@
 .\"	$NetBSD: fparseln.3,v 1.7 1999/07/02 15:49:12 simonb Exp $
-.\" $FreeBSD: stable/11/lib/libutil/fparseln.3 267803 2014-06-23 18:40:21Z joel $
 .\"
 .\" Copyright (c) 1997 Christos Zoulas.  All rights reserved.
 .\"

lib/libutil/fparseln.c

@@ -32,7 +32,6 @@
  */
 
 #include <sys/cdefs.h>
-
 #include <sys/types.h>
 #include <assert.h>
 #include <errno.h>

lib/libutil/pidfile.3

@@ -22,7 +22,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .Dd May 10, 2020
 .Dt PIDFILE 3
 .Os

lib/libutil/property.3

@@ -22,8 +22,6 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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: stable/11/lib/libutil/property.3 236965 2012-06-12 17:02:53Z des $
 .\" "
 .Dd October 7, 1998
 .Dt PROPERTIES 3

lib/libutil/property.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  *
  * Simple property list handling code.
@@ -34,9 +34,6 @@
  */
 
 #include <sys/cdefs.h>
-/* $FreeBSD: src/lib/libutil/property.c,v 1.14 2005/11/28 16:30:16 jhb Exp $ */
-__MBSDID("$MidnightBSD: src/lib/libutil/property.c,v 1.4 2011/03/19 23:37:16 laffer1 Exp $");
-
 #include <sys/types.h>
 #include <ctype.h>
 #include <err.h>

lib/libutil/pty.3

@@ -22,7 +22,6 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.
-.\"
 .\" "
 .Dd June 2, 2018
 .Dt PTY 3

lib/libutil/pty.c

@@ -30,12 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)pty.c	8.3 (Berkeley) 5/16/94";
-#endif
-#endif /* LIBC_SCCS and not lint */
+__SCCSID("@(#)pty.c	8.3 (Berkeley) 5/16/94");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -100,6 +95,7 @@ forkpty(int *amaster, char *name, struct termios *termp, struct winsize *winp)
 		return (-1);
 	switch (pid = fork()) {
 	case -1:
+		(void)close(master);
 		(void)close(slave);
 		return (-1);
 	case 0:

lib/libutil/pw_util.3

@@ -22,7 +22,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .Dd May 10, 2020
 .Dt PW_UTIL 3
 .Os

lib/libutil/quotafile.3

@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2009 Dag-Erling Coïdan Smørgrav and
+.\" Copyright (c) 2009 Dag-Erling Smørgrav and
 .\" Marshall Kirk McKusick. All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .Dd December 28, 2009
 .Dt QUOTAFILE 3
 .Os

lib/libutil/quotafile.c

@@ -1,7 +1,7 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
- * Copyright (c) 2008 Dag-Erling Coïdan Smørgrav
+ * Copyright (c) 2008 Dag-Erling Smørgrav
  * Copyright (c) 2008 Marshall Kirk McKusick
  * All rights reserved.
  *
@@ -26,8 +26,6 @@
  * 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: stable/11/lib/libutil/quotafile.c 351730 2019-09-03 04:50:39Z sef $
  */
 
 #include <sys/types.h>

lib/libutil/realhostname.3

@@ -22,8 +22,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: stable/11/lib/libutil/realhostname.3 230234 2012-01-16 21:25:41Z ghelmer $
-.\"
 .Dd April 6, 1999
 .Dt REALHOSTNAME 3
 .Os

lib/libutil/realhostname.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1999 Brian Somers <[email protected]>
  * All rights reserved.
@@ -27,7 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/socket.h>
 

lib/libutil/realhostname_sa.3

@@ -49,7 +49,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .Dd January 11, 2000
 .Dt REALHOSTNAME_SA 3
 .Os

lib/libutil/stub.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2000 Brian Fundakowski Feldman
  * All rights reserved.
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/11/lib/libutil/stub.c 331722 2018-03-29 02:50:57Z eadler $");
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

lib/libutil/trimdomain.3

@@ -22,7 +22,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"
 .Dd April 7, 1999
 .Dt TRIMDOMAIN 3
 .Os

lib/libutil/trimdomain.c

@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001 Brian Somers <[email protected]>
  *   Based on original work by Atsushi Murai <[email protected]>
@@ -29,7 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-
 #include <sys/param.h>
 
 #include <libutil.h>

lib/libutil/uucplock.3

@@ -22,7 +22,6 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.
-.\"
 .\" "
 .Dd May 10, 2020
 .Dt UUCPLOCK 3

lib/libutil/uucplock.c

@@ -30,10 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-
-#ifndef lint
-static const char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
+__SCCSID("@(#)uucplock.c	8.1 (Berkeley) 6/6/93");
 
 #include <sys/types.h>
 #include <sys/file.h>