diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 3e5c6ca23511..110851e2a421 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -1,920 +1,936 @@
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Chris Torek and the American National Standards Committee X3,
 .\" on Information Processing Systems.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY 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.
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd May 22, 2018
+.Dd August 21, 2023
 .Dt PRINTF 3
 .Os
 .Sh NAME
 .Nm printf ,
 .Nm fprintf ,
 .Nm sprintf ,
 .Nm snprintf ,
 .Nm asprintf ,
 .Nm dprintf ,
 .Nm vprintf ,
 .Nm vfprintf ,
 .Nm vsprintf ,
 .Nm vsnprintf ,
 .Nm vasprintf ,
 .Nm vdprintf
 .Nd formatted output conversion
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
 .In stdio.h
 .Ft int
 .Fn printf "const char * restrict format" ...
 .Ft int
 .Fn fprintf "FILE * restrict stream" "const char * restrict format" ...
 .Ft int
 .Fn sprintf "char * restrict str" "const char * restrict format" ...
 .Ft int
 .Fn snprintf "char * restrict str" "size_t size" "const char * restrict format" ...
 .Ft int
 .Fn asprintf "char **ret" "const char *format" ...
 .Ft int
 .Fn dprintf "int fd" "const char * restrict format" ...
 .In stdarg.h
 .Ft int
 .Fn vprintf "const char * restrict format" "va_list ap"
 .Ft int
 .Fn vfprintf "FILE * restrict stream" "const char * restrict format" "va_list ap"
 .Ft int
 .Fn vsprintf "char * restrict str" "const char * restrict format" "va_list ap"
 .Ft int
 .Fn vsnprintf "char * restrict str" "size_t size" "const char * restrict format" "va_list ap"
 .Ft int
 .Fn vasprintf "char **ret" "const char *format" "va_list ap"
 .Ft int
 .Fn vdprintf "int fd" "const char * restrict format" "va_list ap"
 .Sh DESCRIPTION
 The
 .Fn printf
 family of functions produces output according to a
 .Fa format
 as described below.
 The
 .Fn printf
 and
 .Fn vprintf
 functions
 write output to
 .Dv stdout ,
 the standard output stream;
 .Fn fprintf
 and
 .Fn vfprintf
 write output to the given output
 .Fa stream ;
 .Fn dprintf
 and
 .Fn vdprintf
 write output to the given file descriptor;
 .Fn sprintf ,
 .Fn snprintf ,
 .Fn vsprintf ,
 and
 .Fn vsnprintf
 write to the character string
 .Fa str ;
 and
 .Fn asprintf
 and
 .Fn vasprintf
 dynamically allocate a new string with
 .Xr malloc 3 .
 .Pp
 These functions write the output under the control of a
 .Fa format
 string that specifies how subsequent arguments
 (or arguments accessed via the variable-length argument facilities of
 .Xr stdarg 3 )
 are converted for output.
 .Pp
 The
 .Fn asprintf
 and
 .Fn vasprintf
 functions
 set
 .Fa *ret
 to be a pointer to a buffer sufficiently large to hold the formatted string.
 This pointer should be passed to
 .Xr free 3
 to release the allocated storage when it is no longer needed.
 If sufficient space cannot be allocated,
 .Fn asprintf
 and
 .Fn vasprintf
 will return \-1 and set
 .Fa ret
 to be a
 .Dv NULL
 pointer.
 .Pp
 The
 .Fn snprintf
 and
 .Fn vsnprintf
 functions
 will write at most
 .Fa size Ns \-1
 of the characters printed into the output string
 (the
 .Fa size Ns 'th
 character then gets the terminating
 .Ql \e0 ) ;
 if the return value is greater than or equal to the
 .Fa size
 argument, the string was too short
 and some of the printed characters were discarded.
 The output is always null-terminated, unless
 .Fa size
 is 0.
 .Pp
 The
 .Fn sprintf
 and
 .Fn vsprintf
 functions
 effectively assume a
 .Fa size
 of
 .Dv INT_MAX + 1.
 .Pp
 The format string is composed of zero or more directives:
 ordinary
 .\" multibyte
 characters (not
 .Cm % ) ,
 which are copied unchanged to the output stream;
 and conversion specifications, each of which results
 in fetching zero or more subsequent arguments.
 Each conversion specification is introduced by
 the
 .Cm %
 character.
 The arguments must correspond properly (after type promotion)
 with the conversion specifier.
 After the
 .Cm % ,
 the following appear in sequence:
 .Bl -bullet
 .It
 An optional field, consisting of a decimal digit string followed by a
 .Cm $ ,
 specifying the next argument to access.
 If this field is not provided, the argument following the last
 argument accessed will be used.
 Arguments are numbered starting at
 .Cm 1 .
 If unaccessed arguments in the format string are interspersed with ones that
 are accessed the results will be indeterminate.
 .It
 Zero or more of the following flags:
 .Bl -tag -width ".So \  Sc (space)"
 .It Sq Cm #
 The value should be converted to an
 .Dq alternate form .
 For
 .Cm c , d , i , n , p , s ,
 and
 .Cm u
 conversions, this option has no effect.
 For
+.Cm b
+and
+.Cm B
+conversions, a non-zero result has the string
+.Ql 0b
+(or
+.Ql 0B
+for
+.Cm B
+conversions) prepended to it.
+For
 .Cm o
 conversions, the precision of the number is increased to force the first
 character of the output string to a zero.
 For
 .Cm x
 and
 .Cm X
 conversions, a non-zero result has the string
 .Ql 0x
 (or
 .Ql 0X
 for
 .Cm X
 conversions) prepended to it.
 For
 .Cm a , A , e , E , f , F , g ,
 and
 .Cm G
 conversions, the result will always contain a decimal point, even if no
 digits follow it (normally, a decimal point appears in the results of
 those conversions only if a digit follows).
 For
 .Cm g
 and
 .Cm G
 conversions, trailing zeros are not removed from the result as they
 would otherwise be.
 .It So Cm 0 Sc (zero)
 Zero padding.
 For all conversions except
 .Cm n ,
 the converted value is padded on the left with zeros rather than blanks.
 If a precision is given with a numeric conversion
-.Cm ( d , i , o , u , i , x ,
+.Cm ( b , B , d , i , o , u , i , x ,
 and
 .Cm X ) ,
 the
 .Cm 0
 flag is ignored.
 .It Sq Cm \-
 A negative field width flag;
 the converted value is to be left adjusted on the field boundary.
 Except for
 .Cm n
 conversions, the converted value is padded on the right with blanks,
 rather than on the left with blanks or zeros.
 A
 .Cm \-
 overrides a
 .Cm 0
 if both are given.
 .It So "\ " Sc (space)
 A blank should be left before a positive number
 produced by a signed conversion
 .Cm ( a , A , d , e , E , f , F , g , G ,
 or
 .Cm i ) .
 .It Sq Cm +
 A sign must always be placed before a
 number produced by a signed conversion.
 A
 .Cm +
 overrides a space if both are used.
 .It So "'" Sc (apostrophe)
 Decimal conversions
 .Cm ( d , u ,
 or
 .Cm i )
 or the integral portion of a floating point conversion
 .Cm ( f
 or
 .Cm F )
 should be grouped and separated by thousands using
 the non-monetary separator returned by
 .Xr localeconv 3 .
 .El
 .It
 An optional decimal digit string specifying a minimum field width.
 If the converted value has fewer characters than the field width, it will
 be padded with spaces on the left (or right, if the left-adjustment
 flag has been given) to fill out
 the field width.
 .It
 An optional precision, in the form of a period
 .Cm \&.
 followed by an
 optional digit string.
 If the digit string is omitted, the precision is taken as zero.
 This gives the minimum number of digits to appear for
-.Cm d , i , o , u , x ,
+.Cm b , B , d , i , o , u , x ,
 and
 .Cm X
 conversions, the number of digits to appear after the decimal-point for
 .Cm a , A , e , E , f ,
 and
 .Cm F
 conversions, the maximum number of significant digits for
 .Cm g
 and
 .Cm G
 conversions, or the maximum number of characters to be printed from a
 string for
 .Cm s
 conversions.
 .It
 An optional length modifier, that specifies the size of the argument.
 The following length modifiers are valid for the
-.Cm d , i , n , o , u , x ,
+.Cm b , B , d , i , n , o , u , x ,
 or
 .Cm X
 conversion:
 .Bl -column ".Cm q Em (deprecated)" ".Vt signed char" ".Vt unsigned long long" ".Vt long long *"
-.It Sy Modifier Ta Cm d , i Ta Cm o , u , x , X Ta Cm n
+.It Sy Modifier Ta Cm d , i Ta Cm b , B , o , u , x , X Ta Cm n
 .It Cm hh Ta Vt "signed char" Ta Vt "unsigned char" Ta Vt "signed char *"
 .It Cm h Ta Vt short Ta Vt "unsigned short" Ta Vt "short *"
 .It Cm l No (ell) Ta Vt long Ta Vt "unsigned long" Ta Vt "long *"
 .It Cm ll No (ell ell) Ta Vt "long long" Ta Vt "unsigned long long" Ta Vt "long long *"
 .It Cm j Ta Vt intmax_t Ta Vt uintmax_t Ta Vt "intmax_t *"
 .It Cm t Ta Vt ptrdiff_t Ta (see note) Ta Vt "ptrdiff_t *"
 .It Cm z Ta (see note) Ta Vt size_t Ta (see note)
 .It Cm q Em (deprecated) Ta Vt quad_t Ta Vt u_quad_t Ta Vt "quad_t *"
 .El
 .Pp
 Note:
 the
 .Cm t
 modifier, when applied to a
-.Cm o , u , x ,
+.Cm b , B , o , u , x ,
 or
 .Cm X
 conversion, indicates that the argument is of an unsigned type
 equivalent in size to a
 .Vt ptrdiff_t .
 The
 .Cm z
 modifier, when applied to a
 .Cm d
 or
 .Cm i
 conversion, indicates that the argument is of a signed type equivalent in
 size to a
 .Vt size_t .
 Similarly, when applied to an
 .Cm n
 conversion, it indicates that the argument is a pointer to a signed type
 equivalent in size to a
 .Vt size_t .
 .Pp
 The following length modifier is valid for the
 .Cm a , A , e , E , f , F , g ,
 or
 .Cm G
 conversion:
 .Bl -column ".Sy Modifier" ".Cm a , A , e , E , f , F , g , G"
 .It Sy Modifier Ta Cm a , A , e , E , f , F , g , G
 .It Cm l No (ell) Ta Vt double
 (ignored, same behavior as without it)
 .It Cm L Ta Vt "long double"
 .El
 .Pp
 The following length modifier is valid for the
 .Cm c
 or
 .Cm s
 conversion:
 .Bl -column ".Sy Modifier" ".Vt wint_t" ".Vt wchar_t *"
 .It Sy Modifier Ta Cm c Ta Cm s
 .It Cm l No (ell) Ta Vt wint_t Ta Vt "wchar_t *"
 .El
 .It
 A character that specifies the type of conversion to be applied.
 .El
 .Pp
 A field width or precision, or both, may be indicated by
 an asterisk
 .Ql *
 or an asterisk followed by one or more decimal digits and a
 .Ql $
 instead of a
 digit string.
 In this case, an
 .Vt int
 argument supplies the field width or precision.
 A negative field width is treated as a left adjustment flag followed by a
 positive field width; a negative precision is treated as though it were
 missing.
 If a single format directive mixes positional
 .Pq Li nn$
 and non-positional arguments, the results are undefined.
 .Pp
 The conversion specifiers and their meanings are:
-.Bl -tag -width ".Cm diouxX"
-.It Cm diouxX
+.Bl -tag -width ".Cm bBdiouxX"
+.It Cm bBdiouxX
 The
 .Vt int
-(or appropriate variant) argument is converted to signed decimal
+(or appropriate variant) argument is converted to
+unsigned binary
+.Cm ( b
+and
+.Cm B ) ,
+signed decimal
 .Cm ( d
 and
 .Cm i ) ,
 unsigned octal
 .Pq Cm o ,
 unsigned decimal
 .Pq Cm u ,
 or unsigned hexadecimal
 .Cm ( x
 and
 .Cm X )
 notation.
 The letters
 .Dq Li abcdef
 are used for
 .Cm x
 conversions; the letters
 .Dq Li ABCDEF
 are used for
 .Cm X
 conversions.
 The precision, if any, gives the minimum number of digits that must
 appear; if the converted value requires fewer digits, it is padded on
 the left with zeros.
 .It Cm DOU
 The
 .Vt "long int"
 argument is converted to signed decimal, unsigned octal, or unsigned
 decimal, as if the format had been
 .Cm ld , lo ,
 or
 .Cm lu
 respectively.
 These conversion characters are deprecated, and will eventually disappear.
 .It Cm eE
 The
 .Vt double
 argument is rounded and converted in the style
 .Sm off
 .Oo \- Oc Ar d Li \&. Ar ddd Li e \(+- Ar dd
 .Sm on
 where there is one digit before the
 decimal-point character
 and the number of digits after it is equal to the precision;
 if the precision is missing,
 it is taken as 6; if the precision is
 zero, no decimal-point character appears.
 An
 .Cm E
 conversion uses the letter
 .Ql E
 (rather than
 .Ql e )
 to introduce the exponent.
 The exponent always contains at least two digits; if the value is zero,
 the exponent is 00.
 .Pp
 For
 .Cm a , A , e , E , f , F , g ,
 and
 .Cm G
 conversions, positive and negative infinity are represented as
 .Li inf
 and
 .Li -inf
 respectively when using the lowercase conversion character, and
 .Li INF
 and
 .Li -INF
 respectively when using the uppercase conversion character.
 Similarly, NaN is represented as
 .Li nan
 when using the lowercase conversion, and
 .Li NAN
 when using the uppercase conversion.
 .It Cm fF
 The
 .Vt double
 argument is rounded and converted to decimal notation in the style
 .Sm off
 .Oo \- Oc Ar ddd Li \&. Ar ddd ,
 .Sm on
 where the number of digits after the decimal-point character
 is equal to the precision specification.
 If the precision is missing, it is taken as 6; if the precision is
 explicitly zero, no decimal-point character appears.
 If a decimal point appears, at least one digit appears before it.
 .It Cm gG
 The
 .Vt double
 argument is converted in style
 .Cm f
 or
 .Cm e
 (or
 .Cm F
 or
 .Cm E
 for
 .Cm G
 conversions).
 The precision specifies the number of significant digits.
 If the precision is missing, 6 digits are given; if the precision is zero,
 it is treated as 1.
 Style
 .Cm e
 is used if the exponent from its conversion is less than \-4 or greater than
 or equal to the precision.
 Trailing zeros are removed from the fractional part of the result; a
 decimal point appears only if it is followed by at least one digit.
 .It Cm aA
 The
 .Vt double
 argument is rounded and converted to hexadecimal notation in the style
 .Sm off
 .Oo \- Oc Li 0x Ar h Li \&. Ar hhhp Oo \(+- Oc Ar d ,
 .Sm on
 where the number of digits after the hexadecimal-point character
 is equal to the precision specification.
 If the precision is missing, it is taken as enough to represent
 the floating-point number exactly, and no rounding occurs.
 If the precision is zero, no hexadecimal-point character appears.
 The
 .Cm p
 is a literal character
 .Ql p ,
 and the exponent consists of a positive or negative sign
 followed by a decimal number representing an exponent of 2.
 The
 .Cm A
 conversion uses the prefix
 .Dq Li 0X
 (rather than
 .Dq Li 0x ) ,
 the letters
 .Dq Li ABCDEF
 (rather than
 .Dq Li abcdef )
 to represent the hex digits, and the letter
 .Ql P
 (rather than
 .Ql p )
 to separate the mantissa and exponent.
 .Pp
 Note that there may be multiple valid ways to represent floating-point
 numbers in this hexadecimal format.
 For example,
 .Li 0x1.92p+1 , 0x3.24p+0 , 0x6.48p-1 ,
 and
 .Li 0xc.9p-2
 are all equivalent.
 .Fx 8.0
 and later always prints finite non-zero numbers using
 .Ql 1
 as the digit before the hexadecimal point.
 Zeroes are always represented with a mantissa of 0 (preceded by a
 .Ql -
 if appropriate) and an exponent of
 .Li +0 .
 .It Cm C
 Treated as
 .Cm c
 with the
 .Cm l
 (ell) modifier.
 .It Cm c
 The
 .Vt int
 argument is converted to an
 .Vt "unsigned char" ,
 and the resulting character is written.
 .Pp
 If the
 .Cm l
 (ell) modifier is used, the
 .Vt wint_t
 argument shall be converted to a
 .Vt wchar_t ,
 and the (potentially multi-byte) sequence representing the
 single wide character is written, including any shift sequences.
 If a shift sequence is used, the shift state is also restored
 to the original state after the character.
 .It Cm S
 Treated as
 .Cm s
 with the
 .Cm l
 (ell) modifier.
 .It Cm s
 The
 .Vt "char *"
 argument is expected to be a pointer to an array of character type (pointer
 to a string).
 Characters from the array are written up to (but not including)
 a terminating
 .Dv NUL
 character;
 if a precision is specified, no more than the number specified are
 written.
 If a precision is given, no null character
 need be present; if the precision is not specified, or is greater than
 the size of the array, the array must contain a terminating
 .Dv NUL
 character.
 .Pp
 If the
 .Cm l
 (ell) modifier is used, the
 .Vt "wchar_t *"
 argument is expected to be a pointer to an array of wide characters
 (pointer to a wide string).
 For each wide character in the string, the (potentially multi-byte)
 sequence representing the
 wide character is written, including any shift sequences.
 If any shift sequence is used, the shift state is also restored
 to the original state after the string.
 Wide characters from the array are written up to (but not including)
 a terminating wide
 .Dv NUL
 character;
 if a precision is specified, no more than the number of bytes specified are
 written (including shift sequences).
 Partial characters are never written.
 If a precision is given, no null character
 need be present; if the precision is not specified, or is greater than
 the number of bytes required to render the multibyte representation of
 the string, the array must contain a terminating wide
 .Dv NUL
 character.
 .It Cm p
 The
 .Vt "void *"
 pointer argument is printed in hexadecimal (as if by
 .Ql %#x
 or
 .Ql %#lx ) .
 .It Cm n
 The number of characters written so far is stored into the
 integer indicated by the
 .Vt "int *"
 (or variant) pointer argument.
 No argument is converted.
 .It Cm m
 Print the string representation of the error code stored in the
 .Dv errno
 variable at the beginning of the call, as returned by
 .Xr strerror 3 .
 No argument is taken.
 .It Cm %
 A
 .Ql %
 is written.
 No argument is converted.
 The complete conversion specification
 is
 .Ql %% .
 .El
 .Pp
 The decimal point
 character is defined in the program's locale (category
 .Dv LC_NUMERIC ) .
 .Pp
 In no case does a non-existent or small field width cause truncation of
 a numeric field; if the result of a conversion is wider than the field
 width, the
 field is expanded to contain the conversion result.
 .Sh RETURN VALUES
 These functions return the number of characters printed
 (not including the trailing
 .Ql \e0
 used to end output to strings),
 except for
 .Fn snprintf
 and
 .Fn vsnprintf ,
 which return the number of characters that would have been printed if the
 .Fa size
 were unlimited
 (again, not including the final
 .Ql \e0 ) .
 These functions return a negative value if an error occurs.
 .Sh EXAMPLES
 To print a date and time in the form
 .Dq Li "Sunday, July 3, 10:02" ,
 where
 .Fa weekday
 and
 .Fa month
 are pointers to strings:
 .Bd -literal -offset indent
 #include <stdio.h>
 fprintf(stdout, "%s, %s %d, %.2d:%.2d\en",
 	weekday, month, day, hour, min);
 .Ed
 .Pp
 To print \*(Pi
 to five decimal places:
 .Bd -literal -offset indent
 #include <math.h>
 #include <stdio.h>
 fprintf(stdout, "pi = %.5f\en", 4 * atan(1.0));
 .Ed
 .Pp
 To allocate a 128 byte string and print into it:
 .Bd -literal -offset indent
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 char *newfmt(const char *fmt, ...)
 {
 	char *p;
 	va_list ap;
 	if ((p = malloc(128)) == NULL)
 		return (NULL);
 	va_start(ap, fmt);
 	(void) vsnprintf(p, 128, fmt, ap);
 	va_end(ap);
 	return (p);
 }
 .Ed
 .Sh COMPATIBILITY
 The conversion formats
 .Cm \&%D , \&%O ,
 and
 .Cm \&%U
 are not standard and
 are provided only for backward compatibility.
 The conversion format
 .Cm \&%m
 is also not standard and provides the popular extension from the
 .Tn GNU C
 library.
 .Pp
 The effect of padding the
 .Cm %p
 format with zeros (either by the
 .Cm 0
 flag or by specifying a precision), and the benign effect (i.e., none)
 of the
 .Cm #
 flag on
 .Cm %n
 and
 .Cm %p
 conversions, as well as other
 nonsensical combinations such as
 .Cm %Ld ,
 are not standard; such combinations
 should be avoided.
 .Sh ERRORS
 In addition to the errors documented for the
 .Xr write 2
 system call, the
 .Fn printf
 family of functions may fail if:
 .Bl -tag -width Er
 .It Bq Er EILSEQ
 An invalid wide character code was encountered.
 .It Bq Er ENOMEM
 Insufficient storage space is available.
 .It Bq Er EOVERFLOW
 The
 .Fa size
 argument exceeds
 .Dv INT_MAX + 1 ,
 or the return value would be too large to be represented by an
 .Vt int .
 .El
 .Sh SEE ALSO
 .Xr printf 1 ,
 .Xr errno 2 ,
 .Xr fmtcheck 3 ,
 .Xr scanf 3 ,
 .Xr setlocale 3 ,
 .Xr strerror 3 ,
 .Xr wprintf 3
 .Sh STANDARDS
 Subject to the caveats noted in the
 .Sx BUGS
 section below, the
 .Fn fprintf ,
 .Fn printf ,
 .Fn sprintf ,
 .Fn vprintf ,
 .Fn vfprintf ,
 and
 .Fn vsprintf
 functions
 conform to
 .St -ansiC
 and
 .St -isoC-99 .
 With the same reservation, the
 .Fn snprintf
 and
 .Fn vsnprintf
 functions conform to
 .St -isoC-99 ,
 while
 .Fn dprintf
 and
 .Fn vdprintf
 conform to
 .St -p1003.1-2008 .
 .Sh HISTORY
 The functions
 .Fn asprintf
 and
 .Fn vasprintf
 first appeared in the
 .Tn GNU C
 library.
 These were implemented by
 .An Peter Wemm Aq Mt peter@FreeBSD.org
 in
 .Fx 2.2 ,
 but were later replaced with a different implementation
 from
 .Ox 2.3
 by
 .An Todd C. Miller Aq Mt Todd.Miller@courtesan.com .
 The
 .Fn dprintf
 and
 .Fn vdprintf
 functions were added in
 .Fx 8.0 .
 The
 .Cm \&%m
 format extension first appeared in the
 .Tn GNU C
 library, and was implemented in
 .Fx 12.0 .
 .Sh BUGS
 The
 .Nm
 family of functions do not correctly handle multibyte characters in the
 .Fa format
 argument.
 .Sh SECURITY CONSIDERATIONS
 The
 .Fn sprintf
 and
 .Fn vsprintf
 functions are easily misused in a manner which enables malicious users
 to arbitrarily change a running program's functionality through
 a buffer overflow attack.
 Because
 .Fn sprintf
 and
 .Fn vsprintf
 assume an infinitely long string,
 callers must be careful not to overflow the actual space;
 this is often hard to assure.
 For safety, programmers should use the
 .Fn snprintf
 interface instead.
 For example:
 .Bd -literal
 void
 foo(const char *arbitrary_string, const char *and_another)
 {
 	char onstack[8];
 
 #ifdef BAD
 	/*
 	 * This first sprintf is bad behavior.  Do not use sprintf!
 	 */
 	sprintf(onstack, "%s, %s", arbitrary_string, and_another);
 #else
 	/*
 	 * The following two lines demonstrate better use of
 	 * snprintf().
 	 */
 	snprintf(onstack, sizeof(onstack), "%s, %s", arbitrary_string,
 	    and_another);
 #endif
 }
 .Ed
 .Pp
 The
 .Fn printf
 and
 .Fn sprintf
 family of functions are also easily misused in a manner
 allowing malicious users to arbitrarily change a running program's
 functionality by either causing the program
 to print potentially sensitive data
 .Dq "left on the stack" ,
 or causing it to generate a memory fault or bus error
 by dereferencing an invalid pointer.
 .Pp
 .Cm %n
 can be used to write arbitrary data to potentially carefully-selected
 addresses.
 Programmers are therefore strongly advised to never pass untrusted strings
 as the
 .Fa format
 argument, as an attacker can put format specifiers in the string
 to mangle your stack,
 leading to a possible security hole.
 This holds true even if the string was built using a function like
 .Fn snprintf ,
 as the resulting string may still contain user-supplied conversion specifiers
 for later interpolation by
 .Fn printf .
 .Pp
 Always use the proper secure idiom:
 .Pp
 .Dl "snprintf(buffer, sizeof(buffer), \*q%s\*q, string);"
diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3
index b1c50e10a795..6cefdb133983 100644
--- a/lib/libc/stdio/scanf.3
+++ b/lib/libc/stdio/scanf.3
@@ -1,527 +1,536 @@
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Chris Torek and the American National Standards Committee X3,
 .\" on Information Processing Systems.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY 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.
 .\"
 .\"     @(#)scanf.3	8.2 (Berkeley) 12/11/93
 .\"
-.Dd April 2, 2022
+.Dd August 21, 2023
 .Dt SCANF 3
 .Os
 .Sh NAME
 .Nm scanf ,
 .Nm fscanf ,
 .Nm sscanf ,
 .Nm vscanf ,
 .Nm vsscanf ,
 .Nm vfscanf
 .Nd input format conversion
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
 .In stdio.h
 .Ft int
 .Fn scanf "const char * restrict format" ...
 .Ft int
 .Fn fscanf "FILE * restrict stream" "const char * restrict format" ...
 .Ft int
 .Fn sscanf "const char * restrict str" "const char * restrict format" ...
 .In stdarg.h
 .Ft int
 .Fn vscanf "const char * restrict format" "va_list ap"
 .Ft int
 .Fn vsscanf "const char * restrict str" "const char * restrict format" "va_list ap"
 .Ft int
 .Fn vfscanf "FILE * restrict stream" "const char * restrict format" "va_list ap"
 .Sh DESCRIPTION
 The
 .Fn scanf
 family of functions scans input according to a
 .Fa format
 as described below.
 This format may contain
 .Em conversion specifiers ;
 the results from such conversions, if any,
 are stored through the
 .Em pointer
 arguments.
 The
 .Fn scanf
 function
 reads input from the standard input stream
 .Dv stdin ,
 .Fn fscanf
 reads input from the stream pointer
 .Fa stream ,
 and
 .Fn sscanf
 reads its input from the character string pointed to by
 .Fa str .
 The
 .Fn vfscanf
 function
 is analogous to
 .Xr vfprintf 3
 and reads input from the stream pointer
 .Fa stream
 using a variable argument list of pointers (see
 .Xr stdarg 3 ) .
 The
 .Fn vscanf
 function scans a variable argument list from the standard input and
 the
 .Fn vsscanf
 function scans it from a string;
 these are analogous to
 the
 .Fn vprintf
 and
 .Fn vsprintf
 functions respectively.
 Each successive
 .Em pointer
 argument must correspond properly with
 each successive conversion specifier
 (but see the
 .Cm *
 conversion below).
 All conversions are introduced by the
 .Cm %
 (percent sign) character.
 The
 .Fa format
 string
 may also contain other characters.
 White space (such as blanks, tabs, or newlines) in the
 .Fa format
 string match any amount of white space, including none, in the input.
 Everything else
 matches only itself.
 Scanning stops
 when an input character does not match such a format character.
 Scanning also stops
 when an input conversion cannot be made (see below).
 .Sh CONVERSIONS
 Following the
 .Cm %
 character introducing a conversion
 there may be a number of
 .Em flag
 characters, as follows:
 .Bl -tag -width ".Cm l No (ell)"
 .It Cm *
 Suppresses assignment.
 The conversion that follows occurs as usual, but no pointer is used;
 the result of the conversion is simply discarded.
 .It Cm hh
 Indicates that the conversion will be one of
-.Cm dioux
+.Cm bdioux
 or
 .Cm n
 and the next pointer is a pointer to a
 .Vt char
 (rather than
 .Vt int ) .
 .It Cm h
 Indicates that the conversion will be one of
-.Cm dioux
+.Cm bdioux
 or
 .Cm n
 and the next pointer is a pointer to a
 .Vt "short int"
 (rather than
 .Vt int ) .
 .It Cm l No (ell)
 Indicates that the conversion will be one of
-.Cm dioux
+.Cm bdioux
 or
 .Cm n
 and the next pointer is a pointer to a
 .Vt "long int"
 (rather than
 .Vt int ) ,
 that the conversion will be one of
 .Cm a , e , f ,
 or
 .Cm g
 and the next pointer is a pointer to
 .Vt double
 (rather than
 .Vt float ) ,
 or that the conversion will be one of
 .Cm c ,
 .Cm s
 or
 .Cm \&[
 and the next pointer is a pointer to an array of
 .Vt wchar_t
 (rather than
 .Vt char ) .
 .It Cm ll No (ell ell)
 Indicates that the conversion will be one of
-.Cm dioux
+.Cm bdioux
 or
 .Cm n
 and the next pointer is a pointer to a
 .Vt "long long int"
 (rather than
 .Vt int ) .
 .It Cm L
 Indicates that the conversion will be one of
 .Cm a , e , f ,
 or
 .Cm g
 and the next pointer is a pointer to
 .Vt "long double" .
 .It Cm j
 Indicates that the conversion will be one of
-.Cm dioux
+.Cm bdioux
 or
 .Cm n
 and the next pointer is a pointer to a
 .Vt intmax_t
 (rather than
 .Vt int ) .
 .It Cm t
 Indicates that the conversion will be one of
-.Cm dioux
+.Cm bdioux
 or
 .Cm n
 and the next pointer is a pointer to a
 .Vt ptrdiff_t
 (rather than
 .Vt int ) .
 .It Cm z
 Indicates that the conversion will be one of
-.Cm dioux
+.Cm bdioux
 or
 .Cm n
 and the next pointer is a pointer to a
 .Vt size_t
 (rather than
 .Vt int ) .
 .It Cm q
 (deprecated.)
 Indicates that the conversion will be one of
-.Cm dioux
+.Cm bdioux
 or
 .Cm n
 and the next pointer is a pointer to a
 .Vt "long long int"
 (rather than
 .Vt int ) .
 .El
 .Pp
 In addition to these flags,
 there may be an optional maximum field width,
 expressed as a decimal integer,
 between the
 .Cm %
 and the conversion.
 If no width is given,
 a default of
 .Dq infinity
 is used (with one exception, below);
 otherwise at most this many bytes are scanned
 in processing the conversion.
 In the case of the
 .Cm lc ,
 .Cm ls
 and
 .Cm l[
 conversions, the field width specifies the maximum number
 of multibyte characters that will be scanned.
 Before conversion begins,
 most conversions skip white space;
 this white space is not counted against the field width.
 .Pp
 The following conversions are available:
 .Bl -tag -width XXXX
 .It Cm %
 Matches a literal
 .Ql % .
 That is,
 .Dq Li %%
 in the format string
 matches a single input
 .Ql %
 character.
 No conversion is done, and assignment does not occur.
+.It Cm b , B
+Matches an optionally signed binary integer;
+the next pointer must be a pointer to
+.Vt "unsigned int" .
 .It Cm d
 Matches an optionally signed decimal integer;
 the next pointer must be a pointer to
 .Vt int .
 .It Cm i
 Matches an optionally signed integer;
 the next pointer must be a pointer to
 .Vt int .
-The integer is read in base 16 if it begins
+The integer is read
+in base 2 if it begins with
+.Ql 0b
+or
+.Ql 0B ,
+in base 16 if it begins
 with
 .Ql 0x
 or
 .Ql 0X ,
 in base 8 if it begins with
 .Ql 0 ,
 and in base 10 otherwise.
 Only characters that correspond to the base are used.
 .It Cm o
 Matches an octal integer;
 the next pointer must be a pointer to
 .Vt "unsigned int" .
 .It Cm u
 Matches an optionally signed decimal integer;
 the next pointer must be a pointer to
 .Vt "unsigned int" .
 .It Cm x , X
 Matches an optionally signed hexadecimal integer;
 the next pointer must be a pointer to
 .Vt "unsigned int" .
 .It Cm a , A , e , E , f , F , g , G
 Matches a floating-point number in the style of
 .Xr strtod 3 .
 The next pointer must be a pointer to
 .Vt float
 (unless
 .Cm l
 or
 .Cm L
 is specified.)
 .It Cm s
 Matches a sequence of non-white-space characters;
 the next pointer must be a pointer to
 .Vt char ,
 and the array must be large enough to accept all the sequence and the
 terminating
 .Dv NUL
 character.
 The input string stops at white space
 or at the maximum field width, whichever occurs first.
 .Pp
 If an
 .Cm l
 qualifier is present, the next pointer must be a pointer to
 .Vt wchar_t ,
 into which the input will be placed after conversion by
 .Xr mbrtowc 3 .
 .It Cm S
 The same as
 .Cm ls .
 .It Cm c
 Matches a sequence of
 .Em width
 count
 characters (default 1);
 the next pointer must be a pointer to
 .Vt char ,
 and there must be enough room for all the characters
 (no terminating
 .Dv NUL
 is added).
 The usual skip of leading white space is suppressed.
 To skip white space first, use an explicit space in the format.
 .Pp
 If an
 .Cm l
 qualifier is present, the next pointer must be a pointer to
 .Vt wchar_t ,
 into which the input will be placed after conversion by
 .Xr mbrtowc 3 .
 .It Cm C
 The same as
 .Cm lc .
 .It Cm \&[
 Matches a nonempty sequence of characters from the specified set
 of accepted characters;
 the next pointer must be a pointer to
 .Vt char ,
 and there must be enough room for all the characters in the string,
 plus a terminating
 .Dv NUL
 character.
 The usual skip of leading white space is suppressed.
 The string is to be made up of characters in
 (or not in)
 a particular set;
 the set is defined by the characters between the open bracket
 .Cm \&[
 character
 and a close bracket
 .Cm \&]
 character.
 The set
 .Em excludes
 those characters
 if the first character after the open bracket is a circumflex
 .Cm ^ .
 To include a close bracket in the set,
 make it the first character after the open bracket
 or the circumflex;
 any other position will end the set.
 The hyphen character
 .Cm -
 is also special;
 when placed between two other characters,
 it adds all intervening characters to the set.
 To include a hyphen,
 make it the last character before the final close bracket.
 For instance,
 .Ql [^]0-9-]
 means the set
 .Dq "everything except close bracket, zero through nine, and hyphen" .
 The string ends with the appearance of a character not in the
 (or, with a circumflex, in) set
 or when the field width runs out.
 .Pp
 If an
 .Cm l
 qualifier is present, the next pointer must be a pointer to
 .Vt wchar_t ,
 into which the input will be placed after conversion by
 .Xr mbrtowc 3 .
 .It Cm p
 Matches a pointer value (as printed by
 .Ql %p
 in
 .Xr printf 3 ) ;
 the next pointer must be a pointer to
 .Vt void .
 .It Cm n
 Nothing is expected;
 instead, the number of characters consumed thus far from the input
 is stored through the next pointer,
 which must be a pointer to
 .Vt int .
 This is
 .Em not
 a conversion, although it can be suppressed with the
 .Cm *
 flag.
 .El
 .Pp
 The decimal point
 character is defined in the program's locale (category
 .Dv LC_NUMERIC ) .
 .Pp
 For backwards compatibility, a
 .Dq conversion
 of
 .Ql %\e0
 causes an immediate return of
 .Dv EOF .
 .Sh RETURN VALUES
 These
 functions
 return
 the number of input items assigned, which can be fewer than provided
 for, or even zero, in the event of a matching failure.
 Zero
 indicates that, while there was input available,
 no conversions were assigned;
 typically this is due to an invalid input character,
 such as an alphabetic character for a
 .Ql %d
 conversion.
 The value
 .Dv EOF
 is returned if an input failure occurs before any conversion such as an
 end-of-file occurs.
 If an error or end-of-file occurs after conversion
 has begun,
 the number of conversions which were successfully completed is returned.
 .Sh SEE ALSO
 .Xr getc 3 ,
 .Xr mbrtowc 3 ,
 .Xr printf 3 ,
 .Xr strtod 3 ,
 .Xr strtol 3 ,
 .Xr strtoul 3 ,
 .Xr wscanf 3
 .Sh STANDARDS
 The functions
 .Fn fscanf ,
 .Fn scanf ,
 .Fn sscanf ,
 .Fn vfscanf ,
 .Fn vscanf
 and
 .Fn vsscanf
 conform to
 .St -isoC-99 .
 .Sh HISTORY
 The functions
 .Fn scanf ,
 .Fn fscanf ,
 and
 .Fn sscanf
 first appeared in
 .At v7 ,
 and
 .Fn vscanf ,
 .Fn vsscanf ,
 and
 .Fn vfscanf
 in
 .Bx 4.3 Reno .
 .Sh BUGS
 Earlier implementations of
 .Nm
 treated
 .Cm \&%D , \&%E , \&%F , \&%O
 and
 .Cm \&%X
 as their lowercase equivalents with an
 .Cm l
 modifier.
 In addition,
 .Nm
 treated an unknown conversion character as
 .Cm \&%d
 or
 .Cm \&%D ,
 depending on its case.
 This functionality has been removed.
 .Pp
 Numerical strings are truncated to 512 characters; for example,
 .Cm %f
 and
 .Cm %d
 are implicitly
 .Cm %512f
 and
 .Cm %512d .
 .Pp
 The
 .Cm %n$
 modifiers for positional arguments are not implemented.
 .Pp
 The
 .Nm
 family of functions do not correctly handle multibyte characters in the
 .Fa format
 argument.
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
index 9656ba546915..e2c5ff7ae3cb 100644
--- a/lib/libc/stdlib/strtol.3
+++ b/lib/libc/stdlib/strtol.3
@@ -1,221 +1,223 @@
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Chris Torek and the American National Standards Committee X3,
 .\" on Information Processing Systems.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY 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.
 .\"
 .\"     @(#)strtol.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd November 28, 2001
+.Dd August 21, 2023
 .Dt STRTOL 3
 .Os
 .Sh NAME
 .Nm strtol , strtoll , strtoimax , strtoq
 .Nd "convert a string value to a"
 .Vt long , "long long" , intmax_t
 or
 .Vt quad_t
 integer
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
 .In stdlib.h
 .In limits.h
 .Ft long
 .Fn strtol "const char * restrict nptr" "char ** restrict endptr" "int base"
 .Ft long long
 .Fn strtoll "const char * restrict nptr" "char ** restrict endptr" "int base"
 .In inttypes.h
 .Ft intmax_t
 .Fn strtoimax "const char * restrict nptr" "char ** restrict endptr" "int base"
 .In sys/types.h
 .In stdlib.h
 .In limits.h
 .Ft quad_t
 .Fn strtoq "const char *nptr" "char **endptr" "int base"
 .Sh DESCRIPTION
 The
 .Fn strtol
 function
 converts the string in
 .Fa nptr
 to a
 .Vt long
 value.
 The
 .Fn strtoll
 function
 converts the string in
 .Fa nptr
 to a
 .Vt "long long"
 value.
 The
 .Fn strtoimax
 function
 converts the string in
 .Fa nptr
 to an
 .Vt intmax_t
 value.
 The
 .Fn strtoq
 function
 converts the string in
 .Fa nptr
 to a
 .Vt quad_t
 value.
 The conversion is done according to the given
 .Fa base ,
 which must be between 2 and 36 inclusive,
 or be the special value 0.
 .Pp
 The string may begin with an arbitrary amount of white space
 (as determined by
 .Xr isspace 3 )
 followed by a single optional
 .Ql +
 or
 .Ql -
 sign.
 If
 .Fa base
 is zero or 16,
 the string may then include a
+.Dq Li 0b
+prefix, and the number will be read in base 2; or it may include a
 .Dq Li 0x
 prefix,
 and the number will be read in base 16; otherwise, a zero
 .Fa base
 is taken as 10 (decimal) unless the next character is
 .Ql 0 ,
 in which case it is taken as 8 (octal).
 .Pp
 The remainder of the string is converted to a
 .Vt long , "long long" , intmax_t
 or
 .Vt quad_t
 value in the obvious manner,
 stopping at the first character which is not a valid digit
 in the given base.
 (In bases above 10, the letter
 .Ql A
 in either upper or lower case
 represents 10,
 .Ql B
 represents 11, and so forth, with
 .Ql Z
 representing 35.)
 .Pp
 If
 .Fa endptr
 is not
 .Dv NULL ,
 .Fn strtol
 stores the address of the first invalid character in
 .Fa *endptr .
 If there were no digits at all, however,
 .Fn strtol
 stores the original value of
 .Fa nptr
 in
 .Fa *endptr .
 (Thus, if
 .Fa *nptr
 is not
 .Ql \e0
 but
 .Fa **endptr
 is
 .Ql \e0
 on return, the entire string was valid.)
 .Sh RETURN VALUES
 The
 .Fn strtol ,
 .Fn strtoll ,
 .Fn strtoimax
 and
 .Fn strtoq
 functions
 return the result of the conversion,
 unless the value would underflow or overflow.
 If no conversion could be performed, 0 is returned and
 the global variable
 .Va errno
 is set to
 .Er EINVAL
 (the last feature is not portable across all platforms).
 If an overflow or underflow occurs,
 .Va errno
 is set to
 .Er ERANGE
 and the function return value is clamped according
 to the following table.
 .Bl -column -offset indent ".Fn strtoimax" ".Sy underflow" ".Sy overflow"
 .It Sy Function Ta Sy underflow Ta Sy overflow
 .It Fn strtol Ta Dv LONG_MIN Ta Dv LONG_MAX
 .It Fn strtoll Ta Dv LLONG_MIN Ta Dv LLONG_MAX
 .It Fn strtoimax Ta Dv INTMAX_MIN Ta Dv INTMAX_MAX
 .It Fn strtoq Ta Dv LLONG_MIN Ta Dv LLONG_MAX
 .El
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er EINVAL
 The value of
 .Fa base
 is not supported or
 no conversion could be performed
 (the last feature is not portable across all platforms).
 .It Bq Er ERANGE
 The given string was out of range; the value converted has been clamped.
 .El
 .Sh SEE ALSO
 .Xr atof 3 ,
 .Xr atoi 3 ,
 .Xr atol 3 ,
 .Xr strtod 3 ,
 .Xr strtonum 3 ,
 .Xr strtoul 3 ,
 .Xr wcstol 3
 .Sh STANDARDS
 The
 .Fn strtol
 function
 conforms to
 .St -isoC .
 The
 .Fn strtoll
 and
 .Fn strtoimax
 functions
 conform to
 .St -isoC-99 .
 The
 .Bx
 .Fn strtoq
 function is deprecated.
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
index e05d7a7728cd..41b3b2c578bc 100644
--- a/lib/libc/stdlib/strtoul.3
+++ b/lib/libc/stdlib/strtoul.3
@@ -1,223 +1,225 @@
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Chris Torek and the American National Standards Committee X3,
 .\" on Information Processing Systems.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY 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.
 .\"
 .\"     @(#)strtoul.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd November 28, 2001
+.Dd August 21, 2023
 .Dt STRTOUL 3
 .Os
 .Sh NAME
 .Nm strtoul , strtoull , strtoumax , strtouq
 .Nd "convert a string to an"
 .Vt "unsigned long" , "unsigned long long" , uintmax_t ,
 or
 .Vt u_quad_t
 integer
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
 .In stdlib.h
 .In limits.h
 .Ft "unsigned long"
 .Fn strtoul "const char * restrict nptr" "char ** restrict endptr" "int base"
 .Ft "unsigned long long"
 .Fn strtoull "const char * restrict nptr" "char ** restrict endptr" "int base"
 .In inttypes.h
 .Ft uintmax_t
 .Fn strtoumax "const char * restrict nptr" "char ** restrict endptr" "int base"
 .In sys/types.h
 .In stdlib.h
 .In limits.h
 .Ft u_quad_t
 .Fn strtouq "const char *nptr" "char **endptr" "int base"
 .Sh DESCRIPTION
 The
 .Fn strtoul
 function
 converts the string in
 .Fa nptr
 to an
 .Vt "unsigned long"
 value.
 The
 .Fn strtoull
 function
 converts the string in
 .Fa nptr
 to an
 .Vt "unsigned long long"
 value.
 The
 .Fn strtoumax
 function
 converts the string in
 .Fa nptr
 to an
 .Vt uintmax_t
 value.
 The
 .Fn strtouq
 function
 converts the string in
 .Fa nptr
 to a
 .Vt u_quad_t
 value.
 The conversion is done according to the given
 .Fa base ,
 which must be between 2 and 36 inclusive,
 or be the special value 0.
 .Pp
 The string may begin with an arbitrary amount of white space
 (as determined by
 .Xr isspace 3 )
 followed by a single optional
 .Ql +
 or
 .Ql -
 sign.
 If
 .Fa base
 is zero or 16,
 the string may then include a
+.Dq Li 0b
+prefix, and the number will be read in base 2; or it may include a
 .Dq Li 0x
 prefix,
 and the number will be read in base 16; otherwise, a zero
 .Fa base
 is taken as 10 (decimal) unless the next character is
 .Ql 0 ,
 in which case it is taken as 8 (octal).
 .Pp
 The remainder of the string is converted to an
 .Vt "unsigned long"
 value in the obvious manner,
 stopping at the end of the string
 or at the first character that does not produce a valid digit
 in the given base.
 (In bases above 10, the letter
 .Ql A
 in either upper or lower case
 represents 10,
 .Ql B
 represents 11, and so forth, with
 .Ql Z
 representing 35.)
 .Pp
 If
 .Fa endptr
 is not
 .Dv NULL ,
 .Fn strtoul
 stores the address of the first invalid character in
 .Fa *endptr .
 If there were no digits at all, however,
 .Fn strtoul
 stores the original value of
 .Fa nptr
 in
 .Fa *endptr .
 (Thus, if
 .Fa *nptr
 is not
 .Ql \e0
 but
 .Fa **endptr
 is
 .Ql \e0
 on return, the entire string was valid.)
 .Sh RETURN VALUES
 The
 .Fn strtoul ,
 .Fn strtoull ,
 .Fn strtoumax
 and
 .Fn strtouq
 functions
 return either the result of the conversion
 or, if there was a leading minus sign,
 the negation of the result of the conversion,
 unless the original (non-negated) value would overflow;
 in the latter case,
 .Fn strtoul
 returns
 .Dv ULONG_MAX ,
 .Fn strtoull
 returns
 .Dv ULLONG_MAX ,
 .Fn strtoumax
 returns
 .Dv UINTMAX_MAX ,
 and
 .Fn strtouq
 returns
 .Dv ULLONG_MAX .
 In all cases,
 .Va errno
 is set to
 .Er ERANGE .
 If no conversion could be performed, 0 is returned and
 the global variable
 .Va errno
 is set to
 .Er EINVAL
 (the last feature is not portable across all platforms).
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er EINVAL
 The value of
 .Fa base
 is not supported or
 no conversion could be performed
 (the last feature is not portable across all platforms).
 .It Bq Er ERANGE
 The given string was out of range; the value converted has been clamped.
 .El
 .Sh SEE ALSO
 .Xr strtol 3 ,
 .Xr strtonum 3 ,
 .Xr wcstoul 3
 .Sh STANDARDS
 The
 .Fn strtoul
 function
 conforms to
 .St -isoC .
 The
 .Fn strtoull
 and
 .Fn strtoumax
 functions
 conform to
 .St -isoC-99 .
 The
 .Bx
 .Fn strtouq
 function is deprecated.