108 files changed, 7862 insertions, 2583 deletions
diff --git a/src/lib/libc/stdlib/Makefile.inc b/src/lib/libc/stdlib/Makefile.inc
index 782a4ab022..c7ee0a80ec 100644
--- a/src/lib/libc/stdlib/Makefile.inc
+++ b/src/lib/libc/stdlib/Makefile.inc
@@ -1,24 +1,29 @@
-#       from: @(#)Makefile.inc  5.6 (Berkeley) 6/4/91
+#       $OpenBSD: Makefile.inc,v 1.35 2006/01/13 17:58:09 millert Exp $
-#       $Id: Makefile.inc,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 # stdlib sources
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/stdlib ${LIBCSRCDIR}/stdlib
-SRCS+=  a64l.c abort.c atexit.c atoi.c atof.c atol.c bsearch.c calloc.c \
+SRCS+=  a64l.c abort.c atexit.c atoi.c atof.c atol.c atoll.c bsearch.c \
-        exit.c getenv.c getopt.c heapsort.c l64a.c malloc.c merge.c \
+        calloc.c cfree.c exit.c ecvt.c gcvt.c getenv.c getopt_long.c \
-        multibyte.c putenv.c qsort.c radixsort.c rand.c random.c realpath.c \
+        getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c l64a.c llabs.c \
-        setenv.c strtod.c strtol.c strtoq.c strtoul.c strtouq.c system.c \
+        lldiv.c lsearch.c malloc.c merge.c putenv.c qsort.c radixsort.c rand.c \
-        _rand48.c drand48.c erand48.c jrand48.c lcong48.c lrand48.c \
+        random.c realpath.c setenv.c strtoimax.c strtod.c strtol.c strtoll.c \
-        mrand48.c nrand48.c seed48.c srand48.c qabs.c qdiv.c
+        strtonum.c strtoul.c strtoull.c strtoumax.c system.c \
+        tfind.c tsearch.c _rand48.c drand48.c erand48.c jrand48.c lcong48.c \
+        lrand48.c mrand48.c nrand48.c seed48.c srand48.c qabs.c qdiv.c _Exit.c
 .if   (${MACHINE_ARCH} == "m68k")
 SRCS+=  abs.S div.c labs.c ldiv.c
+LSRCS+= abs.c
 .elif (${MACHINE_ARCH} == "i386")
 SRCS+=  abs.S div.S labs.S ldiv.S
+LSRCS+= abs.c div.c labs.c ldiv.c
 .elif (${MACHINE_ARCH} == "ns32k")
 SRCS+=  abs.S div.c labs.c ldiv.c
+LSRCS+= abs.c
 .elif (${MACHINE_ARCH} == "tahoe")
 SRCS+=  abs.S div.c labs.c ldiv.c
+LSRCS+= abs.c
 .elif (${MACHINE_ARCH} == "vax")
 SRCS+=  abs.c div.c labs.c ldiv.c
 .elif (${MACHINE_ARCH} == "alpha")
@@ -28,18 +33,40 @@ SRCS+=	abs.c div.c labs.c ldiv.c
 SRCS+=  abs.c div.c labs.c ldiv.c
 .endif
-MAN+=   abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \
+.if (${MACHINE_ARCH} == "vax") || (${MACHINE_ARCH} == "m68k")
-        calloc.3 div.3 exit.3 free.3 getenv.3 getopt.3 labs.3 ldiv.3 \
+SRCS+=  insque.S remque.S
-        malloc.3 memory.3 qabs.3 qdiv.3 qsort.3 radixsort.3 rand48.3 \
+.else
-        rand.3 random.3 realloc.3 realpath.3 strtod.3 strtol.3 strtoul.3 \
+SRCS+=  insque.c remque.c
-        system.3
+.endif
+MAN+=   a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 atoll.3 \
+        bsearch.3 div.3 ecvt.3 exit.3 getenv.3 getopt.3 getopt_long.3 \
+        getsubopt.3 hcreate.3 imaxabs.3 imaxdiv.3 insque.3 labs.3 ldiv.3 \
+        lldiv.3 lsearch.3 malloc.3 qabs.3 qdiv.3 qsort.3 radixsort.3 rand48.3 \
+        rand.3 random.3 realpath.3 strtod.3 strtonum.3 strtol.3 strtoul.3 \
+        system.3 tsearch.3
+MLINKS+=exit.3 _Exit.3
+MLINKS+=ecvt.3 fcvt.3 ecvt.3 gcvt.3
 MLINKS+=getenv.3 setenv.3 getenv.3 unsetenv.3 getenv.3 putenv.3
+MLINKS+=getopt_long.3 getopt_long_only.3
+MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3
+MLINKS+=insque.3 remque.3
+MLINKS+=labs.3 llabs.3
+MLINKS+=lsearch.3 lfind.3
+MLINKS+=malloc.3 free.3 malloc.3 realloc.3 malloc.3 calloc.3
+MLINKS+=malloc.3 cfree.3 malloc.3 malloc.conf.5
 MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3
-MLINKS+=rand.3 srand.3
+MLINKS+=radixsort.3 sradixsort.3
-MLINKS+=strtol.3 strtoq.3
+MLINKS+=rand.3 srand.3 rand.3 rand_r.3
-MLINKS+=strtoul.3 strtouq.3
+MLINKS+=random.3 initstate.3 random.3 setstate.3
-MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3
+MLINKS+=random.3 srandom.3 random.3 srandomdev.3
 MLINKS+=rand48.3 drand48.3 rand48.3 erand48.3 rand48.3 lrand48.3
 MLINKS+=rand48.3 mrand48.3 rand48.3 nrand48.3 rand48.3 jrand48.3
 MLINKS+=rand48.3 srand48.3 rand48.3 seed48.3 rand48.3 lcong48.3
+MLINKS+=strtol.3 strtoll.3 strtol.3 strtoq.3 strtol.3 strtoimax.3
+MLINKS+=strtoul.3 strtoull.3 strtoul.3 strtouq.3 strtoul.3 strtoumax.3
+MLINKS+=tsearch.3 tfind.3
+MLINKS+=tsearch.3 tdelete.3
+MLINKS+=tsearch.3 twalk.3
+MLINKS+=a64l.3 l64a.3
diff --git a/src/lib/libc/stdlib/_Exit.c b/src/lib/libc/stdlib/_Exit.c
new file mode 100644
index 0000000000..5a2291a931
--- /dev/null
+++ b/src/lib/libc/stdlib/_Exit.c
@@ -0,0 +1,22 @@
+/*      $OpenBSD: _Exit.c,v 1.2 2005/08/08 08:05:36 espie Exp $ */
+/*
+ * Placed in the public domain by Todd C. Miller on January 21, 2004.
+ */
+#include <stdlib.h>
+#include <unistd.h>
+/*
+ * _Exit() is the ISO/ANSI C99 equivalent of the POSIX _exit() function.
+ * No atexit() handlers are called and no signal handlers are run.
+ * Whether or not stdio buffers are flushed or temporary files are removed
+ * is implementation-dependent.  As such it is safest to *not* flush
+ * stdio buffers or remove temporary files.  This is also consistent
+ * with most other implementations.
+ */
+void
+_Exit(int status)
+{
+        _exit(status);
+}
diff --git a/src/lib/libc/stdlib/_rand48.c b/src/lib/libc/stdlib/_rand48.c
index 83ade4645a..7c950f7cee 100644
--- a/src/lib/libc/stdlib/_rand48.c
+++ b/src/lib/libc/stdlib/_rand48.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: _rand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1993 Martin Birgmeier
 * All rights reserved.
diff --git a/src/lib/libc/stdlib/a64l.3 b/src/lib/libc/stdlib/a64l.3
new file mode 100644
index 0000000000..f2957a7ad4
--- /dev/null
+++ b/src/lib/libc/stdlib/a64l.3
@@ -0,0 +1,133 @@
+.\" $OpenBSD: a64l.3,v 1.9 2005/02/25 03:12:44 cloder Exp $
+.\"
+.\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd August 17, 1997
+.Dt A64L 3
+.Os
+.Sh NAME
+.Nm a64l ,
+.Nm l64a
+.Nd convert between 32-bit integer and radix-64 ASCII string
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft long
+.Fn a64l "const char *s"
+.Ft char *
+.Fn l64a "long l"
+.Sh DESCRIPTION
+The
+.Fn a64l
+and
+.Fn l64a
+functions are used to maintain numbers stored in radix-64
+.Tn ASCII
+characters.
+This is a notation by which 32-bit integers
+can be represented by up to six characters; each character represents a
+.Dq digit
+in a radix-64 notation.
+.Pp
+The characters used to represent digits are
+.Ql \&.
+for 0,
+.Ql /
+for 1,
+.Ql 0
+through
+.Ql 9
+for 2-11,
+.Ql A
+through
+.Ql Z
+for 12-37, and
+.Ql a
+through
+.Ql z
+for 38-63.
+.Pp
+The
+.Fn a64l
+function takes a pointer to a NUL-terminated radix-64 representation
+and returns a corresponding 32-bit value.
+If the string pointed to by
+.Fa s
+contains more than six characters,
+.Fn a64l
+will use the first six.
+.Fn a64l
+scans the character string from left to right, decoding
+each character as a 6-bit radix-64 number.
+If a long integer is
+larger than 32 bits, the return value will be sign-extended.
+.Pp
+.Fn l64a
+takes a long integer argument
+.Fa l
+and returns a pointer to the corresponding radix-64 representation.
+.Sh RETURN VALUES
+On success,
+.Fn a64l
+returns a 32-bit representation of
+.Fa s .
+If
+.Fa s
+is a null pointer or if it contains digits other than those described above,
+.Fn a64l
+returns \-1 and sets the global variable
+.Va errno
+to
+.Er EINVAL .
+.Pp
+On success,
+.Fn l64a
+returns a pointer to a string containing the radix-64 representation of
+.Fa l .
+If
+.Fa l
+is 0,
+.Fn l64a
+returns a pointer to the empty string.
+If
+.Fa l
+is negative,
+.Fn l64a
+returns a null pointer and sets the global variable
+.Va errno
+to
+.Er EINVAL .
+.Sh WARNINGS
+The value returned by
+.Fn l64a
+is a pointer into a static buffer, the contents of which
+will be overwritten by subsequent calls.
+.Pp
+The value returned by
+.Fn a64l
+may be incorrect if the value is too large; for that reason, only strings
+that resulted from a call to
+.Fn l64a
+should be used to call
+.Fn a64l .
+.Pp
+If a long integer is larger than 32 bits, only the low-order
+32 bits are used.
+.Sh STANDARDS
+The
+.Fn a64l
+and
+.Fn l64a
+functions conform to
+.St -xpg4.2 .
diff --git a/src/lib/libc/stdlib/a64l.c b/src/lib/libc/stdlib/a64l.c
index 03fc77e034..5312929c6f 100644
--- a/src/lib/libc/stdlib/a64l.c
+++ b/src/lib/libc/stdlib/a64l.c
@@ -1,34 +1,42 @@
+/*      $OpenBSD: a64l.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Written by J.T. Conklin <jtc@netbsd.org>.
 * Public domain.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
+#include <errno.h>
-static char *rcsid = "$NetBSD: a64l.c,v 1.3 1995/05/11 23:04:47 jtc Exp $";
+#include <stdlib.h>
-#endif
 long
-a64l(s)
+a64l(const char *s)
-        const char *s;
 {
        long value, digit, shift;
        int i;
+        if (s == NULL) {
+                errno = EINVAL;
+                return(-1L);
+        }
        value = 0;
        shift = 0;
        for (i = 0; *s && i < 6; i++, s++) {
-                if (*s <= '/')
+                if (*s >= '.' && *s <= '/')
                        digit = *s - '.';
-                else if (*s <= '9')
+                else if (*s >= '0' && *s <= '9')
                        digit = *s - '0' + 2;
-                else if (*s <= 'Z')
+                else if (*s >= 'A' && *s <= 'Z')
                        digit = *s - 'A' + 12;
-                else
+                else if (*s >= 'a' && *s <= 'z')
-                        digit = *s - 'a' + 38; 
+                        digit = *s - 'a' + 38;
+                else {
+                        errno = EINVAL;
+                        return(-1L);
+                }
                value |= digit << shift;
                shift += 6;
        }
-        return (long) value;
+        return(value);
 }
diff --git a/src/lib/libc/stdlib/abort.3 b/src/lib/libc/stdlib/abort.3
index ab57327585..d411b859eb 100644
--- a/src/lib/libc/stdlib/abort.3
+++ b/src/lib/libc/stdlib/abort.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)abort.3       6.7 (Berkeley) 6/29/91
+.\"     $OpenBSD: abort.3,v 1.7 2003/06/02 20:18:37 millert Exp $
-.\"     $Id: abort.3,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt ABORT 3
@@ -49,23 +44,20 @@
 .Sh DESCRIPTION
 The
 .Fn abort
-function causes abnormal program termination to occur, unless the
+function causes abnormal program termination to occur, unless the signal
-signal
 .Dv SIGABRT
 is being caught and the signal handler does not return.
 .Pp
-No open streams are closed or flushed.
+Any open streams are flushed and closed.
 .Sh RETURN VALUES
 The
-.Nm abort
+.Fn abort
-function
+function never returns.
-never returns.
 .Sh SEE ALSO
 .Xr sigaction 2 ,
-.Xr exit 2
+.Xr exit 3
 .Sh STANDARDS
 The
 .Fn abort
-function
+function conforms to
-conforms to
+.St -p1003.1-90 .
-.St -ansiC .
diff --git a/src/lib/libc/stdlib/abort.c b/src/lib/libc/stdlib/abort.c
index c298e016b4..072a9fa8c1 100644
--- a/src/lib/libc/stdlib/abort.c
+++ b/src/lib/libc/stdlib/abort.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: abort.c,v 1.14 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1985 Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,27 +28,40 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)abort.c      5.11 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: abort.c,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include "thread_private.h"
+#include "atexit.h"
 void
-abort()
+abort(void)
 {
+        struct atexit *p = __atexit;
+        static int cleanup_called = 0;
        sigset_t mask;
        sigfillset(&mask);
        /*
         * don't block SIGABRT to give any handler a chance; we ignore
         * any errors -- X311J doesn't allow abort to return anyway.
         */
        sigdelset(&mask, SIGABRT);
-        (void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+        (void)_thread_sys_sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+        /*
+         * POSIX requires we flush stdio buffers on abort
+         */
+        if (cleanup_called == 0) {
+                while (p != NULL && p->next != NULL)
+                        p = p->next;
+                if (p != NULL && p->fns[0] != NULL) {
+                        cleanup_called = 1;
+                        (*p->fns[0])();
+                }
+        }
        (void)kill(getpid(), SIGABRT);
        /*
@@ -59,7 +69,7 @@ abort()
         * it again, only harder.
         */
        (void)signal(SIGABRT, SIG_DFL);
-        (void)sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
+        (void)_thread_sys_sigprocmask(SIG_SETMASK, &mask, (sigset_t *)NULL);
        (void)kill(getpid(), SIGABRT);
-        exit(1);
+        _exit(1);
 }
diff --git a/src/lib/libc/stdlib/abs.3 b/src/lib/libc/stdlib/abs.3
index 4748d89e77..fc0b20b7d5 100644
--- a/src/lib/libc/stdlib/abs.3
+++ b/src/lib/libc/stdlib/abs.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)abs.3 6.4 (Berkeley) 6/29/91
+.\"     $OpenBSD: abs.3,v 1.7 2006/01/13 17:58:09 millert Exp $
-.\"     $Id: abs.3,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt ABS 3
@@ -49,21 +44,18 @@
 .Sh DESCRIPTION
 The
 .Fn abs
-function
+function computes the absolute value of the integer
-computes
+.Fa j .
-the absolute value of the integer
-.Ar j .
 .Sh RETURN VALUES
 The
 .Fn abs
-function
+function returns the absolute value.
-returns
-the absolute value.
 .Sh SEE ALSO
-.Xr floor 3 ,
-.Xr labs 3 ,
 .Xr cabs 3 ,
+.Xr floor 3 ,
 .Xr hypot 3 ,
+.Xr imaxabs 3 ,
+.Xr labs 3 ,
 .Xr math 3
 .Sh STANDARDS
 The
diff --git a/src/lib/libc/stdlib/abs.c b/src/lib/libc/stdlib/abs.c
index 64468e0224..5d2fbae69f 100644
--- a/src/lib/libc/stdlib/abs.c
+++ b/src/lib/libc/stdlib/abs.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: abs.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
 /*-
 * Copyright (c) 1990 The Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,16 +28,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)abs.c        5.2 (Berkeley) 5/17/90";*/
-static char *rcsid = "$Id: abs.c,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 int
-abs(j)
+abs(int j)
-        int j;
 {
        return(j < 0 ? -j : j);
 }
diff --git a/src/lib/libc/stdlib/alloca.3 b/src/lib/libc/stdlib/alloca.3
index dcb97ab11c..4136dc405c 100644
--- a/src/lib/libc/stdlib/alloca.3
+++ b/src/lib/libc/stdlib/alloca.3
@@ -9,11 +9,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -29,12 +25,11 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)alloca.3      5.1 (Berkeley) 5/2/91
+.\"     $OpenBSD: alloca.3,v 1.10 2003/06/02 20:18:37 millert Exp $
-.\"     $Id: alloca.3,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 .\"
 .Dd May 2, 1991
 .Dt ALLOCA 3
-.Os BSD 4
+.Os
 .Sh NAME
 .Nm alloca
 .Nd memory allocator
@@ -45,35 +40,41 @@
 .Sh DESCRIPTION
 The
 .Fn alloca
-function
+function allocates
-allocates 
 .Fa size
 bytes of space in the stack frame of the caller.
-This temporary space is automatically freed on
+This temporary space is automatically freed on return.
-return.
 .Sh RETURN VALUES
 The
 .Fn alloca
 function returns a pointer to the beginning of the allocated space.
-If the allocation failed, a
-.Dv NULL
-pointer is returned.
 .Sh SEE ALSO
+.Xr pagesize 1 ,
 .Xr brk 2 ,
-.Xr pagesize 2
 .Xr calloc 3 ,
 .Xr malloc 3 ,
-.Xr realloc 3 ,
+.Xr realloc 3
 .Sh BUGS
 The
 .Fn alloca
-function
+function is machine dependent; its use is discouraged.
-is machine dependent; its use is discouraged.
 .\" .Sh HISTORY
 .\" The
 .\" .Fn alloca
 .\" function appeared in
 .\" .Bx ?? .
-.\" The function appeared in 32v, pwb and pwb.2 and in 3bsd 4bsd 
+.\" The function appeared in 32v, pwb and pwb.2 and in 3bsd 4bsd
 .\" The first man page (or link to a man page that I can find at the
 .\" moment is 4.3...
+.Pp
+The
+.Fn alloca
+function is slightly unsafe because it cannot ensure that the pointer
+returned points to a valid and usable block of memory.
+The allocation made may exceed the bounds of the stack, or even go
+further into other objects in memory, and
+.Fn alloca
+cannot determine such an error.
+Avoid
+.Fn alloca
+with large unbounded allocations.
diff --git a/src/lib/libc/stdlib/atexit.3 b/src/lib/libc/stdlib/atexit.3
index 07de054d3c..4272c8b66d 100644
--- a/src/lib/libc/stdlib/atexit.3
+++ b/src/lib/libc/stdlib/atexit.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)atexit.3      5.3 (Berkeley) 6/29/91
+.\"     $OpenBSD: atexit.3,v 1.7 2005/08/22 14:17:31 jmc Exp $
-.\"     $Id: atexit.3,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt ATEXIT 3
@@ -49,17 +44,22 @@
 .Sh DESCRIPTION
 The
 .Fn atexit
-function
+function registers the given
-registers the given
+.Fa function
-.Ar function
 to be called at program exit, whether via
 .Xr exit 3
 or via return from the program's
-.Em main .
+.Fn main .
 Functions so registered are called in reverse order;
 no arguments are passed.
 At least 32 functions can always be registered,
 and more are allowed as long as sufficient memory can be allocated.
+.Pp
+.Fn atexit
+is very difficult to use correctly without creating
+.Xr exit 3 Ns -time
+races.
+Unless absolutely necessary, please avoid using it.
 .Sh RETURN VALUES
 .Rv -std atexit
 .Sh ERRORS
@@ -73,6 +73,5 @@ The existing list of functions is unmodified.
 .Sh STANDARDS
 The
 .Fn atexit
-function
+function conforms to
-conforms to
 .St -ansiC .
diff --git a/src/lib/libc/stdlib/atexit.c b/src/lib/libc/stdlib/atexit.c
index 4da1eb0d9c..50f8ec9372 100644
--- a/src/lib/libc/stdlib/atexit.c
+++ b/src/lib/libc/stdlib/atexit.c
@@ -1,68 +1,133 @@
-/*-
+/*      $OpenBSD: atexit.c,v 1.12 2006/02/22 07:16:32 otto Exp $ */
- * Copyright (c) 1990 The Regents of the University of California.
+/*
+ * Copyright (c) 2002 Daniel Hartmeier
 * All rights reserved.
 *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
 * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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
+ *    - Redistributions of source code must retain the above copyright
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *      notice, this list of conditions and the following disclaimer.
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ *    - Redistributions in binary form must reproduce the above
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ *      copyright notice, this list of conditions and the following
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *      disclaimer in the documentation and/or other materials provided
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ *      with the distribution.
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * SUCH DAMAGE.
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS 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.
+ *
 */
-#if defined(LIBC_SCCS) && !defined(lint)
+#include <sys/types.h>
-/*static char *sccsid = "from: @(#)atexit.c     5.2 (Berkeley) 11/14/90";*/
+#include <sys/mman.h>
-static char *rcsid = "$Id: atexit.c,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
+#include <unistd.h>
 #include "atexit.h"
+#include "thread_private.h"
+int __atexit_invalid = 1;
 struct atexit *__atexit;
 /*
+ * Function pointers are stored in a linked list of pages. The list
+ * is initially empty, and pages are allocated on demand. The first
+ * function pointer in the first allocated page (the last one in
+ * the linked list) is reserved for the cleanup function.
+ *
+ * Outside the following two functions, all pages are mprotect()'ed
+ * to prevent unintentional/malicious corruption.
+ */
+/*
 * Register a function to be performed at exit.
 */
 int
-atexit(fn)
+atexit(void (*fn)(void))
-        void (*fn)();
 {
-        static struct atexit __atexit0; /* one guaranteed table */
+        struct atexit *p;
-        register struct atexit *p;
+        int pgsize = getpagesize();
+        int ret = -1;
-        if ((p = __atexit) == NULL)
+        if (pgsize < sizeof(*p))
-                __atexit = p = &__atexit0;
+                return (-1);
-        else if (p->ind >= ATEXIT_SIZE) {
+        _ATEXIT_LOCK();
-                if ((p = malloc(sizeof(*p))) == NULL)
+        p = __atexit;
-                        return (-1);
+        if (p != NULL) {
-                p->ind = 0;
+                if (p->ind + 1 >= p->max)
+                        p = NULL;
+                else if (mprotect(p, pgsize, PROT_READ | PROT_WRITE))
+                        goto unlock;
+        }
+        if (p == NULL) {
+                p = mmap(NULL, pgsize, PROT_READ | PROT_WRITE,
+                    MAP_ANON | MAP_PRIVATE, -1, 0);
+                if (p == MAP_FAILED)
+                        goto unlock;
+                if (__atexit == NULL) {
+                        p->fns[0] = NULL;
+                        p->ind = 1;
+                } else
+                        p->ind = 0;
+                p->max = (pgsize - ((char *)&p->fns[0] - (char *)p)) /
+                    sizeof(p->fns[0]);
                p->next = __atexit;
                __atexit = p;
+                if (__atexit_invalid)
+                        __atexit_invalid = 0;
        }
        p->fns[p->ind++] = fn;
-        return (0);
+        if (mprotect(p, pgsize, PROT_READ))
+                goto unlock;
+        ret = 0;
+unlock:
+        _ATEXIT_UNLOCK();
+        return (ret);
+}
+/*
+ * Register the cleanup function
+ */
+void
+__atexit_register_cleanup(void (*fn)(void))
+{
+        struct atexit *p;
+        int pgsize = getpagesize();
+        if (pgsize < sizeof(*p))
+                return;
+        _ATEXIT_LOCK();
+        p = __atexit;
+        while (p != NULL && p->next != NULL)
+                p = p->next;
+        if (p == NULL) {
+                p = mmap(NULL, pgsize, PROT_READ | PROT_WRITE,
+                    MAP_ANON | MAP_PRIVATE, -1, 0);
+                if (p == MAP_FAILED)
+                        goto unlock;
+                p->ind = 1;
+                p->max = (pgsize - ((char *)&p->fns[0] - (char *)p)) /
+                    sizeof(p->fns[0]);
+                p->next = NULL;
+                __atexit = p;
+                if (__atexit_invalid)
+                        __atexit_invalid = 0;
+        } else {
+                if (mprotect(p, pgsize, PROT_READ | PROT_WRITE))
+                        goto unlock;
+        }
+        p->fns[0] = fn;
+        mprotect(p, pgsize, PROT_READ);
+unlock:
+        _ATEXIT_UNLOCK();
 }
diff --git a/src/lib/libc/stdlib/atexit.h b/src/lib/libc/stdlib/atexit.h
index 8b756e8fe2..21b0c2e532 100644
--- a/src/lib/libc/stdlib/atexit.h
+++ b/src/lib/libc/stdlib/atexit.h
@@ -1,46 +1,41 @@
-/*-
+/*      $OpenBSD: atexit.h,v 1.6 2003/07/31 07:08:42 deraadt Exp $ */
- * Copyright (c) 1990 The Regents of the University of California.
+/*
+ * Copyright (c) 2002 Daniel Hartmeier
 * All rights reserved.
 *
 * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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
+ *    - Redistributions of source code must retain the above copyright
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *      notice, this list of conditions and the following disclaimer.
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ *    - Redistributions in binary form must reproduce the above
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ *      copyright notice, this list of conditions and the following
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *      disclaimer in the documentation and/or other materials provided
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ *      with the distribution.
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * SUCH DAMAGE.
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS 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.
 *
- *      from: @(#)atexit.h      5.1 (Berkeley) 5/15/90
- *      $Id: atexit.h,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 */
-/* must be at least 32 to guarantee ANSI conformance */
-#define ATEXIT_SIZE     32
 struct atexit {
        struct atexit *next;            /* next in list */
        int ind;                        /* next index in this table */
-        void (*fns[ATEXIT_SIZE])();     /* the table itself */
+        int max;                        /* max entries >= ATEXIT_SIZE */
+        void (*fns[1])(void);           /* the table itself */
 };
+extern int __atexit_invalid;
 extern struct atexit *__atexit;         /* points to head of LIFO stack */
diff --git a/src/lib/libc/stdlib/atof.3 b/src/lib/libc/stdlib/atof.3
index 53e04f71c5..c60b9e9fd7 100644
--- a/src/lib/libc/stdlib/atof.3
+++ b/src/lib/libc/stdlib/atof.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)atof.3        6.4 (Berkeley) 6/29/91
+.\"     $OpenBSD: atof.3,v 1.4 2003/06/02 20:18:37 millert Exp $
-.\"     $Id: atof.3,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt ATOF 3
@@ -52,9 +47,9 @@ string to double
 The
 .Fn atof
 function converts the initial portion of the string pointed to by
-.Ar nptr
+.Fa nptr
 to
-.Ar double
+.Li double
 representation.
 .Pp
 It is equivalent to:
diff --git a/src/lib/libc/stdlib/atof.c b/src/lib/libc/stdlib/atof.c
index 9202de50bb..d14b58b070 100644
--- a/src/lib/libc/stdlib/atof.c
+++ b/src/lib/libc/stdlib/atof.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: atof.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1988 The Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,16 +28,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)atof.c       5.3 (Berkeley) 1/8/93";*/
-static char *rcsid = "$Id: atof.c,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 double
-atof(ascii)
+atof(const char *ascii)
-        const char *ascii;
 {
        return(strtod(ascii, (char **)NULL));
 }
diff --git a/src/lib/libc/stdlib/atoi.3 b/src/lib/libc/stdlib/atoi.3
index 219ba73c00..dee8b637a3 100644
--- a/src/lib/libc/stdlib/atoi.3
+++ b/src/lib/libc/stdlib/atoi.3
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" Copyright (c) 1990, 1991, 1993
-.\" All rights reserved.
+.\"    The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the American National Standards Committee X3, on Information
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,10 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)atoi.3        5.3 (Berkeley) 6/29/91
+.\"     $OpenBSD: atoi.3,v 1.8 2004/08/22 21:47:41 jaredy Exp $
-.\"     $Id: atoi.3,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd June 4, 1993
 .Dt ATOI 3
 .Os
 .Sh NAME
@@ -52,13 +47,12 @@ string to integer
 The
 .Fn atoi
 function converts the initial portion of the string pointed to by
-.Em nptr
+.Fa nptr
 to
-.Em integer
+.Li integer
 representation.
 .Pp
 It is equivalent to:
-.Pp
 .Bd -literal -offset indent
 (int)strtol(nptr, (char **)NULL, 10);
 .Ed
@@ -67,9 +61,26 @@ It is equivalent to:
 .Xr atol 3 ,
 .Xr strtod 3 ,
 .Xr strtol 3 ,
+.Xr strtonum 3 ,
 .Xr strtoul 3
 .Sh STANDARDS
 The
 .Fn atoi
 function conforms to
 .St -ansiC .
+.Sh CAVEATS
+.Nm
+does no overflow checking, handles unsigned numbers poorly,
+and handles strings containing trailing extra characters
+(like
+.Dq "123abc" )
+poorly.
+Careful use of
+.Xr strtol 3
+and
+.Xr strtoul 3
+can alleviate these problems,
+but
+.Xr strtonum 3
+can be used to convert numbers from strings much more safely
+and easily.
diff --git a/src/lib/libc/stdlib/atoi.c b/src/lib/libc/stdlib/atoi.c
index df7845f90c..b0842678e2 100644
--- a/src/lib/libc/stdlib/atoi.c
+++ b/src/lib/libc/stdlib/atoi.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: atoi.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1988 Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,16 +28,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)atoi.c       5.7 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: atoi.c,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 int
-atoi(str)
+atoi(const char *str)
-        const char *str;
 {
        return((int)strtol(str, (char **)NULL, 10));
 }
diff --git a/src/lib/libc/stdlib/atol.3 b/src/lib/libc/stdlib/atol.3
index 86e3d324a3..80e54c892d 100644
--- a/src/lib/libc/stdlib/atol.3
+++ b/src/lib/libc/stdlib/atol.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)atol.3        5.3 (Berkeley) 6/29/91
+.\"     $OpenBSD: atol.3,v 1.6 2003/06/02 20:18:37 millert Exp $
-.\"     $Id: atol.3,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt ATOL 3
@@ -52,9 +47,9 @@ string to long integer
 The
 .Fn atol
 function converts the initial portion of the string pointed to by
-.Ar nptr
+.Fa nptr
 to
-.Em long integer
+.Li long integer
 representation.
 .Pp
 It is equivalent to:
@@ -64,12 +59,12 @@ strtol(nptr, (char **)NULL, 10);
 .Sh SEE ALSO
 .Xr atof 3 ,
 .Xr atoi 3 ,
+.Xr atoll 3 ,
 .Xr strtod 3 ,
 .Xr strtol 3 ,
 .Xr strtoul 3
 .Sh STANDARDS
 The
 .Fn atol
-function
+function conforms to
-conforms to
+.St -ansiC-99 .
-.St -ansiC .
diff --git a/src/lib/libc/stdlib/atol.c b/src/lib/libc/stdlib/atol.c
index 31ed06298b..1970804401 100644
--- a/src/lib/libc/stdlib/atol.c
+++ b/src/lib/libc/stdlib/atol.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: atol.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1988 Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,16 +28,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)atol.c       5.7 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: atol.c,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 long
-atol(str)
+atol(const char *str)
-        const char *str;
 {
        return(strtol(str, (char **)NULL, 10));
 }
diff --git a/src/lib/libc/stdlib/calloc.3 b/src/lib/libc/stdlib/atoll.3
index d0754b46a0..2b53e9b694 100644
--- a/src/lib/libc/stdlib/calloc.3
+++ b/src/lib/libc/stdlib/atoll.3
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,39 +29,42 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)calloc.3      5.2 (Berkeley) 6/29/91
+.\"     $OpenBSD: atoll.3,v 1.4 2005/07/26 04:20:23 jaredy Exp $
-.\"     $Id: calloc.3,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $
 .\"
 .Dd June 29, 1991
-.Dt CALLOC 3
+.Dt ATOLL 3
 .Os
 .Sh NAME
-.Nm calloc
+.Nm atoll
-.Nd allocate clean memory (zero initialized space)
+.Nd convert
+.Tn ASCII
+string to long long integer
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
-.Ft void *
+.Ft long long
-.Fn calloc "size_t nmemb" "size_t size"
+.Fn atoll "const char *nptr"
 .Sh DESCRIPTION
 The
-.Fn calloc
+.Fn atoll
-function allocates space for an array of 
+function converts the initial portion of the string pointed to by
-.Fa nmemb
+.Fa nptr
-objects, each of whose size is
+to
-.Fa size .
+.Li long long integer
-The space is initialized to all bits zero.
+representation.
-.Sh RETURN VALUES
+.Pp
-The
+It is equivalent to:
-.Fn calloc
+.Bd -literal -offset indent
-function returns
+strtoll(nptr, (char **)NULL, 10);
-a pointer to the
+.Ed
-the allocated space if successful; otherwise a null pointer is returned.
 .Sh SEE ALSO
-.Xr malloc 3 ,
+.Xr atof 3 ,
-.Xr realloc 3 ,
+.Xr atoi 3 ,
-.Xr free 3
+.Xr atol 3 ,
+.Xr strtod 3 ,
+.Xr strtol 3 ,
+.Xr strtoul 3
 .Sh STANDARDS
 The
-.Fn calloc
+.Fn atoll
 function conforms to
-.St -ansiC .
+.St -ansiC-99 .
diff --git a/src/lib/libc/stdlib/atoll.c b/src/lib/libc/stdlib/atoll.c
new file mode 100644
index 0000000000..a65e682cfb
--- /dev/null
+++ b/src/lib/libc/stdlib/atoll.c
@@ -0,0 +1,38 @@
+/*      $OpenBSD: atoll.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.
+ */
+#include <stdlib.h>
+long long
+atoll(str)
+        const char *str;
+{
+        return(strtoll(str, (char **)NULL, 10));
+}
diff --git a/src/lib/libc/stdlib/bsearch.3 b/src/lib/libc/stdlib/bsearch.3
index 1622c96c6b..d1dd9173db 100644
--- a/src/lib/libc/stdlib/bsearch.3
+++ b/src/lib/libc/stdlib/bsearch.3
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
+.\" Copyright (c) 1990, 1991, 1993, 1994
-.\" All rights reserved.
+.\"    The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the American National Standards Committee X3, on Information
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,10 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)bsearch.3     5.6 (Berkeley) 6/29/91
+.\"     $OpenBSD: bsearch.3,v 1.6 2003/06/02 20:18:37 millert Exp $
-.\"     $Id: bsearch.3,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd April 19, 1994
 .Dt BSEARCH 3
 .Os
 .Sh NAME
@@ -51,12 +46,12 @@ The
 .Fn bsearch
 function searches an array of
 .Fa nmemb
-objects, the initial member of which is 
+objects, the initial member of which is
 pointed to by
 .Fa base ,
 for a member that matches the object pointed to by
 .Fa key .
-The size of each member of the array is specified by 
+The size of each member of the array is specified by
 .Fa size .
 .Pp
 The contents of the array should be in ascending sorted order according
@@ -64,9 +59,7 @@ to the comparison function referenced by
 .Fa compar .
 The
 .Fa compar
-routine
+routine is expected to have two arguments which point to the
-is expected to have two
-two arguments which point to the
 .Fa key
 object and to an array member, in that order, and should return an integer
 less than, equal to, or greater than zero if the
@@ -83,7 +76,7 @@ If two members compare as equal, which member is matched is unspecified.
 .Xr db 3 ,
 .Xr lsearch 3 ,
 .Xr qsort 3 ,
-.\" .Xr tsearch 3
+.Xr tsearch 3
 .Sh STANDARDS
 The
 .Fn bsearch
diff --git a/src/lib/libc/stdlib/bsearch.c b/src/lib/libc/stdlib/bsearch.c
index fac03f694f..8193d27c60 100644
--- a/src/lib/libc/stdlib/bsearch.c
+++ b/src/lib/libc/stdlib/bsearch.c
@@ -10,11 +10,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,11 +27,6 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)bsearch.c    5.4 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: bsearch.c,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 /*
@@ -55,16 +46,12 @@ static char *rcsid = "$Id: bsearch.c,v 1.1.1.1 1995/10/18 08:42:16 deraadt Exp $
 * look at item 3.
 */
 void *
-bsearch(key, base0, nmemb, size, compar)
+bsearch(const void *key, const void *base0, size_t nmemb, size_t size,
-        register const void *key;
+    int (*compar)(const void *, const void *))
-        const void *base0;
-        size_t nmemb;
-        register size_t size;
-        register int (*compar) __P((const void *, const void *));
 {
-        register const char *base = base0;
+        const char *base = base0;
-        register int lim, cmp;
+        int lim, cmp;
-        register const void *p;
+        const void *p;
        for (lim = nmemb; lim != 0; lim >>= 1) {
                p = base + (lim >> 1) * size;
diff --git a/src/lib/libc/stdlib/calloc.c b/src/lib/libc/stdlib/calloc.c
index 3353fab052..43a0d1632c 100644
--- a/src/lib/libc/stdlib/calloc.c
+++ b/src/lib/libc/stdlib/calloc.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: calloc.c,v 1.11 2006/04/02 18:22:14 otto Exp $ */
 /*-
 * Copyright (c) 1990 The Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,23 +28,23 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)calloc.c     5.6 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: calloc.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
+#include <errno.h>
 void *
-calloc(num, size)
+calloc(size_t num, size_t size)
-        size_t num;
-        register size_t size;
 {
-        register void *p;
+        void *p;
+        if (num && SIZE_MAX / num < size) {
+                errno = ENOMEM;
+                return NULL;
+        }
        size *= num;
-        if (p = malloc(size))
+        p = malloc(size);
-                memset(p, '\0', size);
+        if (p)
+                memset(p, 0, size);
        return(p);
 }
diff --git a/src/lib/libc/stdlib/cfree.c b/src/lib/libc/stdlib/cfree.c
new file mode 100644
index 0000000000..373c7ff75d
--- /dev/null
+++ b/src/lib/libc/stdlib/cfree.c
@@ -0,0 +1,40 @@
+/*      $OpenBSD: cfree.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
+/*
+ * Copyright (c) 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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.
+ */
+#include <sys/cdefs.h>
+#include <stdlib.h>
+#ifdef __indr_reference
+__indr_reference(free, cfree);
+#else
+void
+cfree(void *p)
+{
+    free(p);
+}
+#endif
diff --git a/src/lib/libc/stdlib/div.3 b/src/lib/libc/stdlib/div.3
index a4730694a5..d6a9a0029d 100644
--- a/src/lib/libc/stdlib/div.3
+++ b/src/lib/libc/stdlib/div.3
@@ -11,11 +11,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -31,8 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)div.3 5.2 (Berkeley) 4/19/91
+.\"     $OpenBSD: div.3,v 1.8 2006/01/13 17:58:09 millert Exp $
-.\"     $Id: div.3,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $
 .\"
 .Dd April 19, 1991
 .Dt DIV 3
@@ -47,24 +42,24 @@
 .Sh DESCRIPTION
 The
 .Fn div
-function
+function computes the value
-computes the value
+.Fa num Ns / Ns Fa denom
-.Fa num/denom
 and returns the quotient and remainder in a structure named
 .Fa div_t
 that contains two
-.Em int
+.Li int
 members named
 .Fa quot
 and
 .Fa rem .
 .Sh SEE ALSO
+.Xr imaxdiv 3 ,
 .Xr ldiv 3 ,
-.Xr qdiv 3 ,
+.Xr lldiv 3 ,
-.Xr math 3
+.Xr math 3 ,
+.Xr qdiv 3
 .Sh STANDARDS
 The
 .Fn div
-function
+function conforms to
-conforms to
 .St -ansiC .
diff --git a/src/lib/libc/stdlib/div.c b/src/lib/libc/stdlib/div.c
index 122ac0deec..f7ac2db4b0 100644
--- a/src/lib/libc/stdlib/div.c
+++ b/src/lib/libc/stdlib/div.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: div.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1990 Regents of the University of California.
 * All rights reserved.
@@ -13,11 +14,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -34,16 +31,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)div.c        5.2 (Berkeley) 4/16/91";*/
-static char *rcsid = "$Id: div.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>             /* div_t */
 div_t
-div(num, denom)
+div(int num, int denom)
-        int num, denom;
 {
        div_t r;
diff --git a/src/lib/libc/stdlib/drand48.c b/src/lib/libc/stdlib/drand48.c
index ae1a8634dc..b6c046c831 100644
--- a/src/lib/libc/stdlib/drand48.c
+++ b/src/lib/libc/stdlib/drand48.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: drand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1993 Martin Birgmeier
 * All rights reserved.
diff --git a/src/lib/libc/stdlib/ecvt.3 b/src/lib/libc/stdlib/ecvt.3
new file mode 100644
index 0000000000..689cb1c6f9
--- /dev/null
+++ b/src/lib/libc/stdlib/ecvt.3
@@ -0,0 +1,165 @@
+.\" $OpenBSD: ecvt.3,v 1.7 2004/01/25 14:48:32 jmc Exp $
+.\"
+.\" Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" Sponsored in part by the Defense Advanced Research Projects
+.\" Agency (DARPA) and Air Force Research Laboratory, Air Force
+.\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
+.\"
+.Dd December 1, 2002
+.Dt ECVT 3
+.Os
+.Sh NAME
+.Nm ecvt ,
+.Nm fcvt ,
+.Nm gcvt
+.Nd convert double to
+.Tn ASCII
+string
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft char *
+.Fn ecvt "double value" "int ndigit" "int *decpt" "int *sign"
+.Ft char *
+.Fn fcvt "double value" "int ndigit" "int *decpt" "int *sign"
+.Ft char *
+.Fn gcvt "double value" "int ndigit" "char *buf"
+.Sh DESCRIPTION
+.Bf -symbolic
+These functions are provided for compatibility with legacy code.
+New code should use the
+.Xr snprintf 3
+function for improved safety and portability.
+.Ef
+.Pp
+The
+.Fn ecvt ,
+.Fn fcvt
+and
+.Fn gcvt
+functions convert the double precision floating-point number
+.Fa value
+to a NUL-terminated
+.Tn ASCII
+string.
+.Pp
+The
+.Fn ecvt
+function converts
+.Fa value
+to a NUL-terminated string of exactly
+.Fa ndigit
+digits and returns a pointer to that string.
+The result is padded with zeroes from left to right as needed.
+There are no leading zeroes unless
+.Fa value
+itself is 0.
+The least significant digit is rounded in an implementation-dependent manner.
+The position of the decimal point relative to the beginning of the string
+is stored in
+.Fa decpt .
+A negative value indicates that the decimal point is located
+to the left of the returned digits (this occurs when there is no
+whole number component to
+.Fa value ) .
+If
+.Fa value
+is zero, it is unspecified whether the integer pointed to by
+.Fa decpt
+will be 0 or 1.
+The decimal point itself is not included in the returned string.
+If the sign of the result is negative, the integer pointed to by
+.Fa sign
+is non-zero; otherwise, it is 0.
+.Pp
+If the converted value is out of range or is not representable,
+the contents of the returned string are unspecified.
+.Pp
+The
+.Fn fcvt
+function is identical to
+.Fn ecvt
+with the exception that
+.Fa ndigit
+specifies the number of digits after the decimal point (zero-padded as
+needed).
+.Pp
+The
+.Fn gcvt
+function converts
+.Fa value
+to a NUL-terminated string similar to the %g
+.Xr printf 3
+format specifier and stores the result in
+.Fa buf .
+It produces
+.Fa ndigit
+significant digits similar to the %f
+.Xr printf 3
+format specifier where possible.
+If
+.Fa ndigit
+does allow sufficient precision, the result is stored in
+exponential notation similar to the %e
+.Xr printf 3
+format specifier.
+If
+.Fa value
+is less than zero,
+.Fa buf
+will be prefixed with a minus sign.
+A decimal point is included in the returned string if
+.Fa value
+is not a whole number.
+Unlike the
+.Fn ecvt
+and
+.Fn fcvt
+functions,
+.Fa buf
+is not zero-padded.
+.Sh RETURN VALUES
+The
+.Fn ecvt ,
+.Fn fcvt
+and
+.Fn gcvt
+functions return a NUL-terminated string representation of
+.Fa value .
+.Sh WARNINGS
+The
+.Fn ecvt
+and
+.Fn fcvt
+functions return a pointer to internal storage space that will be
+overwritten by subsequent calls to either function.
+.Pp
+The maximum possible precision of the return value is limited by the
+precision of a double and may not be the same on all architectures.
+.Pp
+The
+.Xr snprintf 3
+function is preferred over these functions for new code.
+.Sh SEE ALSO
+.Xr printf 3 ,
+.Xr strtod 3
+.Sh STANDARDS
+The
+.Fn ecvt ,
+.Fn fcvt
+and
+.Fn gcvt
+functions conform to
+.St -p1003.1-2001 .
diff --git a/src/lib/libc/stdlib/ecvt.c b/src/lib/libc/stdlib/ecvt.c
new file mode 100644
index 0000000000..eb0e428996
--- /dev/null
+++ b/src/lib/libc/stdlib/ecvt.c
@@ -0,0 +1,99 @@
+/*      $OpenBSD: ecvt.c,v 1.5 2006/01/10 16:18:37 millert Exp $        */
+/*
+ * Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+extern char *__dtoa(double, int, int, int *, int *, char **);
+static char *__cvt(double, int, int *, int *, int, int);
+static char *
+__cvt(double value, int ndigit, int *decpt, int *sign, int fmode, int pad)
+{
+        static char *s;
+        char *p, *rve;
+        size_t siz;
+        if (ndigit == 0) {
+                *sign = value < 0.0;
+                *decpt = 0;
+                return ("");
+        }
+        if (s) {
+                free(s);
+                s = NULL;
+        }
+        if (ndigit < 0)
+                siz = -ndigit + 1;
+        else
+                siz = ndigit + 1;
+        /* __dtoa() doesn't allocate space for 0 so we do it by hand */
+        if (value == 0.0) {
+                *decpt = 1 - fmode;     /* 1 for 'e', 0 for 'f' */
+                *sign = 0;
+                if ((rve = s = (char *)malloc(siz)) == NULL)
+                        return(NULL);
+                *rve++ = '0';
+                *rve = '\0';
+        } else {
+                p = __dtoa(value, fmode + 2, ndigit, decpt, sign, &rve);
+                if (*decpt == 9999) {
+                        /* Infinity or Nan, convert to inf or nan like printf */
+                        *decpt = 0;
+                        return(*p == 'I' ? "inf" : "nan");
+                }
+                /* Make a local copy and adjust rve to be in terms of s */
+                if (pad && fmode)
+                        siz += *decpt;
+                if ((s = (char *)malloc(siz)) == NULL)
+                        return(NULL);
+                (void) strlcpy(s, p, siz);
+                rve = s + (rve - p);
+        }
+        /* Add trailing zeros */
+        if (pad) {
+                siz -= rve - s;
+                while (--siz)
+                        *rve++ = '0';
+                *rve = '\0';
+        }
+        return(s);
+}
+char *
+ecvt(double value, int ndigit, int *decpt, int *sign)
+{
+        return(__cvt(value, ndigit, decpt, sign, 0, 1));
+}
+char *
+fcvt(double value, int ndigit, int *decpt, int *sign)
+{
+        return(__cvt(value, ndigit, decpt, sign, 1, 1));
+}
diff --git a/src/lib/libc/stdlib/erand48.c b/src/lib/libc/stdlib/erand48.c
index cc9fbf770c..2ffeaa6e71 100644
--- a/src/lib/libc/stdlib/erand48.c
+++ b/src/lib/libc/stdlib/erand48.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: erand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1993 Martin Birgmeier
 * All rights reserved.
diff --git a/src/lib/libc/stdlib/exit.3 b/src/lib/libc/stdlib/exit.3
index adb81ffcb4..fa233ac75f 100644
--- a/src/lib/libc/stdlib/exit.3
+++ b/src/lib/libc/stdlib/exit.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,25 +29,30 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)exit.3        6.6 (Berkeley) 6/29/91
+.\"     $OpenBSD: exit.3,v 1.10 2004/05/03 17:21:13 millert Exp $
-.\"     $Id: exit.3,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd January 21, 2004
 .Dt EXIT 3
 .Os
 .Sh NAME
-.Nm exit
+.Nm exit, _Exit
 .Nd perform normal program termination
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
 .Ft void
 .Fn exit "int status"
+.Ft void
+.Fn _Exit "int status"
 .Sh DESCRIPTION
-.Fn Exit
+The
-terminates a process.
+.Fn exit
+and
+.Fn _Exit
+functions terminate a process.
 .Pp
-Before termination it performs the following functions in the
+Before termination,
-order listed:
+.Fn exit
+performs the following operations in the order listed:
 .Bl -enum -offset indent
 .It
 Call the functions registered with the
@@ -66,19 +67,48 @@ Unlink all files created with the
 .Xr tmpfile 3
 function.
 .El
+.Pp
+The
+.Fn _Exit
+function terminates without calling the functions registered with the
+.Xr atexit 3
+function.
+The
+.Ox
+implementation of
+.Fn _Exit
+does not flush open output streams or unlink files created with the
+.Xr tmpfile 3
+function.
+However, this behavior is implementation-specific.
+.Pp
+Lastly,
+.Fn exit
+and
+.Fn _Exit
+call
+.Xr _exit 2 .
+Note that typically
+.Xr _exit 2
+only passes the lower 8 bits of
+.Fa status
+on to the parent, thus negative values have less meaning.
 .Sh RETURN VALUES
 The
 .Fn exit
-function
+and
-never returns.
+.Fn _Exit
+functions never return.
 .Sh SEE ALSO
 .Xr _exit 2 ,
 .Xr atexit 3 ,
 .Xr intro 3 ,
+.Xr sysexits 3 ,
 .Xr tmpfile 3
 .Sh STANDARDS
 The
 .Fn exit
-function
+and
-conforms to
+.Fn _Exit
-.St -ansiC .
+functions conform to
+.St -ansiC-99 .
diff --git a/src/lib/libc/stdlib/exit.c b/src/lib/libc/stdlib/exit.c
index b1412f42bb..90b7d5adc2 100644
--- a/src/lib/libc/stdlib/exit.c
+++ b/src/lib/libc/stdlib/exit.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: exit.c,v 1.11 2005/08/08 08:05:36 espie Exp $ */
 /*-
 * Copyright (c) 1990 The Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,31 +28,42 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
+#include <sys/types.h>
-/*static char *sccsid = "from: @(#)exit.c       5.4 (Berkeley) 2/23/91";*/
+#include <sys/mman.h>
-static char *rcsid = "$Id: exit.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 #include <unistd.h>
 #include "atexit.h"
+#include "thread_private.h"
-void (*__cleanup)();
+/*
+ * This variable is zero until a process has created a thread.
+ * It is used to avoid calling locking functions in libc when they
+ * are not required. By default, libc is intended to be(come)
+ * thread-safe, but without a (significant) penalty to non-threaded
+ * processes.
+ */
+int     __isthreaded    = 0;
 /*
 * Exit, flushing stdio buffers if necessary.
 */
 void
-exit(status)
+exit(int status)
-        int status;
 {
-        register struct atexit *p;
+        struct atexit *p, *q;
-        register int n;
+        int n, pgsize = getpagesize();
-        for (p = __atexit; p; p = p->next)
+        if (!__atexit_invalid) {
-                for (n = p->ind; --n >= 0;)
+                p = __atexit;
-                        (*p->fns[n])();
+                while (p != NULL) {
-        if (__cleanup)
+                        for (n = p->ind; --n >= 0;)
-                (*__cleanup)();
+                                if (p->fns[n] != NULL)
+                                        (*p->fns[n])();
+                        q = p;
+                        p = p->next;
+                        munmap(q, pgsize);
+                }
+        }
+        /* cleanup, if registered, was called through fns[0] in the last page */
        _exit(status);
 }
diff --git a/src/lib/libc/stdlib/gcvt.c b/src/lib/libc/stdlib/gcvt.c
new file mode 100644
index 0000000000..bc6295c03d
--- /dev/null
+++ b/src/lib/libc/stdlib/gcvt.c
@@ -0,0 +1,108 @@
+/*      $OpenBSD: gcvt.c,v 1.9 2006/01/10 16:18:37 millert Exp $        */
+/*
+ * Copyright (c) 2002, 2003, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+extern char *__dtoa(double, int, int, int *, int *, char **);
+char *
+gcvt(double value, int ndigit, char *buf)
+{
+        char *digits, *dst, *src;
+        int i, decpt, sign;
+        struct lconv *lconv;
+        lconv = localeconv();
+        if (ndigit == 0) {
+                buf[0] = '\0';
+                return (buf);
+        }
+        digits = __dtoa(value, 2, ndigit, &decpt, &sign, NULL);
+        if (decpt == 9999) {
+                /*
+                 * Infinity or NaN, convert to inf or nan with sign.
+                 * We assume the buffer is at least ndigit long.
+                 */
+                snprintf(buf, ndigit + 1, "%s%s", sign ? "-" : "",
+                    *digits == 'I' ? "inf" : "nan");
+                return (buf);
+        }
+        dst = buf;
+        if (sign)
+                *dst++ = '-';
+        if (decpt < 0 || decpt > ndigit) {
+                /* exponential format (e.g. 1.2345e+13) */
+                if (--decpt < 0) {
+                        sign = 1;
+                        decpt = -decpt;
+                } else
+                        sign = 0;
+                src = digits;
+                *dst++ = *src++;
+                *dst++ = *lconv->decimal_point;
+                while (*src != '\0')
+                        *dst++ = *src++;
+                *dst++ = 'e';
+                if (sign)
+                        *dst++ = '-';
+                else
+                        *dst++ = '+';
+                if (decpt < 10) {
+                        *dst++ = '0';
+                        *dst++ = '0' + decpt;
+                        *dst = '\0';
+                } else {
+                        /* XXX - optimize */
+                        for (sign = decpt, i = 0; (sign /= 10) != 0; i++)
+                                continue;
+                        dst[i + 1] = '\0';
+                        while (decpt != 0) {
+                                dst[i--] = '0' + decpt % 10;
+                                decpt /= 10;
+                        }
+                }
+        } else {
+                /* standard format */
+                for (i = 0, src = digits; i < decpt; i++) {
+                        if (*src != '\0')
+                                *dst++ = *src++;
+                        else
+                                *dst++ = '0';
+                }
+                if (*src != '\0') {
+                        if (src == digits)
+                                *dst++ = '0';   /* zero before decimal point */
+                        *dst++ = *lconv->decimal_point;
+                        for (i = decpt; digits[i] != '\0'; i++) {
+                                *dst++ = digits[i];
+                        }
+                }
+                *dst = '\0';
+        }
+        return (buf);
+}
diff --git a/src/lib/libc/stdlib/getenv.3 b/src/lib/libc/stdlib/getenv.3
index 411eb35da4..f131bbf513 100644
--- a/src/lib/libc/stdlib/getenv.3
+++ b/src/lib/libc/stdlib/getenv.3
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1988, 1991 The Regents of the University of California.
+.\" Copyright (c) 1988, 1991, 1993
-.\" All rights reserved.
+.\"    The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the American National Standards Committee X3, on Information
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,10 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)getenv.3      6.11 (Berkeley) 6/29/91
+.\"     $OpenBSD: getenv.3,v 1.11 2005/07/26 04:20:23 jaredy Exp $
-.\"     $Id: getenv.3,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd December 11, 1993
 .Dt GETENV 3
 .Os
 .Sh NAME
@@ -56,59 +51,51 @@
 .Ft void
 .Fn unsetenv "const char *name"
 .Sh DESCRIPTION
-These functions set, unset and fetch environment variables from the
+These functions set, unset, and fetch environment variables from the host
-host
 .Em environment list .
-For compatibility with differing environment conventions,
+For compatibility with differing environment conventions, the given arguments
-the given arguments
+.Fa name
-.Ar name
 and
-.Ar value
+.Fa value
-may be appended and prepended, 
+may be appended and prepended, respectively, with an equal sign
-respectively,
-with an equal sign
 .Dq Li \&= .
 .Pp
 The
 .Fn getenv
-function obtains the current value of the environment variable,
+function obtains the current value of the environment variable
-.Ar name .
+.Fa name .
 If the variable
-.Ar name
+.Fa name
-is not in the current environment ,
+is not in the current environment, a null pointer is returned.
-a null pointer is returned.
 .Pp
 The
 .Fn setenv
 function inserts or resets the environment variable
-.Ar name
+.Fa name
 in the current environment list.
 If the variable
-.Ar name
+.Fa name
-does not exist in the list,
+does not exist in the list, it is inserted with the given
-it is inserted with the given
+.Fa value .
-.Ar value.
 If the variable does exist, the argument
-.Ar overwrite
+.Fa overwrite
 is tested; if
-.Ar overwrite is
+.Fa overwrite
-zero, the
+is zero, the variable is not reset, otherwise it is reset to the given
-variable is not reset, otherwise it is reset
+.Fa value .
-to the given
-.Ar value .
 .Pp
 The
 .Fn putenv
-function takes an argument of the form ``name=value'' and is
+function takes an argument of the form
-equivalent to:
+.Ar name Ns = Ns Ar value
+and is equivalent to:
 .Bd -literal -offset indent
 setenv(name, value, 1);
 .Ed
 .Pp
 The
 .Fn unsetenv
-function
+function deletes all instances of the variable name pointed to by
-deletes all instances of the variable name pointed to by
 .Fa name
 from the list.
 .Sh RETURN VALUES
@@ -118,8 +105,11 @@ and
 .Fn putenv
 return zero if successful; otherwise the global variable
 .Va errno
-is set to indicate the error and a
+is set to indicate the error and \-1 is returned.
-\-1 is returned.
+.Pp
+If
+.Fn getenv
+is successful, the string returned should be considered read-only.
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er ENOMEM
@@ -140,12 +130,18 @@ The
 function conforms to
 .St -ansiC .
 .Sh HISTORY
+The function
+.Fn getenv
+appeared in
+.At v7
+and
+.Bx 3 .
 The functions
 .Fn setenv
 and
 .Fn unsetenv
 appeared in
-.At v7 .
+.Bx 4.3 Tahoe .
 The
 .Fn putenv
 function appeared in
diff --git a/src/lib/libc/stdlib/getenv.c b/src/lib/libc/stdlib/getenv.c
index 09d47f2149..72367b34e2 100644
--- a/src/lib/libc/stdlib/getenv.c
+++ b/src/lib/libc/stdlib/getenv.c
@@ -1,6 +1,7 @@
+/*      $OpenBSD: getenv.c,v 1.8 2005/08/08 08:05:36 espie Exp $ */
 /*
- * Copyright (c) 1987 Regents of the University of California.
+ * Copyright (c) 1987, 1993
- * All rights reserved.
+ *      The Regents of the University of California.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,27 +28,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)getenv.c     5.8 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: getenv.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 #include <string.h>
-/*
+char *__findenv(const char *name, int *offset);
- * getenv --
- *      Returns ptr to value associated with name, if any, else NULL.
- */
-char *
-getenv(name)
-        const char *name;
-{
-        int offset;
-        char *__findenv();
-        return(__findenv(name, &offset));
-}
 /*
 * __findenv --
@@ -63,20 +43,38 @@ getenv(name)
 *      This routine *should* be a static; don't use it.
 */
 char *
-__findenv(name, offset)
+__findenv(const char *name, int *offset)
-        register char *name;
-        int *offset;
 {
        extern char **environ;
-        register int len;
+        int len, i;
-        register char **P, *C;
+        const char *np;
+        char **p, *cp;
+        if (name == NULL || environ == NULL)
+                return (NULL);
+        for (np = name; *np && *np != '='; ++np)
+                ;
+        len = np - name;
+        for (p = environ; (cp = *p) != NULL; ++p) {
+                for (np = name, i = len; i && *cp; i--)
+                        if (*cp++ != *np++)
+                                break;
+                if (i == 0 && *cp++ == '=') {
+                        *offset = p - environ;
+                        return (cp);
+                }
+        }
+        return (NULL);
+}
+/*
+ * getenv --
+ *      Returns ptr to value associated with name, if any, else NULL.
+ */
+char *
+getenv(const char *name)
+{
+        int offset;
-        for (C = name, len = 0; *C && *C != '='; ++C, ++len);
+        return (__findenv(name, &offset));
-        for (P = environ; *P; ++P)
-                if (!strncmp(*P, name, len))
-                        if (*(C = *P + len) == '=') {
-                                *offset = P - environ;
-                                return(++C);
-                        }
-        return(NULL);
 }
diff --git a/src/lib/libc/stdlib/getopt.3 b/src/lib/libc/stdlib/getopt.3
index f843881afd..796541184f 100644
--- a/src/lib/libc/stdlib/getopt.3
+++ b/src/lib/libc/stdlib/getopt.3
@@ -9,11 +9,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -29,20 +25,20 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)getopt.3    8.4 (Berkeley) 4/19/94
+.\"     $OpenBSD: getopt.3,v 1.38 2006/03/15 02:50:25 ray Exp $
 .\"
-.Dd April 19, 1994
+.Dd December 17, 2002
 .Dt GETOPT 3
-.Os BSD 4.3
+.Os
 .Sh NAME
 .Nm getopt
 .Nd get option character from command line argument list
 .Sh SYNOPSIS
 .Fd #include <unistd.h>
 .Vt extern char *optarg;
+.Vt extern int   opterr;
 .Vt extern int   optind;
 .Vt extern int   optopt;
-.Vt extern int   opterr;
 .Vt extern int   optreset;
 .Ft int
 .Fn getopt "int argc" "char * const *argv" "const char *optstring"
@@ -61,20 +57,23 @@ if it has been specified in the string of accepted option characters,
 .Pp
 The option string
 .Fa optstring
-may contain the following elements: individual characters, and
+may contain the following elements: individual characters,
-characters followed by a colon to indicate an option argument
+characters followed by a colon, and characters followed by two colons.
-is to follow.
+A character followed by a single colon indicates that an argument
+is to follow the option on the command line.
+Two colons indicates that the argument is optional \- this is an
+extension not covered by POSIX.
 For example, an option string
-.Li "\&""x""
+.Qq x
 recognizes an option
-.Dq Fl x ,
+.Fl x ,
 and an option string
-.Li "\&""x:""
+.Qq Li x:
 recognizes an option and argument
-.Dq Fl x Ar argument .
+.Fl x Ar argument .
 It does not matter to
 .Fn getopt
-if a following argument has leading white space.
+if a following argument has leading whitespace.
 .Pp
 On return from
 .Fn getopt ,
@@ -87,23 +86,23 @@ contains the index to the next
 argument for a subsequent call
 to
 .Fn getopt .
-The variable
-.Va optopt
-saves the last
-.Em known
-option character returned by
-.Fn getopt .
 .Pp
-The variable
+The variables
 .Va opterr
 and
 .Va optind
 are both initialized to 1.
 The
 .Va optind
-variable may be set to another value before a set of calls to
+variable may be set to another value larger than 0 before a set of calls to
 .Fn getopt
-in order to skip over more or less argv entries.
+in order to skip over more or less
+.Fa argv
+entries.
+An
+.Va optind
+value of 0 is reserved for compatibility with GNU
+.Fn getopt .
 .Pp
 In order to use
 .Fn getopt
@@ -119,101 +118,163 @@ must be reinitialized.
 .Pp
 The
 .Fn getopt
-function
+function returns \-1 when the argument list is exhausted.
-returns \-1
-when the argument list is exhausted, or a non-recognized
-option is encountered.
 The interpretation of options in the argument list may be cancelled
 by the option
 .Ql --
 (double dash) which causes
 .Fn getopt
-to signal the end of argument processing and returns \-1.
+to signal the end of argument processing and return \-1.
 When all options have been processed (i.e., up to the first non-option
 argument),
 .Fn getopt
 returns \-1.
-.Sh DIAGNOSTICS
+.Sh RETURN VALUES
-If the
+The
 .Fn getopt
-function encounters a character not found in the string
+function returns the next known option character in
-.Va optarg
+.Fa optstring .
-or detects
-a missing option argument it writes an error message and returns
-.Ql ?
-to the
-.Em stderr .
-Setting
-.Va opterr
-to a zero will disable these error messages.
 If
-.Va optstring 
+.Fn getopt
-has a leading 
+encounters a character not found in
-.Ql \&:
+.Fa optstring
-then a missing option argument causes a
+or if it detects a missing option argument,
-.Ql \&:
+it returns
-to be returned in addition to suppressing any error messages.
+.Sq \&?
-.Pp
+(question mark).
-Option arguments are allowed to begin with
+If
-.Dq Li \- ;
+.Fa optstring
-this is reasonable but
+has a leading
-reduces the amount of error checking possible.
+.Sq \&:
-.Sh EXTENSIONS
+then a missing option argument causes
+.Sq \&:
+to be returned instead of
+.Sq \&? .
+In either case, the variable
+.Va optopt
+is set to the character that caused the error.
 The
-.Va optreset
-variable was added to make it possible to call the
 .Fn getopt
-function multiple times.
+function returns \-1 when the argument list is exhausted.
-This is an extension to the
+.Sh ENVIRONMENT
-.St -p1003.2
+.Bl -tag -width POSIXLY_CORRECTXX
-specification.
+.It Ev POSIXLY_CORRECT
-.Sh EXAMPLE
+If set, a leading
-.Bd -literal -compact
+.Sq -
-extern char *optarg;
+in
-extern int optind;
+.Ar optstring
+is ignored.
+.El
+.Sh EXAMPLES
+The following code accepts the options
+.Fl b
+and
+.Fl f Ar argument
+and adjusts
+.Va argc
+and
+.Va argv
+after option argument processing has completed.
+.Bd -literal -offset indent
 int bflag, ch, fd;
 bflag = 0;
-while ((ch = getopt(argc, argv, "bf:")) != -1)
+while ((ch = getopt(argc, argv, "bf:")) != -1) {
-        switch(ch) {
+        switch (ch) {
        case 'b':
                bflag = 1;
                break;
        case 'f':
-                if ((fd = open(optarg, O_RDONLY, 0)) < 0) {
+                if ((fd = open(optarg, O_RDONLY, 0)) == -1)
-                        (void)fprintf(stderr,
+                        err(1, "%s", optarg);
-                            "myname: %s: %s\en", optarg, strerror(errno));
-                        exit(1);
-                }
                break;
-        case '?':
        default:
                usage();
+                /* NOTREACHED */
+        }
 }
 argc -= optind;
 argv += optind;
 .Ed
-.Sh HISTORY
+.Sh DIAGNOSTICS
+If the
+.Fn getopt
+function encounters a character not found in the string
+.Fa optstring
+or detects
+a missing option argument, it writes an error message to
+.Em stderr
+and returns
+.Ql \&? .
+Setting
+.Va opterr
+to a zero will disable these error messages.
+If
+.Fa optstring
+has a leading
+.Ql \&:
+then a missing option argument causes a
+.Ql \&:
+to be returned in addition to suppressing any error messages.
+.Pp
+Option arguments are allowed to begin with
+.Ql - ;
+this is reasonable but reduces the amount of error checking possible.
+.Sh SEE ALSO
+.Xr getopt 1 ,
+.Xr getopt_long 3 ,
+.Xr getsubopt 3
+.Sh STANDARDS
 The
 .Fn getopt
-function appeared
+function implements a superset of the functionality specified by
-.Bx 4.3 .
+.St -p1003.1 .
-.Sh BUGS
+.Pp
+The following extensions are supported:
+.Bl -tag -width "xxx"
+.It Li o
 The
+.Va optreset
+variable was added to make it possible to call the
 .Fn getopt
-function was once specified to return
+function multiple times.
-.Dv EOF 
+.It Li o
-instead of \-1.
+If the
-This was changed by
+.Va optind
-.St -p1003.2-92
+variable is set to 0,
-to decouple 
 .Fn getopt
-from 
+will behave as if the
-.Pa <stdio.h> .
+.Va optreset
-.Pp
+variable has been set.
+This is for compatibility with
+.Tn GNU
+.Fn getopt .
+New code should use
+.Va optreset
+instead.
+.It Li o
+If the first character of
+.Fa optstring
+is a plus sign
+.Pq Ql + ,
+it will be ignored.
+This is for compatibility with
+.Tn GNU
+.Fn getopt .
+.It Li o
+If the first character of
+.Fa optstring
+is a dash
+.Pq Ql - ,
+non-options will be returned as arguments to the option character
+.Ql \e1 .
+This is for compatibility with
+.Tn GNU
+.Fn getopt .
+.It Li o
 A single dash
-.Dq Li -
+.Pq Ql -
-may be specified as an character in
+may be specified as a character in
 .Fa optstring ,
 however it should
 .Em never
@@ -221,40 +282,106 @@ have an argument associated with it.
 This allows
 .Fn getopt
 to be used with programs that expect
-.Dq Li -
+.Ql -
 as an option flag.
 This practice is wrong, and should not be used in any current development.
 It is provided for backward compatibility
 .Em only .
+Care should be taken not to use
+.Ql -
+as the first character in
+.Fa optstring
+to avoid a semantic conflict with
+.Tn GNU
+.Fn getopt
+semantics (see above).
 By default, a single dash causes
 .Fn getopt
 to return \-1.
-This is, we believe, compatible with System V.
+.El
+.Pp
+Unlike
+.Tn GNU
+.Fn getopt ,
+.Ox
+does not permute the argument vector to allow non-options to be
+interspersed with options on the command line.
+Programs requiring this behavior should use
+.Xr getopt_long 3
+instead.
+Because of this (and unlike
+.Tn GNU ) ,
+the
+.Ox
+.Fn getopt
+supports optional arguments separated by whitespace.
+.Pp
+Historic
+.Bx
+versions of
+.Fn getopt
+set
+.Fa optopt
+to the last option character processed.
+However, this conflicts with
+.St -p1003.1
+which stipulates that
+.Fa optopt
+be set to the last character that caused an error.
+.Sh HISTORY
+The
+.Fn getopt
+function appeared in
+.Bx 4.3 .
+.Sh BUGS
+The
+.Fn getopt
+function was once specified to return
+.Dv EOF
+instead of \-1.
+This was changed by
+.St -p1003.2-92
+to decouple
+.Fn getopt
+from
+.Aq Pa stdio.h .
 .Pp
-It is also possible to handle digits as option letters.
+It is possible to handle digits as option letters.
 This allows
 .Fn getopt
 to be used with programs that expect a number
-.Pq Dq Li \&-\&3
+.Pq Dq Li \-3
 as an option.
 This practice is wrong, and should not be used in any current development.
 It is provided for backward compatibility
 .Em only .
-The following code fragment works in most cases.
+The following code fragment works in most cases and can handle mixed
+number and letter arguments.
 .Bd -literal -offset indent
-int length;
+int aflag = 0, bflag = 0, ch, lastch = '\e0';
-char *p;
+int length = -1, newarg = 1, prevoptind = 1;
-while ((c = getopt(argc, argv, "0123456789")) != -1)
+while ((ch = getopt(argc, argv, "0123456789ab")) != -1) {
-        switch (c) {
+        switch (ch) {
        case '0': case '1': case '2': case '3': case '4':
        case '5': case '6': case '7': case '8': case '9':
-                p = argv[optind - 1];
+                if (newarg || !isdigit(lastch))
-                if (p[0] == '-' && p[1] == ch && !p[2])
+                        length = 0;
-                        length = atoi(++p);
+                else if (length > INT_MAX / 10)
-                else
+                        usage();
-                        length = atoi(argv[optind] + 1);
+                length = (length * 10) + (ch - '0');
                break;
+        case 'a':
+                aflag = 1;
+                break;
+        case 'b':
+                bflag = 1;
+                break;
+        default:
+                usage();
        }
+        lastch = ch;
+        newarg = optind != prevoptind;
+        prevoptind = optind;
 }
 .Ed
diff --git a/src/lib/libc/stdlib/getopt.c b/src/lib/libc/stdlib/getopt.c
deleted file mode 100644
index 63c5e6a479..0000000000
--- a/src/lib/libc/stdlib/getopt.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 1987, 1993, 1994
- *      The Regents of the University of California.  All rights reserved.
- *
- * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
- */
-#if defined(LIBC_SCCS) && !defined(lint)
-/* static char sccsid[] = "from: @(#)getopt.c   8.2 (Berkeley) 4/2/94"; */
-static char *rcsid = "$Id: getopt.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-int     opterr = 1,             /* if error message should be printed */
-        optind = 1,             /* index into parent argv vector */
-        optopt,                 /* character checked for validity */
-        optreset;               /* reset getopt */
-char    *optarg;                /* argument associated with option */
-#define BADCH   (int)'?'
-#define BADARG  (int)':'
-#define EMSG    ""
-/*
- * getopt --
- *      Parse argc/argv argument vector.
- */
-int
-getopt(nargc, nargv, ostr)
-        int nargc;
-        char * const *nargv;
-        const char *ostr;
-{
-        extern char *__progname;
-        static char *place = EMSG;              /* option letter processing */
-        char *oli;                              /* option letter list index */
-        if (optreset || !*place) {              /* update scanning pointer */
-                optreset = 0;
-                if (optind >= nargc || *(place = nargv[optind]) != '-') {
-                        place = EMSG;
-                        return (-1);
-                }
-                if (place[1] && *++place == '-') {      /* found "--" */
-                        ++optind;
-                        place = EMSG;
-                        return (-1);
-                }
-        }                                       /* option letter okay? */
-        if ((optopt = (int)*place++) == (int)':' ||
-            !(oli = strchr(ostr, optopt))) {
-                /*
-                 * if the user didn't specify '-' as an option,
-                 * assume it means -1.
-                 */
-                if (optopt == (int)'-')
-                        return (-1);
-                if (!*place)
-                        ++optind;
-                if (opterr && *ostr != ':')
-                        (void)fprintf(stderr,
-                            "%s: illegal option -- %c\n", __progname, optopt);
-                return (BADCH);
-        }
-        if (*++oli != ':') {                    /* don't need argument */
-                optarg = NULL;
-                if (!*place)
-                        ++optind;
-        }
-        else {                                  /* need an argument */
-                if (*place)                     /* no white space */
-                        optarg = place;
-                else if (nargc <= ++optind) {   /* no arg */
-                        place = EMSG;
-                        if (*ostr == ':')
-                                return (BADARG);
-                        if (opterr)
-                                (void)fprintf(stderr,
-                                    "%s: option requires an argument -- %c\n",
-                                    __progname, optopt);
-                        return (BADCH);
-                }
-                else                            /* white space */
-                        optarg = nargv[optind];
-                place = EMSG;
-                ++optind;
-        }
-        return (optopt);                        /* dump back option letter */
-}
diff --git a/src/lib/libc/stdlib/getopt_long.3 b/src/lib/libc/stdlib/getopt_long.3
new file mode 100644
index 0000000000..bf5ba22ece
--- /dev/null
+++ b/src/lib/libc/stdlib/getopt_long.3
@@ -0,0 +1,459 @@
+.\"     $OpenBSD: getopt_long.3,v 1.12 2005/10/11 01:23:41 jaredy Exp $
+.\"     $NetBSD: getopt_long.3,v 1.11 2002/10/02 10:54:19 wiz Exp $
+.\"
+.\" Copyright (c) 1988, 1991, 1993
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" 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.
+.\"
+.\"     @(#)getopt.3    8.5 (Berkeley) 4/27/95
+.\"
+.Dd April 1, 2000
+.Dt GETOPT_LONG 3
+.Os
+.Sh NAME
+.Nm getopt_long ,
+.Nm getopt_long_only
+.Nd get long options from command line argument list
+.Sh SYNOPSIS
+.Fd #include <getopt.h>
+.Vt extern char *optarg;
+.Vt extern int optind;
+.Vt extern int optopt;
+.Vt extern int opterr;
+.Vt extern int optreset;
+.Ft int
+.Fn getopt_long "int argc" "char * const *argv" "const char *optstring" "const struct option *longopts" "int *longindex"
+.Ft int
+.Fn getopt_long_only "int argc" "char * const *argv" "const char *optstring" "const struct option *longopts" "int *longindex"
+.Sh DESCRIPTION
+The
+.Fn getopt_long
+function is similar to
+.Xr getopt 3
+but it accepts options in two forms: words and characters.
+The
+.Fn getopt_long
+function provides a superset of the functionality of
+.Xr getopt 3 .
+.Fn getopt_long
+can be used in two ways.
+In the first way, every long option understood by the program has a
+corresponding short option, and the option structure is only used to
+translate from long options to short options.
+When used in this fashion,
+.Fn getopt_long
+behaves identically to
+.Xr getopt 3 .
+This is a good way to add long option processing to an existing program
+with the minimum of rewriting.
+.Pp
+In the second mechanism, a long option sets a flag in the
+.Fa option
+structure passed, or will store a pointer to the command line argument
+in the
+.Fa option
+structure passed to it for options that take arguments.
+Additionally, the long option's argument may be specified as a single
+argument with an equal sign, e.g.
+.Bd -literal -offset indent
+$ myprogram --myoption=somevalue
+.Ed
+.Pp
+When a long option is processed, the call to
+.Fn getopt_long
+will return 0.
+For this reason, long option processing without
+shortcuts is not backwards compatible with
+.Xr getopt 3 .
+.Pp
+It is possible to combine these methods, providing for long options
+processing with short option equivalents for some options.
+Less frequently used options would be processed as long options only.
+.Pp
+The
+.Fn getopt_long
+call requires a structure to be initialized describing the long
+options.
+The structure is:
+.Bd -literal -offset indent
+struct option {
+        char *name;
+        int has_arg;
+        int *flag;
+        int val;
+};
+.Ed
+.Pp
+The
+.Fa name
+field should contain the option name without the leading double dash.
+.Pp
+The
+.Fa has_arg
+field should be one of:
+.Pp
+.Bl -tag -width "optional_argument" -compact -offset indent
+.It Dv no_argument
+no argument to the option is expected.
+.It Dv required_argument
+an argument to the option is required.
+.It Dv optional_argument
+an argument to the option may be presented.
+.El
+.Pp
+If
+.Fa flag
+is not
+.Dv NULL ,
+then the integer pointed to by it will be set to the value in the
+.Fa val
+field.
+If the
+.Fa flag
+field is
+.Dv NULL ,
+then the
+.Fa val
+field will be returned.
+Setting
+.Fa flag
+to
+.Dv NULL
+and setting
+.Fa val
+to the corresponding short option will make this function act just
+like
+.Xr getopt 3 .
+.Pp
+If the
+.Fa longindex
+field is not
+.Dv NULL ,
+then the integer pointed to by it will be set to the index of the long
+option relative to
+.Fa longopts .
+.Pp
+The last element of the
+.Fa longopts
+array has to be filled with zeroes.
+.Pp
+The
+.Fn getopt_long_only
+function behaves identically to
+.Fn getopt_long
+with the exception that long options may start with
+.Sq -
+in addition to
+.Sq -- .
+If an option starting with
+.Sq -
+does not match a long option but does match a single-character option,
+the single-character option is returned.
+.Sh RETURN VALUES
+If the
+.Fa flag
+field in
+.Li struct option
+is
+.Dv NULL ,
+.Fn getopt_long
+and
+.Fn getopt_long_only
+return the value specified in the
+.Fa val
+field, which is usually just the corresponding short option.
+If
+.Fa flag
+is not
+.Dv NULL ,
+these functions return 0 and store
+.Fa val
+in the location pointed to by
+.Fa flag .
+These functions return
+.Sq \:
+if there was a missing option argument,
+.Sq \&?
+if the user specified an unknown or ambiguous option, and
+\-1 when the argument list has been exhausted.
+.Sh EXAMPLES
+.Bd -literal -compact
+int bflag, ch, fd;
+int daggerset;
+/* options descriptor */
+static struct option longopts[] = {
+        { "buffy",      no_argument,            NULL,           'b' },
+        { "fluoride",   required_argument,      NULL,           'f' },
+        { "daggerset",  no_argument,            &daggerset,     1 },
+        { NULL,         0,                      NULL,           0 }
+};
+bflag = 0;
+while ((ch = getopt_long(argc, argv, "bf:", longopts, NULL)) != -1)
+        switch (ch) {
+        case 'b':
+                bflag = 1;
+                break;
+        case 'f':
+                if ((fd = open(optarg, O_RDONLY, 0)) == -1)
+                        err(1, "unable to open %s", optarg);
+                break;
+        case 0:
+                if (daggerset)
+                        fprintf(stderr, "Buffy will use her dagger to "
+                            "apply fluoride to dracula's teeth\en");
+                break;
+        default:
+                usage();
+                /* NOTREACHED */
+        }
+argc -= optind;
+argv += optind;
+.Ed
+.Sh IMPLEMENTATION DIFFERENCES
+This section describes differences to the GNU implementation
+found in glibc-2.1.3:
+.Bl -bullet
+.It
+handling of
+.Ql -
+as the first character of the option string in the presence of the
+environment variable
+.Ev POSIXLY_CORRECT :
+.Bl -tag -width "OpenBSD"
+.It GNU
+ignores
+.Ev POSIXLY_CORRECT
+and returns non-options as arguments to option
+.Ql \e1 .
+.It OpenBSD
+honors
+.Ev POSIXLY_CORRECT
+and stops at the first non-option.
+.El
+.It
+handling of
+.Ql -
+within the option string (not the first character):
+.Bl -tag -width "OpenBSD"
+.It GNU
+treats a
+.Ql -
+on the command line as a non-argument.
+.It OpenBSD
+a
+.Ql -
+within the option string matches a
+.Ql -
+(single dash) on the command line.
+This functionality is provided for backward compatibility with
+programs, such as
+.Xr su 1 ,
+that use
+.Ql -
+as an option flag.
+This practice is wrong, and should not be used in any current development.
+.El
+.It
+handling of
+.Ql ::
+in the option string in the presence of
+.Ev POSIXLY_CORRECT :
+.Bl -tag -width "OpenBSD"
+.It Both
+GNU and
+.Ox
+ignore
+.Ev POSIXLY_CORRECT
+here and take
+.Ql ::
+to mean the preceding option takes an optional argument.
+.El
+.It
+return value in case of missing argument if first character
+(after
+.Ql +
+or
+.Ql - )
+in the option string is not
+.Ql \&: :
+.Bl -tag -width "OpenBSD"
+.It GNU
+returns
+.Ql \&?
+.It OpenBSD
+returns
+.Ql \&:
+(since
+.Ox Ns 's
+.Xr getopt 3
+does).
+.El
+.It
+handling of
+.Ql --a
+in
+.Xr getopt 3 :
+.Bl -tag -width "OpenBSD"
+.It GNU
+parses this as option
+.Ql - ,
+option
+.Ql a .
+.It OpenBSD
+parses this as
+.Ql -- ,
+and returns \-1 (ignoring the
+.Ql a )
+(because the original
+.Fn getopt
+did.)
+.El
+.It
+setting of
+.Va optopt
+for long options with
+.Va flag
+.No non- Ns Dv NULL :
+.Bl -tag -width "OpenBSD"
+.It GNU
+sets
+.Va optopt
+to
+.Va val .
+.It OpenBSD
+sets
+.Va optopt
+to 0 (since
+.Va val
+would never be returned).
+.El
+.It
+handling of
+.Ql -W
+with
+.Ql W;
+in the option string in
+.Xr getopt 3
+(not
+.Fn getopt_long ) :
+.Bl -tag -width "OpenBSD"
+.It GNU
+causes a segmentation fault.
+.It OpenBSD
+no special handling is done;
+.Ql W;
+is interpreted as two separate options, neither of which take an argument.
+.El
+.It
+setting of
+.Va optarg
+for long options without an argument that are invoked via
+.Ql -W
+(with
+.Ql W;
+in the option string):
+.Bl -tag -width "OpenBSD"
+.It GNU
+sets
+.Va optarg
+to the option name (the argument of
+.Ql -W ) .
+.It OpenBSD
+sets
+.Va optarg
+to
+.Dv NULL
+(the argument of the long option).
+.El
+.It
+handling of
+.Ql -W
+with an argument that is not (a prefix to) a known long option
+(with
+.Ql W;
+in the option string):
+.Bl -tag -width "OpenBSD"
+.It GNU
+returns
+.Ql -W
+with
+.Va optarg
+set to the unknown option.
+.It OpenBSD
+treats this as an error (unknown option) and returns
+.Ql \&?
+with
+.Va optopt
+set to 0 and
+.Va optarg
+set to
+.Dv NULL
+(as GNU's man page documents).
+.El
+.It
+The error messages are different.
+.It
+.Ox
+does not permute the argument vector at the same points in
+the calling sequence as GNU does.
+The aspects normally used by the caller
+(ordering after \-1 is returned, value of
+.Va optind
+relative to current positions) are the same, though.
+(We do fewer variable swaps.)
+.El
+.Sh ENVIRONMENT
+.Bl -tag -width Ev
+.It Ev POSIXLY_CORRECT
+If set, option processing stops when the first non-option is found and
+a leading
+.Sq -
+or
+.Sq +
+in the
+.Ar optstring
+is ignored.
+.El
+.Sh SEE ALSO
+.Xr getopt 3
+.Sh HISTORY
+The
+.Fn getopt_long
+and
+.Fn getopt_long_only
+functions first appeared in GNU libiberty.
+This implementation first appeared in
+.Ox 3.3 .
+.Sh BUGS
+The
+.Ar argv
+argument is not really
+.Dv const
+as its elements may be permuted (unless
+.Ev POSIXLY_CORRECT
+is set).
diff --git a/src/lib/libc/stdlib/getopt_long.c b/src/lib/libc/stdlib/getopt_long.c
new file mode 100644
index 0000000000..41b6cd9f8d
--- /dev/null
+++ b/src/lib/libc/stdlib/getopt_long.c
@@ -0,0 +1,533 @@
+/*      $OpenBSD: getopt_long.c,v 1.20 2005/10/25 15:49:37 jmc Exp $    */
+/*      $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $      */
+/*
+ * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Dieter Baron and Thomas Klausner.
+ *
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+#include <err.h>
+#include <errno.h>
+#include <getopt.h>
+#include <stdlib.h>
+#include <string.h>
+#define REPLACE_GETOPT          /* use this getopt as the system getopt(3) */
+#ifdef REPLACE_GETOPT
+int     opterr = 1;             /* if error message should be printed */
+int     optind = 1;             /* index into parent argv vector */
+int     optopt = '?';           /* character checked for validity */
+int     optreset;               /* reset getopt */
+char    *optarg;                /* argument associated with option */
+#endif
+#define PRINT_ERROR     ((opterr) && (*options != ':'))
+#define FLAG_PERMUTE    0x01    /* permute non-options to the end of argv */
+#define FLAG_ALLARGS    0x02    /* treat non-options as args to option "-1" */
+#define FLAG_LONGONLY   0x04    /* operate as getopt_long_only */
+/* return values */
+#define BADCH           (int)'?'
+#define BADARG          ((*options == ':') ? (int)':' : (int)'?')
+#define INORDER         (int)1
+#define EMSG            ""
+static int getopt_internal(int, char * const *, const char *,
+                           const struct option *, int *, int);
+static int parse_long_options(char * const *, const char *,
+                              const struct option *, int *, int);
+static int gcd(int, int);
+static void permute_args(int, int, int, char * const *);
+static char *place = EMSG; /* option letter processing */
+/* XXX: set optreset to 1 rather than these two */
+static int nonopt_start = -1; /* first non option argument (for permute) */
+static int nonopt_end = -1;   /* first option after non options (for permute) */
+/* Error messages */
+static const char recargchar[] = "option requires an argument -- %c";
+static const char recargstring[] = "option requires an argument -- %s";
+static const char ambig[] = "ambiguous option -- %.*s";
+static const char noarg[] = "option doesn't take an argument -- %.*s";
+static const char illoptchar[] = "unknown option -- %c";
+static const char illoptstring[] = "unknown option -- %s";
+/*
+ * Compute the greatest common divisor of a and b.
+ */
+static int
+gcd(int a, int b)
+{
+        int c;
+        c = a % b;
+        while (c != 0) {
+                a = b;
+                b = c;
+                c = a % b;
+        }
+        return (b);
+}
+/*
+ * Exchange the block from nonopt_start to nonopt_end with the block
+ * from nonopt_end to opt_end (keeping the same order of arguments
+ * in each block).
+ */
+static void
+permute_args(int panonopt_start, int panonopt_end, int opt_end,
+        char * const *nargv)
+{
+        int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
+        char *swap;
+        /*
+         * compute lengths of blocks and number and size of cycles
+         */
+        nnonopts = panonopt_end - panonopt_start;
+        nopts = opt_end - panonopt_end;
+        ncycle = gcd(nnonopts, nopts);
+        cyclelen = (opt_end - panonopt_start) / ncycle;
+        for (i = 0; i < ncycle; i++) {
+                cstart = panonopt_end+i;
+                pos = cstart;
+                for (j = 0; j < cyclelen; j++) {
+                        if (pos >= panonopt_end)
+                                pos -= nnonopts;
+                        else
+                                pos += nopts;
+                        swap = nargv[pos];
+                        /* LINTED const cast */
+                        ((char **) nargv)[pos] = nargv[cstart];
+                        /* LINTED const cast */
+                        ((char **)nargv)[cstart] = swap;
+                }
+        }
+}
+/*
+ * parse_long_options --
+ *      Parse long options in argc/argv argument vector.
+ * Returns -1 if short_too is set and the option does not match long_options.
+ */
+static int
+parse_long_options(char * const *nargv, const char *options,
+        const struct option *long_options, int *idx, int short_too)
+{
+        char *current_argv, *has_equal;
+        size_t current_argv_len;
+        int i, match;
+        current_argv = place;
+        match = -1;
+        optind++;
+        if ((has_equal = strchr(current_argv, '=')) != NULL) {
+                /* argument found (--option=arg) */
+                current_argv_len = has_equal - current_argv;
+                has_equal++;
+        } else
+                current_argv_len = strlen(current_argv);
+        for (i = 0; long_options[i].name; i++) {
+                /* find matching long option */
+                if (strncmp(current_argv, long_options[i].name,
+                    current_argv_len))
+                        continue;
+                if (strlen(long_options[i].name) == current_argv_len) {
+                        /* exact match */
+                        match = i;
+                        break;
+                }
+                /*
+                 * If this is a known short option, don't allow
+                 * a partial match of a single character.
+                 */
+                if (short_too && current_argv_len == 1)
+                        continue;
+                if (match == -1)        /* partial match */
+                        match = i;
+                else {
+                        /* ambiguous abbreviation */
+                        if (PRINT_ERROR)
+                                warnx(ambig, (int)current_argv_len,
+                                     current_argv);
+                        optopt = 0;
+                        return (BADCH);
+                }
+        }
+        if (match != -1) {              /* option found */
+                if (long_options[match].has_arg == no_argument
+                    && has_equal) {
+                        if (PRINT_ERROR)
+                                warnx(noarg, (int)current_argv_len,
+                                     current_argv);
+                        /*
+                         * XXX: GNU sets optopt to val regardless of flag
+                         */
+                        if (long_options[match].flag == NULL)
+                                optopt = long_options[match].val;
+                        else
+                                optopt = 0;
+                        return (BADARG);
+                }
+                if (long_options[match].has_arg == required_argument ||
+                    long_options[match].has_arg == optional_argument) {
+                        if (has_equal)
+                                optarg = has_equal;
+                        else if (long_options[match].has_arg ==
+                            required_argument) {
+                                /*
+                                 * optional argument doesn't use next nargv
+                                 */
+                                optarg = nargv[optind++];
+                        }
+                }
+                if ((long_options[match].has_arg == required_argument)
+                    && (optarg == NULL)) {
+                        /*
+                         * Missing argument; leading ':' indicates no error
+                         * should be generated.
+                         */
+                        if (PRINT_ERROR)
+                                warnx(recargstring,
+                                    current_argv);
+                        /*
+                         * XXX: GNU sets optopt to val regardless of flag
+                         */
+                        if (long_options[match].flag == NULL)
+                                optopt = long_options[match].val;
+                        else
+                                optopt = 0;
+                        --optind;
+                        return (BADARG);
+                }
+        } else {                        /* unknown option */
+                if (short_too) {
+                        --optind;
+                        return (-1);
+                }
+                if (PRINT_ERROR)
+                        warnx(illoptstring, current_argv);
+                optopt = 0;
+                return (BADCH);
+        }
+        if (idx)
+                *idx = match;
+        if (long_options[match].flag) {
+                *long_options[match].flag = long_options[match].val;
+                return (0);
+        } else
+                return (long_options[match].val);
+}
+/*
+ * getopt_internal --
+ *      Parse argc/argv argument vector.  Called by user level routines.
+ */
+static int
+getopt_internal(int nargc, char * const *nargv, const char *options,
+        const struct option *long_options, int *idx, int flags)
+{
+        char *oli;                              /* option letter list index */
+        int optchar, short_too;
+        static int posixly_correct = -1;
+        if (options == NULL)
+                return (-1);
+        /*
+         * Disable GNU extensions if POSIXLY_CORRECT is set or options
+         * string begins with a '+'.
+         */
+        if (posixly_correct == -1)
+                posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
+        if (posixly_correct || *options == '+')
+                flags &= ~FLAG_PERMUTE;
+        else if (*options == '-')
+                flags |= FLAG_ALLARGS;
+        if (*options == '+' || *options == '-')
+                options++;
+        /*
+         * XXX Some GNU programs (like cvs) set optind to 0 instead of
+         * XXX using optreset.  Work around this braindamage.
+         */
+        if (optind == 0)
+                optind = optreset = 1;
+        optarg = NULL;
+        if (optreset)
+                nonopt_start = nonopt_end = -1;
+start:
+        if (optreset || !*place) {              /* update scanning pointer */
+                optreset = 0;
+                if (optind >= nargc) {          /* end of argument vector */
+                        place = EMSG;
+                        if (nonopt_end != -1) {
+                                /* do permutation, if we have to */
+                                permute_args(nonopt_start, nonopt_end,
+                                    optind, nargv);
+                                optind -= nonopt_end - nonopt_start;
+                        }
+                        else if (nonopt_start != -1) {
+                                /*
+                                 * If we skipped non-options, set optind
+                                 * to the first of them.
+                                 */
+                                optind = nonopt_start;
+                        }
+                        nonopt_start = nonopt_end = -1;
+                        return (-1);
+                }
+                if (*(place = nargv[optind]) != '-' ||
+                    (place[1] == '\0' && strchr(options, '-') == NULL)) {
+                        place = EMSG;           /* found non-option */
+                        if (flags & FLAG_ALLARGS) {
+                                /*
+                                 * GNU extension:
+                                 * return non-option as argument to option 1
+                                 */
+                                optarg = nargv[optind++];
+                                return (INORDER);
+                        }
+                        if (!(flags & FLAG_PERMUTE)) {
+                                /*
+                                 * If no permutation wanted, stop parsing
+                                 * at first non-option.
+                                 */
+                                return (-1);
+                        }
+                        /* do permutation */
+                        if (nonopt_start == -1)
+                                nonopt_start = optind;
+                        else if (nonopt_end != -1) {
+                                permute_args(nonopt_start, nonopt_end,
+                                    optind, nargv);
+                                nonopt_start = optind -
+                                    (nonopt_end - nonopt_start);
+                                nonopt_end = -1;
+                        }
+                        optind++;
+                        /* process next argument */
+                        goto start;
+                }
+                if (nonopt_start != -1 && nonopt_end == -1)
+                        nonopt_end = optind;
+                /*
+                 * If we have "-" do nothing, if "--" we are done.
+                 */
+                if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
+                        optind++;
+                        place = EMSG;
+                        /*
+                         * We found an option (--), so if we skipped
+                         * non-options, we have to permute.
+                         */
+                        if (nonopt_end != -1) {
+                                permute_args(nonopt_start, nonopt_end,
+                                    optind, nargv);
+                                optind -= nonopt_end - nonopt_start;
+                        }
+                        nonopt_start = nonopt_end = -1;
+                        return (-1);
+                }
+        }
+        /*
+         * Check long options if:
+         *  1) we were passed some
+         *  2) the arg is not just "-"
+         *  3) either the arg starts with -- we are getopt_long_only()
+         */
+        if (long_options != NULL && place != nargv[optind] &&
+            (*place == '-' || (flags & FLAG_LONGONLY))) {
+                short_too = 0;
+                if (*place == '-')
+                        place++;                /* --foo long option */
+                else if (*place != ':' && strchr(options, *place) != NULL)
+                        short_too = 1;          /* could be short option too */
+                optchar = parse_long_options(nargv, options, long_options,
+                    idx, short_too);
+                if (optchar != -1) {
+                        place = EMSG;
+                        return (optchar);
+                }
+        }
+        if ((optchar = (int)*place++) == (int)':' ||
+            optchar == (int)'-' && *place != '\0' ||
+            (oli = strchr(options, optchar)) == NULL) {
+                /*
+                 * If the user specified "-" and  '-' isn't listed in
+                 * options, return -1 (non-option) as per POSIX.
+                 * Otherwise, it is an unknown option character (or ':').
+                 */
+                if (optchar == (int)'-' && *place == '\0')
+                        return (-1);
+                if (!*place)
+                        ++optind;
+                if (PRINT_ERROR)
+                        warnx(illoptchar, optchar);
+                optopt = optchar;
+                return (BADCH);
+        }
+        if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
+                /* -W long-option */
+                if (*place)                     /* no space */
+                        /* NOTHING */;
+                else if (++optind >= nargc) {   /* no arg */
+                        place = EMSG;
+                        if (PRINT_ERROR)
+                                warnx(recargchar, optchar);
+                        optopt = optchar;
+                        return (BADARG);
+                } else                          /* white space */
+                        place = nargv[optind];
+                optchar = parse_long_options(nargv, options, long_options,
+                    idx, 0);
+                place = EMSG;
+                return (optchar);
+        }
+        if (*++oli != ':') {                    /* doesn't take argument */
+                if (!*place)
+                        ++optind;
+        } else {                                /* takes (optional) argument */
+                optarg = NULL;
+                if (*place)                     /* no white space */
+                        optarg = place;
+                /* XXX: disable test for :: if PC? (GNU doesn't) */
+                else if (oli[1] != ':') {       /* arg not optional */
+                        if (++optind >= nargc) {        /* no arg */
+                                place = EMSG;
+                                if (PRINT_ERROR)
+                                        warnx(recargchar, optchar);
+                                optopt = optchar;
+                                return (BADARG);
+                        } else
+                                optarg = nargv[optind];
+                } else if (!(flags & FLAG_PERMUTE)) {
+                        /*
+                         * If permutation is disabled, we can accept an
+                         * optional arg separated by whitespace so long
+                         * as it does not start with a dash (-).
+                         */
+                        if (optind + 1 < nargc && *nargv[optind + 1] != '-')
+                                optarg = nargv[++optind];
+                }
+                place = EMSG;
+                ++optind;
+        }
+        /* dump back option letter */
+        return (optchar);
+}
+#ifdef REPLACE_GETOPT
+/*
+ * getopt --
+ *      Parse argc/argv argument vector.
+ *
+ * [eventually this will replace the BSD getopt]
+ */
+int
+getopt(int nargc, char * const *nargv, const char *options)
+{
+        /*
+         * We don't pass FLAG_PERMUTE to getopt_internal() since
+         * the BSD getopt(3) (unlike GNU) has never done this.
+         *
+         * Furthermore, since many privileged programs call getopt()
+         * before dropping privileges it makes sense to keep things
+         * as simple (and bug-free) as possible.
+         */
+        return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
+}
+#endif /* REPLACE_GETOPT */
+/*
+ * getopt_long --
+ *      Parse argc/argv argument vector.
+ */
+int
+getopt_long(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+        return (getopt_internal(nargc, nargv, options, long_options, idx,
+            FLAG_PERMUTE));
+}
+/*
+ * getopt_long_only --
+ *      Parse argc/argv argument vector.
+ */
+int
+getopt_long_only(int nargc, char * const *nargv, const char *options,
+    const struct option *long_options, int *idx)
+{
+        return (getopt_internal(nargc, nargv, options, long_options, idx,
+            FLAG_PERMUTE|FLAG_LONGONLY));
+}
diff --git a/src/lib/libc/stdlib/getsubopt.3 b/src/lib/libc/stdlib/getsubopt.3
new file mode 100644
index 0000000000..6a7c28ff4d
--- /dev/null
+++ b/src/lib/libc/stdlib/getsubopt.3
@@ -0,0 +1,145 @@
+.\" $OpenBSD: getsubopt.3,v 1.11 2005/10/11 01:23:41 jaredy Exp $
+.\"
+.\" Copyright (c) 1990, 1991, 1993
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" 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.
+.\"
+.\"     @(#)getsubopt.3 8.1 (Berkeley) 6/9/93
+.\"
+.Dd June 9, 1993
+.Dt GETSUBOPT 3
+.Os
+.Sh NAME
+.Nm getsubopt
+.Nd get sub options from an argument
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Vt extern char *suboptarg;
+.Ft int
+.Fn getsubopt "char **optionp" "char * const *tokens" "char **valuep"
+.Sh DESCRIPTION
+The
+.Fn getsubopt
+function parses a string containing tokens delimited by one or more
+tab, space, or comma
+.Pq Ql \&,
+characters.
+It is intended for use in parsing groups of option arguments provided
+as part of a utility command line.
+.Pp
+The argument
+.Fa optionp
+is a pointer to a pointer to the string.
+The argument
+.Fa tokens
+is a pointer to a null-terminated array of pointers to strings.
+.Pp
+The
+.Fn getsubopt
+function returns the zero-based offset of the pointer in the
+.Fa tokens
+array referencing a string which matches the first token
+in the string, or \-1 if the string contains no tokens or
+.Fa tokens
+does not contain a matching string.
+.Pp
+If the token is of the form
+.Ar name Ns = Ns Ar value ,
+the location referenced by
+.Fa valuep
+will be set to point to the start of the
+.Dq value
+portion of the token.
+.Pp
+On return from
+.Fn getsubopt ,
+.Fa optionp
+will be set to point to the start of the next token in the string,
+or the NUL at the end of the string if no more tokens are present.
+The external variable
+.Fa suboptarg
+will be set to point to the start of the current token, or
+.Dv NULL
+if no tokens were present.
+The argument
+.Fa valuep
+will be set to point to the value portion of the token, or
+.Dv NULL
+if no value portion was present.
+.Sh EXAMPLES
+.Bd -literal
+char *tokens[] = {
+        #define ONE     0
+                "one",
+        #define TWO     1
+                "two",
+        NULL
+};
+\&...
+extern char *optarg, *suboptarg;
+char *options, *value;
+while ((ch = getopt(argc, argv, "ab:")) != -1) {
+        switch (ch) {
+        case 'a':
+                /* process ``a'' option */
+                break;
+        case 'b':
+                options = optarg;
+                while (*options) {
+                        switch (getsubopt(&options, tokens, &value)) {
+                        case ONE:
+                                /* process ``one'' sub option */
+                                break;
+                        case TWO:
+                                /* process ``two'' sub option */
+                                if (!value)
+                                        error("no value for two");
+                                i = atoi(value);
+                                break;
+                        case -1:
+                                if (suboptarg)
+                                        error("illegal sub option %s",
+                                          suboptarg);
+                                else
+                                        error("missing sub option");
+                                break;
+                        }
+                }
+                break;
+        }
+}
+.Ed
+.Sh SEE ALSO
+.Xr getopt 3 ,
+.Xr strsep 3
+.Sh HISTORY
+The
+.Fn getsubopt
+function first appeared in
+.Bx 4.4 .
diff --git a/src/lib/libc/stdlib/getsubopt.c b/src/lib/libc/stdlib/getsubopt.c
new file mode 100644
index 0000000000..735c85ba8a
--- /dev/null
+++ b/src/lib/libc/stdlib/getsubopt.c
@@ -0,0 +1,92 @@
+/*      $OpenBSD: getsubopt.c,v 1.4 2005/08/08 08:05:36 espie Exp $     */
+/*-
+ * Copyright (c) 1990, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * 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.
+ */
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+/*
+ * The SVID interface to getsubopt provides no way of figuring out which
+ * part of the suboptions list wasn't matched.  This makes error messages
+ * tricky...  The extern variable suboptarg is a pointer to the token
+ * which didn't match.
+ */
+char *suboptarg;
+int
+getsubopt(char **optionp, char * const *tokens, char **valuep)
+{
+        int cnt;
+        char *p;
+        suboptarg = *valuep = NULL;
+        if (!optionp || !*optionp)
+                return(-1);
+        /* skip leading white-space, commas */
+        for (p = *optionp; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
+        if (!*p) {
+                *optionp = p;
+                return(-1);
+        }
+        /* save the start of the token, and skip the rest of the token. */
+        for (suboptarg = p;
+            *++p && *p != ',' && *p != '=' && *p != ' ' && *p != '\t';);
+        if (*p) {
+                /*
+                 * If there's an equals sign, set the value pointer, and
+                 * skip over the value part of the token.  Terminate the
+                 * token.
+                 */
+                if (*p == '=') {
+                        *p = '\0';
+                        for (*valuep = ++p;
+                            *p && *p != ',' && *p != ' ' && *p != '\t'; ++p);
+                        if (*p) 
+                                *p++ = '\0';
+                } else
+                        *p++ = '\0';
+                /* Skip any whitespace or commas after this token. */
+                for (; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
+        }
+        /* set optionp for next round. */
+        *optionp = p;
+        for (cnt = 0; *tokens; ++tokens, ++cnt)
+                if (!strcmp(suboptarg, *tokens))
+                        return(cnt);
+        return(-1);
+}
diff --git a/src/lib/libc/stdlib/hcreate.3 b/src/lib/libc/stdlib/hcreate.3
new file mode 100644
index 0000000000..66b1dd126d
--- /dev/null
+++ b/src/lib/libc/stdlib/hcreate.3
@@ -0,0 +1,191 @@
+.\"     $OpenBSD: hcreate.3,v 1.3 2006/01/30 19:50:41 jmc Exp $
+.\"     $NetBSD: hcreate.3,v 1.6 2003/04/16 13:34:46 wiz Exp $
+.\"
+.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Klaus Klein.
+.\"
+.\" 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. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"        This product includes software developed by the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+.\"
+.Dd February 13, 2001
+.Dt HCREATE 3
+.Os
+.Sh NAME
+.Nm hcreate ,
+.Nm hdestroy ,
+.Nm hsearch
+.Nd manage hash search table
+.Sh SYNOPSIS
+.In search.h
+.Ft int
+.Fn hcreate "size_t nel"
+.Ft void
+.Fn hdestroy "void"
+.Ft ENTRY *
+.Fn hsearch "ENTRY item" "ACTION action"
+.Sh DESCRIPTION
+The
+.Fn hcreate ,
+.Fn hdestroy ,
+and
+.Fn hsearch
+functions manage hash search tables.
+.Pp
+The
+.Fn hcreate
+function allocates and initializes the table.
+The
+.Fa nel
+argument specifies an estimate of the maximum number of entries to be held
+by the table.
+Unless further memory allocation fails, supplying an insufficient
+.Fa nel
+value will not result in functional harm, although a performance degradation
+may occur.
+Initialization using the
+.Fn hcreate
+function is mandatory prior to any access operations using
+.Fn hsearch .
+.Pp
+The
+.Fn hdestroy
+function destroys a table previously created using
+.Fn hcreate .
+After a call to
+.Fn hdestroy ,
+the data can no longer be accessed.
+.Pp
+The
+.Fn hsearch
+function is used to search to the hash table.
+It returns a pointer into the
+hash table indicating the address of an item.
+The
+.Fa item
+argument is of type
+.Dv ENTRY ,
+a structural type which contains the following members:
+.Pp
+.Bl -tag -compact -offset indent -width voidX*dataXX
+.It Fa char *key
+comparison key.
+.It Fa void *data
+pointer to data associated with
+.Fa key .
+.El
+.Pp
+The key comparison function used by
+.Fn hsearch
+is
+.Xr strcmp 3 .
+.Pp
+The
+.Fa action
+argument is of type
+.Dv ACTION ,
+an enumeration type which defines the following values:
+.Bl -tag -offset indent -width ENTERXX
+.It Dv ENTER
+Insert
+.Fa item
+into the hash table.
+If an existing item with the same key is found, it is not replaced.
+Note that the
+.Fa key
+and
+.Fa data
+elements of
+.Fa item
+are used directly by the new table entry.
+The storage for the
+key must not be modified during the lifetime of the hash table.
+.It Dv FIND
+Search the hash table without inserting
+.Fa item .
+.El
+.Sh RETURN VALUES
+If successful, the
+.Fn hcreate
+function returns a non-zero value.
+Otherwise, a value of 0 is returned and
+.Va errno
+is set to indicate the error.
+.Pp
+The
+.Fn hdestroy
+functions
+returns no value.
+.Pp
+If successful, the
+.Fn hsearch
+function returns a pointer to a hash table entry matching
+the provided key.
+If the action is
+.Dv FIND
+and the item was not found, or if the action is
+.Dv ENTER
+and the insertion failed,
+.Dv NULL
+is returned and
+.Va errno
+is set to indicate the error.
+If the action is
+.Dv ENTER
+and an entry already existed in the table matching the given
+key, the existing entry is returned and is not replaced.
+.Sh ERRORS
+The
+.Fn hcreate
+and
+.Fn hsearch
+functions will fail if:
+.Bl -tag -width Er
+.It Bq Er ENOMEM
+Insufficient memory is available.
+.El
+.Sh SEE ALSO
+.Xr bsearch 3 ,
+.Xr lsearch 3 ,
+.Xr malloc 3 ,
+.Xr strcmp 3
+.Sh STANDARDS
+These functions conform to
+.St -p1003.1-2004 .
+.Sh HISTORY
+The
+.Fn hcreate ,
+.Fn hdestroy
+and
+.Fn hsearch
+functions first appeared in
+.At V .
+.Sh BUGS
+The interface permits the use of only one hash table at a time.
diff --git a/src/lib/libc/stdlib/hcreate.c b/src/lib/libc/stdlib/hcreate.c
new file mode 100644
index 0000000000..f8df1bcd7c
--- /dev/null
+++ b/src/lib/libc/stdlib/hcreate.c
@@ -0,0 +1,191 @@
+/*      $OpenBSD: hcreate.c,v 1.3 2005/10/10 17:37:44 espie Exp $       */
+/*      $NetBSD: hcreate.c,v 1.5 2004/04/23 02:48:12 simonb Exp $       */
+/*
+ * Copyright (c) 2001 Christopher G. Demetriou
+ * All rights reserved.
+ * 
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *          This product includes software developed for the
+ *          NetBSD Project.  See http://www.NetBSD.org/ for
+ *          information about NetBSD.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ * 
+ * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
+ */
+/*
+ * hcreate() / hsearch() / hdestroy()
+ *
+ * SysV/XPG4 hash table functions.
+ *
+ * Implementation done based on NetBSD manual page and Solaris manual page,
+ * plus my own personal experience about how they're supposed to work.
+ *
+ * I tried to look at Knuth (as cited by the Solaris manual page), but
+ * nobody had a copy in the office, so...
+ */
+#include "namespace.h"
+#include <assert.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <search.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/queue.h>
+#ifndef _DIAGASSERT
+#define _DIAGASSERT(x)
+#endif
+/*
+ * DO NOT MAKE THIS STRUCTURE LARGER THAN 32 BYTES (4 ptrs on 64-bit
+ * ptr machine) without adjusting MAX_BUCKETS_LG2 below.
+ */
+struct internal_entry {
+        SLIST_ENTRY(internal_entry) link;
+        ENTRY ent;
+};
+SLIST_HEAD(internal_head, internal_entry);
+#define MIN_BUCKETS_LG2 4
+#define MIN_BUCKETS     (1 << MIN_BUCKETS_LG2)
+/*
+ * max * sizeof internal_entry must fit into size_t.
+ * assumes internal_entry is <= 32 (2^5) bytes.
+ */
+#define MAX_BUCKETS_LG2 (sizeof (size_t) * 8 - 1 - 5)
+#define MAX_BUCKETS     ((size_t)1 << MAX_BUCKETS_LG2)
+/* Default hash function, from db/hash/hash_func.c */
+extern u_int32_t (*__default_hash)(const void *, size_t);
+static struct internal_head *htable;
+static size_t htablesize;
+int
+hcreate(size_t nel)
+{
+        size_t idx;
+        unsigned int p2;
+        /* Make sure this isn't called when a table already exists. */
+        _DIAGASSERT(htable == NULL);
+        if (htable != NULL) {
+                errno = EINVAL;
+                return 0;
+        }
+        /* If nel is too small, make it min sized. */
+        if (nel < MIN_BUCKETS)
+                nel = MIN_BUCKETS;
+        /* If it's too large, cap it. */
+        if (nel > MAX_BUCKETS)
+                nel = MAX_BUCKETS;
+        /* If it's is not a power of two in size, round up. */
+        if ((nel & (nel - 1)) != 0) {
+                for (p2 = 0; nel != 0; p2++)
+                        nel >>= 1;
+                _DIAGASSERT(p2 <= MAX_BUCKETS_LG2);
+                nel = 1 << p2;
+        }
+        
+        /* Allocate the table. */
+        htablesize = nel;
+        htable = malloc(htablesize * sizeof htable[0]);
+        if (htable == NULL) {
+                errno = ENOMEM;
+                return 0;
+        }
+        /* Initialize it. */
+        for (idx = 0; idx < htablesize; idx++)
+                SLIST_INIT(&htable[idx]);
+        return 1;
+}
+void
+hdestroy(void)
+{
+        struct internal_entry *ie;
+        size_t idx;
+        _DIAGASSERT(htable != NULL);
+        if (htable == NULL)
+                return;
+        for (idx = 0; idx < htablesize; idx++) {
+                while (!SLIST_EMPTY(&htable[idx])) {
+                        ie = SLIST_FIRST(&htable[idx]);
+                        SLIST_REMOVE_HEAD(&htable[idx], link);
+                        free(ie->ent.key);
+                        free(ie);
+                }
+        }
+        free(htable);
+        htable = NULL;
+}
+ENTRY *
+hsearch(ENTRY item, ACTION action)
+{
+        struct internal_head *head;
+        struct internal_entry *ie;
+        uint32_t hashval;
+        size_t len;
+        _DIAGASSERT(htable != NULL);
+        _DIAGASSERT(item.key != NULL);
+        _DIAGASSERT(action == ENTER || action == FIND);
+        len = strlen(item.key);
+        hashval = (*__default_hash)(item.key, len);
+        head = &htable[hashval & (htablesize - 1)];
+        ie = SLIST_FIRST(head);
+        while (ie != NULL) {
+                if (strcmp(ie->ent.key, item.key) == 0)
+                        break;
+                ie = SLIST_NEXT(ie, link);
+        }
+        if (ie != NULL)
+                return &ie->ent;
+        else if (action == FIND)
+                return NULL;
+        ie = malloc(sizeof *ie);
+        if (ie == NULL)
+                return NULL;
+        ie->ent.key = item.key;
+        ie->ent.data = item.data;
+        SLIST_INSERT_HEAD(head, ie, link);
+        return &ie->ent;
+}
diff --git a/src/lib/libc/stdlib/heapsort.c b/src/lib/libc/stdlib/heapsort.c
index bd998fa357..e6fb61ba2f 100644
--- a/src/lib/libc/stdlib/heapsort.c
+++ b/src/lib/libc/stdlib/heapsort.c
@@ -13,11 +13,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -34,11 +30,6 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char sccsid[] = "from: @(#)heapsort.c  8.1 (Berkeley) 6/4/93";*/
-static char *rcsid = "$Id: heapsort.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/types.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -73,7 +64,7 @@ static char *rcsid = "$Id: heapsort.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp
 * Build the list into a heap, where a heap is defined such that for
 * the records K1 ... KN, Kj/2 >= Kj for 1 <= j/2 <= j <= N.
 *
- * There two cases.  If j == nmemb, select largest of Ki and Kj.  If
+ * There are two cases.  If j == nmemb, select largest of Ki and Kj.  If
 * j < nmemb, select largest of Ki, Kj and Kj+1.
 */
 #define CREATE(initval, nmemb, par_i, child_i, par, child, size, count, tmp) { \
@@ -95,12 +86,12 @@ static char *rcsid = "$Id: heapsort.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp
 * Select the top of the heap and 'heapify'.  Since by far the most expensive
 * action is the call to the compar function, a considerable optimization
 * in the average case can be achieved due to the fact that k, the displaced
- * elememt, is ususally quite small, so it would be preferable to first
+ * element, is usually quite small, so it would be preferable to first
 * heapify, always maintaining the invariant that the larger child is copied
 * over its parent's record.
 *
 * Then, starting from the *bottom* of the heap, finding k's correct place,
- * again maintianing the invariant.  As a result of the invariant no element
+ * again maintaining the invariant.  As a result of the invariant no element
 * is 'lost' when k is assigned its correct place in the heap.
 *
 * The time savings from this optimization are on the order of 15-20% for the
@@ -139,13 +130,11 @@ static char *rcsid = "$Id: heapsort.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp
 * only advantage over quicksort is that it requires little additional memory.
 */
 int
-heapsort(vbase, nmemb, size, compar)
+heapsort(void *vbase, size_t nmemb, size_t size,
-        void *vbase;
+    int (*compar)(const void *, const void *))
-        size_t nmemb, size;
-        int (*compar) __P((const void *, const void *));
 {
-        register int cnt, i, j, l;
+        int cnt, i, j, l;
-        register char tmp, *tmp1, *tmp2;
+        char tmp, *tmp1, *tmp2;
        char *base, *k, *p, *t;
        if (nmemb <= 1)
diff --git a/src/lib/libc/stdlib/free.3 b/src/lib/libc/stdlib/imaxabs.3
index 3d0131d7de..5384d0c9a6 100644
--- a/src/lib/libc/stdlib/free.3
+++ b/src/lib/libc/stdlib/imaxabs.3
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
+.\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,50 +29,38 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)free.3        5.2 (Berkeley) 6/29/91
+.\"     $OpenBSD: imaxabs.3,v 1.1 2006/01/13 17:58:09 millert Exp $
-.\"     $Id: free.3,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd January 6, 2005
-.Dt FREE 3
+.Dt IMAXABS 3
 .Os
 .Sh NAME
-.Nm free
+.Nm imaxabs
-.Nd free up memory allocated with malloc, calloc or realloc
+.Nd integer absolute value function
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.Fd #include <inttypes.h>
-.Ft void
+.Ft int
-.Fn free "void *ptr"
+.Fn imaxabs "int j"
 .Sh DESCRIPTION
 The
-.Fn free
+.Fn imaxabs
-function causes the space pointed to by
+function computes the absolute value of the intmax_t variable
-.Fa ptr
+.Fa j .
-to be deallocated, that is, made available
-for further allocation.
-If
-.Fa ptr
-is a null pointer, no action occurs.
-Otherwise, if the argument does not match a pointer earlier
-returned by the
-.Xr calloc ,
-.Xr malloc ,
-or
-.Xr realloc
-function, or if the space has been deallocated by a call to
-.Fn free
-or
-.Xr realloc ,
-general havoc may occur.
 .Sh RETURN VALUES
 The
-.Fn free
+.Fn imaxabs
-function returns no value.
+function returns the absolute value.
 .Sh SEE ALSO
-.Xr calloc 3 ,
+.Xr abs 3 ,
-.Xr malloc 3 ,
+.Xr cabs 3 ,
-.Xr realloc 3
+.Xr floor 3 ,
+.Xr hypot 3 ,
+.Xr labs 3 ,
+.Xr math 3
 .Sh STANDARDS
 The
-.Fn free
+.Fn abs
 function conforms to
-.St -ansiC .
+.St -ansiC-99 .
+.Sh BUGS
+The absolute value of the most negative integer remains negative.
diff --git a/src/lib/libc/stdlib/imaxabs.c b/src/lib/libc/stdlib/imaxabs.c
new file mode 100644
index 0000000000..b7e910eefd
--- /dev/null
+++ b/src/lib/libc/stdlib/imaxabs.c
@@ -0,0 +1,38 @@
+/*      $OpenBSD: imaxabs.c,v 1.1 2006/01/13 17:58:09 millert Exp $     */
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.
+ */
+#include <inttypes.h>
+intmax_t
+imaxabs(intmax_t j)
+{
+        return (j < 0 ? -j : j);
+}
diff --git a/src/lib/libc/stdlib/imaxdiv.3 b/src/lib/libc/stdlib/imaxdiv.3
new file mode 100644
index 0000000000..63f25d52de
--- /dev/null
+++ b/src/lib/libc/stdlib/imaxdiv.3
@@ -0,0 +1,67 @@
+.\" Copyright (c) 1990, 1991 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.
+.\"
+.\"     $OpenBSD: imaxdiv.3,v 1.2 2006/01/14 13:04:53 jmc Exp $
+.\"
+.Dd January 3, 2006
+.Dt IMAXDIV 3
+.Os
+.Sh NAME
+.Nm imaxdiv
+.Nd return quotient and remainder from division
+.Sh SYNOPSIS
+.Fd #include <inttypes.h>
+.Ft imaxdiv_t
+.Fn imaxdiv "intmax_t num" "intmax_t denom"
+.Sh DESCRIPTION
+The
+.Fn imaxdiv
+function computes the value
+.Fa num Ns / Ns Fa denom
+and returns the quotient and remainder in a structure named
+.Li imaxdiv_t
+that contains two
+.Li intmax_t
+members named
+.Fa quot
+and
+.Fa rem .
+.Sh SEE ALSO
+.Xr div 3 ,
+.Xr ldiv 3 ,
+.Xr lldiv 3 ,
+.Xr math 3 ,
+.Xr qdiv 3
+.Sh STANDARDS
+The
+.Fn imaxdiv
+function conforms to
+.St -ansiC-99 .
diff --git a/src/lib/libc/stdlib/imaxdiv.c b/src/lib/libc/stdlib/imaxdiv.c
new file mode 100644
index 0000000000..0515a94b96
--- /dev/null
+++ b/src/lib/libc/stdlib/imaxdiv.c
@@ -0,0 +1,50 @@
+/*      $OpenBSD: imaxdiv.c,v 1.1 2006/01/13 17:58:09 millert Exp $     */
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * 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.
+ */
+#include <inttypes.h>           /* imaxdiv_t */
+imaxdiv_t
+imaxdiv(intmax_t num, intmax_t denom)
+{
+        imaxdiv_t r;
+        /* see div.c for comments */
+        r.quot = num / denom;
+        r.rem = num % denom;
+        if (num >= 0 && r.rem < 0) {
+                r.quot++;
+                r.rem -= denom;
+        }
+        return (r);
+}
diff --git a/src/lib/libc/stdlib/insque.3 b/src/lib/libc/stdlib/insque.3
new file mode 100644
index 0000000000..fb4f55112d
--- /dev/null
+++ b/src/lib/libc/stdlib/insque.3
@@ -0,0 +1,106 @@
+.\"     $OpenBSD: insque.3,v 1.6 2005/07/26 04:20:23 jaredy Exp $
+.\" Copyright (c) 1993 John Brezak
+.\" All rights reserved.
+.\"
+.\" 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. The name of the author may be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR `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 AUTHOR 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.
+.\"
+.\"
+.Dd August 12, 1993
+.Dt INSQUE 3
+.Os
+.Sh NAME
+.Nm insque ,
+.Nm remque
+.Nd insert/remove element from a queue
+.Sh SYNOPSIS
+.Fd #include <search.h>
+.Ft void
+.Fn insque "void *elem" "void *pred"
+.Ft void
+.Fn remque "void *elem"
+.Sh DESCRIPTION
+.Bf -symbolic
+These interfaces have been superceded by the
+.Xr queue 3
+macros and are provided for compatibility with legacy code.
+.Ef
+.Pp
+.Fn insque
+and
+.Fn remque
+manipulate queues built from doubly linked lists.
+The queue can be either circular or linear.
+Each element in the queue must be of the following form:
+.Bd -literal -offset indent
+struct qelem {
+        struct qelem   *q_forw;
+        struct qelem   *q_back;
+        char            q_data[];
+};
+.Ed
+.Pp
+The first two elements in the struct must be pointers of the
+same type that point to the previous and next elements in
+the queue respectively.
+Any subsequent data in the struct is application-dependent.
+.Pp
+The
+.Fn insque
+function inserts
+.Fa elem
+into a queue immediately after
+.Fa pred .
+.Pp
+The
+.Fn remque
+function removes
+.Fa elem
+from the queue.
+.Pp
+These functions are not atomic unless that machine architecture allows it.
+.Sh SEE ALSO
+.Xr queue 3
+.Sh STANDARDS
+The
+.Fn insque
+and
+.Fn remque
+functions conform to the
+.St -p1003.1-2001
+and
+.St -xpg4.3
+specifications.
+.Sh HISTORY
+The
+.Fn insque
+and
+.Fn remque
+functions are derived from the
+.Li insque
+and
+.Li remque
+instructions on the
+.Tn VAX .
+They first appeared in
+.Bx 4.2 .
diff --git a/src/lib/libc/stdlib/insque.c b/src/lib/libc/stdlib/insque.c
new file mode 100644
index 0000000000..8724efec74
--- /dev/null
+++ b/src/lib/libc/stdlib/insque.c
@@ -0,0 +1,48 @@
+/*      $OpenBSD: insque.c,v 1.2 2005/08/08 08:05:36 espie Exp $        */
+/*
+ *  Copyright (c) 1993 John Brezak
+ *  All rights reserved.
+ * 
+ *  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. The name of the author may be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `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 AUTHOR 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.
+ */
+#include <search.h>
+struct qelem {
+        struct qelem *q_forw;
+        struct qelem *q_back;
+};
+void
+insque(void *entry, void *pred)
+{
+        struct qelem *e = (struct qelem *) entry;
+        struct qelem *p = (struct qelem *) pred;
+        e->q_forw = p->q_forw;
+        e->q_back = p;
+        p->q_forw->q_back = e;
+        p->q_forw = e;
+}
diff --git a/src/lib/libc/stdlib/jrand48.c b/src/lib/libc/stdlib/jrand48.c
index 205781e0ee..cb8c592750 100644
--- a/src/lib/libc/stdlib/jrand48.c
+++ b/src/lib/libc/stdlib/jrand48.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: jrand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1993 Martin Birgmeier
 * All rights reserved.
diff --git a/src/lib/libc/stdlib/l64a.c b/src/lib/libc/stdlib/l64a.c
index 3069b31bf6..4f33df37b2 100644
--- a/src/lib/libc/stdlib/l64a.c
+++ b/src/lib/libc/stdlib/l64a.c
@@ -1,25 +1,24 @@
+/*      $OpenBSD: l64a.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Written by J.T. Conklin <jtc@netbsd.org>.
 * Public domain.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
+#include <errno.h>
-static char *rcsid = "$NetBSD: l64a.c,v 1.4 1995/05/11 23:04:52 jtc Exp $";
-#endif
 #include <stdlib.h>
 char *
-l64a (value)
+l64a(long value)
-        long value;
 {
        static char buf[8];
        char *s = buf;
        int digit;
        int i;
-        if (!value) 
+        if (value < 0) {
-                return NULL;
+                errno = EINVAL;
+                return(NULL);
+        }
        for (i = 0; value != 0 && i < 6; i++) {
                digit = value & 0x3f;
@@ -39,5 +38,5 @@ l64a (value)
        *s = '\0';
-        return buf;
+        return(buf);
 }
diff --git a/src/lib/libc/stdlib/labs.3 b/src/lib/libc/stdlib/labs.3
index 28e4d2053c..ab1ccaaf53 100644
--- a/src/lib/libc/stdlib/labs.3
+++ b/src/lib/libc/stdlib/labs.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,35 +29,41 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)labs.3        5.3 (Berkeley) 6/29/91
+.\"     $OpenBSD: labs.3,v 1.8 2006/01/13 17:58:09 millert Exp $
-.\"     $Id: labs.3,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd May 14, 2003
 .Dt LABS 3
 .Os
 .Sh NAME
-.Nm labs
+.Nm labs, llabs
 .Nd return the absolute value of a long integer
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
 .Ft long
-.Fn labs "long j"
+.Fn labs "long i"
+.Ft long long
+.Fn llabs "long long j"
 .Sh DESCRIPTION
 The
 .Fn labs
-function
+function returns the absolute value of the long integer
-returns the absolute value of the long integer
+.Fa i .
-.Ar j .
+The
+.Fn llabs
+function returns the absolute value of the long long integer
+.Fa j .
 .Sh SEE ALSO
 .Xr abs 3 ,
-.Xr floor 3 ,
 .Xr cabs 3 ,
+.Xr floor 3 ,
+.Xr imaxabs 3 ,
 .Xr math 3
 .Sh STANDARDS
 The
 .Fn labs
-function
+and
-conforms to
+.Fn llabs
-.St -ansiC .
+functions conform to
+.St -ansiC-99 .
 .Sh BUGS
 The absolute value of the most negative integer remains negative.
diff --git a/src/lib/libc/stdlib/labs.c b/src/lib/libc/stdlib/labs.c
index ccf1415792..ca60b9aba2 100644
--- a/src/lib/libc/stdlib/labs.c
+++ b/src/lib/libc/stdlib/labs.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: labs.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
 /*-
 * Copyright (c) 1990 The Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,16 +28,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)labs.c       5.2 (Berkeley) 5/17/90";*/
-static char *rcsid = "$Id: labs.c,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 long
-labs(j)
+labs(long j)
-        long j;
 {
        return(j < 0 ? -j : j);
 }
diff --git a/src/lib/libc/stdlib/lcong48.c b/src/lib/libc/stdlib/lcong48.c
index 965d46b17a..2cf5c271ba 100644
--- a/src/lib/libc/stdlib/lcong48.c
+++ b/src/lib/libc/stdlib/lcong48.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: lcong48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1993 Martin Birgmeier
 * All rights reserved.
diff --git a/src/lib/libc/stdlib/ldiv.3 b/src/lib/libc/stdlib/ldiv.3
index a7b5ccf878..951a5807e0 100644
--- a/src/lib/libc/stdlib/ldiv.3
+++ b/src/lib/libc/stdlib/ldiv.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)ldiv.3        5.3 (Berkeley) 6/29/91
+.\"     $OpenBSD: ldiv.3,v 1.8 2006/01/13 17:58:09 millert Exp $
-.\"     $Id: ldiv.3,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt LDIV 3
@@ -49,24 +44,24 @@
 .Sh DESCRIPTION
 The
 .Fn ldiv
-function
+function computes the value
-computes the value
+.Fa num Ns / Ns Fa denom
-.Ar num/denom
 and returns the quotient and remainder in a structure named
-.Ar ldiv_t
+.Li ldiv_t
 that contains two
-.Em long integer
+.Li long integer
 members named
-.Ar quot
+.Fa quot
 and
-.Ar rem .
+.Fa rem .
 .Sh SEE ALSO
 .Xr div 3 ,
-.Xr qdiv 3 ,
+.Xr imaxdiv 3 ,
-.Xr math 3
+.Xr lldiv 3 ,
+.Xr math 3 ,
+.Xr qdiv 3
 .Sh STANDARDS
 The
 .Fn ldiv
-function
+function conforms to
-conforms to
 .St -ansiC .
diff --git a/src/lib/libc/stdlib/ldiv.c b/src/lib/libc/stdlib/ldiv.c
index f7074507e5..775065f525 100644
--- a/src/lib/libc/stdlib/ldiv.c
+++ b/src/lib/libc/stdlib/ldiv.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: ldiv.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1990 Regents of the University of California.
 * All rights reserved.
@@ -13,11 +14,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -34,16 +31,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)ldiv.c       5.2 (Berkeley) 4/16/91";*/
-static char *rcsid = "$Id: ldiv.c,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>             /* ldiv_t */
 ldiv_t
-ldiv(num, denom)
+ldiv(long num, long denom)
-        long num, denom;
 {
        ldiv_t r;
diff --git a/src/lib/libc/stdlib/multibyte.c b/src/lib/libc/stdlib/llabs.c
index fe1cd5781b..0a0ff784af 100644
--- a/src/lib/libc/stdlib/multibyte.c
+++ b/src/lib/libc/stdlib/llabs.c
@@ -1,5 +1,7 @@
-/*
+/*      $OpenBSD: llabs.c,v 1.2 2005/08/08 08:05:36 espie Exp $ */
- * Copyright (c) 1991 The Regents of the University of California.
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -31,101 +33,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)multibyte.c  5.1 (Berkeley) 2/18/91";*/
-static char *rcsid = "$Id: multibyte.c,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
-/*
+long long
- * Stub multibyte character functions.
+llabs(long long j)
- * This cheezy implementation is fixed to the native single-byte
- * character set.
- */
-int
-mblen(s, n)
-        const char *s;
-        size_t n;
 {
-        if (s == NULL || *s == '\0')
+        return (j < 0 ? -j : j);
-                return 0;
-        if (n == 0)
-                return -1;
-        return 1;
-}
-/*ARGSUSED*/
-int
-mbtowc(pwc, s, n)
-        wchar_t *pwc;
-        const char *s;
-        size_t n;
-{
-        if (s == NULL)
-                return 0;
-        if (n == 0)
-                return -1;
-        if (pwc)
-                *pwc = (wchar_t) *s;
-        return (*s != '\0');
-}
-/*ARGSUSED*/
-int
-#ifdef __STDC__
-wctomb(char *s, wchar_t wchar)
-#else
-wctomb(s, wchar)
-        char *s;
-        wchar_t wchar;
-#endif
-{
-        if (s == NULL)
-                return 0;
-        *s = (char) wchar;
-        return 1;
 }
-/*ARGSUSED*/
-size_t
-mbstowcs(pwcs, s, n)
-        wchar_t *pwcs;
-        const char *s;
-        size_t n;
-{
-        int count = 0;
-        if (n != 0) {
-                do {
-                        if ((*pwcs++ = (wchar_t) *s++) == 0)
-                                break;
-                        count++;
-                } while (--n != 0);
-        }
-        
-        return count;
-}
-/*ARGSUSED*/
-size_t
-wcstombs(s, pwcs, n)
-        char *s;
-        const wchar_t *pwcs;
-        size_t n;
-{
-        int count = 0;
-        if (n != 0) {
-                do {
-                        if ((*s++ = (char) *pwcs++) == 0)
-                                break;
-                        count++;
-                } while (--n != 0);
-        }
-        return count;
-}
diff --git a/src/lib/libc/stdlib/memory.3 b/src/lib/libc/stdlib/lldiv.3
index 735252c837..53bb3d35ae 100644
--- a/src/lib/libc/stdlib/memory.3
+++ b/src/lib/libc/stdlib/lldiv.3
@@ -1,6 +1,10 @@
-.\" Copyright (c) 1991 Regents of the University of California.
+.\" Copyright (c) 1990, 1991 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:
@@ -9,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -29,43 +29,39 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)memory.3      5.1 (Berkeley) 5/2/91
+.\"     $OpenBSD: lldiv.3,v 1.1 2006/01/13 17:58:09 millert Exp $
-.\"     $Id: memory.3,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $
 .\"
-.Dd May 2, 1991
+.Dd January 3, 2006
-.Dt MEMORY 3
+.Dt LLDIV 3
-.Os BSD 4
+.Os
 .Sh NAME
-.Nm malloc ,
+.Nm lldiv
-.Nm free ,
+.Nd return quotient and remainder from division
-.Nm realloc ,
-.Nm calloc ,
-.Nm alloca
-.Nd general memory allocation operations
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
-.Ft void *
+.Ft lldiv_t
-.Fn malloc "size_t size"
+.Fn lldiv "long long num" "long long denom"
-.Ft void
-.Fn free "void *ptr"
-.Ft void *
-.Fn realloc "void *ptr" "size_t size"
-.Ft void *
-.Fn calloc "size_t nelem" "size_t elsize"
-.Ft void *
-.Fn alloca "size_t size"
 .Sh DESCRIPTION
-These functions allocate and free memory for the calling process.
+The
-They are described in the
+.Fn lldiv
-individual manual pages.
+function computes the value
+.Fa num Ns / Ns Fa denom
+and returns the quotient and remainder in a structure named
+.Li lldiv_t
+that contains two
+.Li long long integer
+members named
+.Fa quot
+and
+.Fa rem .
 .Sh SEE ALSO
-.Xr calloc 3 ,
+.Xr div 3 ,
-.Xr free 3 ,
+.Xr imaxdiv 3 ,
-.Xr malloc 3 ,
+.Xr ldiv 3 ,
-.Xr realloc 3 ,
+.Xr math 3 ,
-.Xr alloca 3 ,
+.Xr qdiv 3
 .Sh STANDARDS
-These functions, with the exception of
+The
-.Fn alloca
+.Fn lldiv
-conform to
+function conforms to
-.St -ansiC .
+.St -ansiC-99 .
diff --git a/src/lib/libc/stdlib/lldiv.c b/src/lib/libc/stdlib/lldiv.c
new file mode 100644
index 0000000000..e8d6c978b3
--- /dev/null
+++ b/src/lib/libc/stdlib/lldiv.c
@@ -0,0 +1,50 @@
+/*      $OpenBSD: lldiv.c,v 1.1 2006/01/13 17:58:09 millert Exp $       */
+/*
+ * Copyright (c) 1990 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * 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.
+ */
+#include <stdlib.h>             /* lldiv_t */
+lldiv_t
+lldiv(long long num, long long denom)
+{
+        lldiv_t r;
+        /* see div.c for comments */
+        r.quot = num / denom;
+        r.rem = num % denom;
+        if (num >= 0 && r.rem < 0) {
+                r.quot++;
+                r.rem -= denom;
+        }
+        return (r);
+}
diff --git a/src/lib/libc/stdlib/lrand48.c b/src/lib/libc/stdlib/lrand48.c
index 8e7f26237f..21beb858ca 100644
--- a/src/lib/libc/stdlib/lrand48.c
+++ b/src/lib/libc/stdlib/lrand48.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: lrand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
 /*
 * Copyright (c) 1993 Martin Birgmeier
 * All rights reserved.
diff --git a/src/lib/libc/stdlib/lsearch.3 b/src/lib/libc/stdlib/lsearch.3
new file mode 100644
index 0000000000..eda67ada01
--- /dev/null
+++ b/src/lib/libc/stdlib/lsearch.3
@@ -0,0 +1,108 @@
+.\"     $OpenBSD: lsearch.3,v 1.7 2005/12/23 21:34:16 millert Exp $
+.\"
+.\" Copyright (c) 1989, 1991, 1993
+.\"     The Regents of the University of California.  All rights reserved.
+.\"
+.\" 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.
+.\"
+.\"     @(#)lsearch.3   8.1 (Berkeley) 6/4/93
+.\"
+.Dd June 4, 1993
+.Dt LSEARCH 3
+.Os
+.Sh NAME
+.Nm lsearch ,
+.Nm lfind
+.Nd linear searching routines
+.Sh SYNOPSIS
+.Fd #include <search.h>
+.Ft char *
+.Fn lsearch "const void *key" "const void *base" "size_t *nelp" \
+    "size_t width" "int (*compar)(void *, void *)"
+.Ft char *
+.Fn lfind "const void *key" "const void *base" "size_t *nelp" \
+    "size_t width" "int (*compar)(void *, void *)"
+.Sh DESCRIPTION
+The functions
+.Fn lsearch
+and
+.Fn lfind
+provide basic linear searching functionality.
+.Pp
+.Fa base
+is the pointer to the beginning of an array.
+The argument
+.Fa nelp
+is the current number of elements in the array, where each element
+is
+.Fa width
+bytes long.
+The
+.Fa compar
+function
+is a comparison routine which is used to compare two elements.
+It takes two arguments which point to the
+.Fa key
+object and to an array member, in that order, and must return an integer
+less than, equivalent to, or greater than zero if the
+.Fa key
+object is considered, respectively, to be less than, equal to, or greater
+than the array member.
+.Pp
+The
+.Fn lsearch
+and
+.Fn lfind
+functions
+return a pointer into the array referenced by
+.Fa base
+where
+.Fa key
+is located.
+If
+.Fa key
+does not exist,
+.Fn lfind
+will return a null pointer and
+.Fn lsearch
+will add it to the array.
+When an element is added to the array by
+.Fn lsearch ,
+the location referenced by the argument
+.Fa nelp
+is incremented by one.
+.Sh SEE ALSO
+.Xr bsearch 3 ,
+.Xr db 3
+.Sh STANDARDS
+The
+.Fn lsearch
+and
+.Fn lfind
+functions conform to the
+.St -p1003.1-2001
+and
+.St -xpg4.3
+specifications.
diff --git a/src/lib/libc/stdlib/lsearch.c b/src/lib/libc/stdlib/lsearch.c
new file mode 100644
index 0000000000..0815430199
--- /dev/null
+++ b/src/lib/libc/stdlib/lsearch.c
@@ -0,0 +1,88 @@
+/*      $OpenBSD: lsearch.c,v 1.3 2004/10/01 04:08:45 jsg Exp $ */
+/*
+ * Copyright (c) 1989, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Roger L. Snyder.
+ *
+ * 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.
+ */
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)lsearch.c   8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+#include <sys/types.h>
+#include <string.h>
+#include <search.h>
+typedef int (*cmp_fn_t)(const void *, const void *);
+static void *linear_base(const void *, const void *, size_t *, size_t,
+    cmp_fn_t, int);
+void *
+lsearch(const void *key, const void *base, size_t *nelp, size_t width,
+        cmp_fn_t compar)
+{
+        return(linear_base(key, base, nelp, width, compar, 1));
+}
+void *
+lfind(const void *key, const void *base, size_t *nelp, size_t width,
+        cmp_fn_t compar)
+{
+        return(linear_base(key, base, nelp, width, compar, 0));
+}
+static void *
+linear_base(const void *key, const void *base, size_t *nelp, size_t width,
+        cmp_fn_t compar, int add_flag)
+{
+        const char *element, *end;
+        end = (const char *)base + *nelp * width;
+        for (element = base; element < end; element += width)
+                if (!compar(key, element))              /* key found */
+                        return((void *)element);
+        if (!add_flag)                                  /* key not found */
+                return(NULL);
+        /*
+         * The UNIX System User's Manual, 1986 edition claims that
+         * a NULL pointer is returned by lsearch with errno set
+         * appropriately, if there is not enough room in the table
+         * to add a new item.  This can't be done as none of these
+         * routines have any method of determining the size of the
+         * table.  This comment isn't in the 1986-87 System V
+         * manual.
+         */
+        ++*nelp;
+        memcpy((void *)end, key, width);
+        return((void *)end);
+}
diff --git a/src/lib/libc/stdlib/malloc.3 b/src/lib/libc/stdlib/malloc.3
index 3bbf2bf65e..e5bb1315df 100644
--- a/src/lib/libc/stdlib/malloc.3
+++ b/src/lib/libc/stdlib/malloc.3
@@ -1,5 +1,6 @@
-.\" Copyright (c) 1980, 1991 Regents of the University of California.
+.\"
-.\" All rights reserved.
+.\" Copyright (c) 1980, 1991, 1993
+.\"     The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the American National Standards Committee X3, on Information
@@ -13,11 +14,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,19 +30,32 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)malloc.3      6.7 (Berkeley) 6/29/91
+.\"     $OpenBSD: malloc.3,v 1.45 2006/06/06 14:49:26 pedro Exp $
-.\"     $Id: malloc.3,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd August 27, 1996
 .Dt MALLOC 3
-.Os BSD 4
+.Os
 .Sh NAME
-.Nm malloc
+.Nm malloc ,
-.Nd general memory allocation function
+.Nm calloc ,
+.Nm realloc ,
+.Nm free ,
+.Nm cfree
+.Nd memory allocation and deallocation
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
 .Ft void *
 .Fn malloc "size_t size"
+.Ft void *
+.Fn calloc "size_t nmemb" "size_t size"
+.Ft void *
+.Fn realloc "void *ptr" "size_t size"
+.Ft void
+.Fn free "void *ptr"
+.Ft void
+.Fn cfree "void *ptr"
+.Ft char *
+.Va malloc_options ;
 .Sh DESCRIPTION
 The
 .Fn malloc
@@ -59,33 +69,398 @@ space from the appropriate list.
 .Pp
 The allocated space is
 suitably aligned (after possible pointer
-coercion) for storage of any type of object. If the space is of
+coercion) for storage of any type of object.
+If the space is of
 .Em pagesize
 or larger, the memory returned will be page-aligned.
+.Pp
+Allocation of a zero size object returns a pointer to a zero size object.
+This zero size object is access protected, so any access to it will
+generate an exception (SIGSEGV).
+Many zero-sized objects can be placed consecutively in shared
+protected pages.
+The minimum size of the protection on each object is suitably aligned and
+sized as previously stated, but the protection may extend further depending
+on where in a protected zone the object lands.
+.Pp
+When using
+.Fn malloc
+be careful to avoid the following idiom:
+.Bd -literal -offset indent
+if ((p = malloc(num * size)) == NULL)
+        err(1, "malloc");
+.Ed
+.Pp
+The multiplication may lead to an integer overflow.
+To avoid this,
+.Fn calloc
+is recommended.
+.Pp
+If
+.Fn malloc
+must be used, be sure to test for overflow:
+.Bd -literal -offset indent
+if (num && SIZE_MAX / num < size) {
+        errno = ENOMEM;
+        err(1, "overflow");
+}
+.Ed
+.Pp
+The
+.Fn calloc
+function allocates space for an array of
+.Fa nmemb
+objects, each of whose size is
+.Fa size .
+The space is initialized to all bits zero.
+The use of
+.Fn calloc
+is strongly encouraged when allocating multiple sized objects
+in order to avoid possible integer overflows.
+.Pp
+The
+.Fn free
+function causes the space pointed to by
+.Fa ptr
+to be deallocated, that is, at least made available for further allocation,
+but if possible, it will be passed back to the kernel with
+.Xr sbrk 2 .
+If
+.Fa ptr
+is a null pointer, no action occurs.
+.Pp
+A
+.Fn cfree
+function is also provided for compatibility with old systems and other
+.Nm malloc
+libraries; it is simply an alias for
+.Fn free .
+.Pp
+The
+.Fn realloc
+function changes the size of the object pointed to by
+.Fa ptr
+to
+.Fa size
+bytes and returns a pointer to the (possibly moved) object.
+The contents of the object are unchanged up to the lesser
+of the new and old sizes.
+If the new size is larger, the value of the newly allocated portion
+of the object is indeterminate and uninitialized.
+If
+.Fa ptr
+is a null pointer, the
+.Fn realloc
+function behaves like the
+.Fn malloc
+function for the specified size.
+If the space cannot be allocated, the object
+pointed to by
+.Fa ptr
+is unchanged.
+If
+.Fa size
+is zero and
+.Fa ptr
+is not a null pointer, the object it points to is freed and a new zero size
+object is returned.
+.Pp
+When using
+.Fn realloc
+be careful to avoid the following idiom:
+.Bd -literal -offset indent
+size += 50;
+if ((p = realloc(p, size)) == NULL)
+        return (NULL);
+.Ed
+.Pp
+Do not adjust the variable describing how much memory has been allocated
+until the allocation has been successful.
+This can cause aberrant program behavior if the incorrect size value is used.
+In most cases, the above sample will also result in a leak of memory.
+As stated earlier, a return value of
+.Dv NULL
+indicates that the old object still remains allocated.
+Better code looks like this:
+.Bd -literal -offset indent
+newsize = size + 50;
+if ((newp = realloc(p, newsize)) == NULL) {
+        free(p);
+        p = NULL;
+        size = 0;
+        return (NULL);
+}
+p = newp;
+size = newsize;
+.Ed
+.Pp
+As with
+.Fn malloc
+it is important to ensure the new size value will not overflow;
+i.e. avoid allocations like the following:
+.Bd -literal -offset indent
+if ((newp = realloc(p, num * size)) == NULL) {
+        ...
+.Ed
+.Pp
+Malloc will first look for a symbolic link called
+.Pa /etc/malloc.conf
+and next check the environment for a variable called
+.Ev MALLOC_OPTIONS
+and finally for the global variable
+.Va malloc_options
+and scan them for flags in that order.
+Flags are single letters, uppercase means on, lowercase means off.
+.Bl -tag -width indent
+.It Cm A
+.Dq Abort .
+.Fn malloc
+will coredump the process, rather than tolerate failure.
+This is a very handy debugging aid, since the core file will represent the
+time of failure, rather than when the null pointer was accessed.
+.It Cm D
+.Dq Dump .
+.Fn malloc
+will dump statistics in a file called
+.Pa malloc.out
+at exit.
+This option requires the library to have been compiled with -DMALLOC_STATS in
+order to have any effect.
+.It Cm F
+.Dq Freeguard .
+Enable use after free protection.
+Unused pages on the freelist are read and write protected to
+cause a segmentation fault upon access.
+.It Cm G
+.Dq Guard .
+Enable guard pages and chunk randomization.
+Each page size or larger allocation is followed by a guard page that will
+cause a segmentation fault upon any access.
+Smaller than page size chunks are returned in a random order.
+.It Cm H
+.Dq Hint .
+Pass a hint to the kernel about pages we don't use.
+If the machine is paging a lot this may help a bit.
+.It Cm J
+.Dq Junk .
+Fill some junk into the area allocated.
+Currently junk is bytes of 0xd0; this is pronounced
+.Dq Duh .
+\&:-)
+.It Cm N
+Do not output warning messages when encountering possible corruption
+or bad pointers.
+.It Cm P
+.Dq Pointer Protection .
+Pointer sized allocations are aligned to the end of a page to catch
+sizeof(ptr) errors where sizeof(*ptr) is meant.
+.It Cm R
+.Dq realloc .
+Always reallocate when
+.Fn realloc
+is called, even if the initial allocation was big enough.
+This can substantially aid in compacting memory.
+.\".Pp
+.\".It Cm U
+.\".Dq utrace .
+.\"Generate entries for
+.\".Xr ktrace 1
+.\"for all operations.
+.\"Consult the source for this one.
+.It Cm X
+.Dq xmalloc .
+Rather than return failure,
+.Xr abort 3
+the program with a diagnostic message on stderr.
+It is the intention that this option be set at compile time by
+including in the source:
+.Bd -literal -offset indent
+extern char *malloc_options;
+malloc_options = "X";
+.Ed
+.It Cm Z
+.Dq Zero .
+Fill some junk into the area allocated (see
+.Cm J ) ,
+except for the exact length the user asked for, which is zeroed.
+.It Cm <
+.Dq Half the cache size .
+Decrease the size of the free page cache by a factor of two.
+.It Cm >
+.Dq Double the cache size .
+Increase the size of the free page cache by a factor of two.
+.El
+.Pp
+So to set a systemwide reduction of cache size and coredumps on problems:
+.Li ln -s 'A<' /etc/malloc.conf
+.Pp
+The
+.Cm J
+and
+.Cm Z
+flags are mostly for testing and debugging.
+If a program changes behavior if either of these options are used,
+it is buggy.
+.Pp
+The default number of free pages cached is 16.
 .Sh RETURN VALUES
 The
 .Fn malloc
-function returns
+and
-a pointer to the allocated space if successful; otherwise
+.Fn calloc
-a null pointer is returned.
+functions return a pointer to the allocated space if successful; otherwise,
+a null pointer is returned and
+.Va errno
+is set to
+.Er ENOMEM .
+.Pp
+The
+.Fn free
+and
+.Fn cfree
+functions return no value.
+.Pp
+The
+.Fn realloc
+function returns a pointer to the (possibly moved) allocated space
+if successful; otherwise, a null pointer is returned and
+.Va errno
+is set to
+.Er ENOMEM .
+.Sh ENVIRONMENT
+.Bl -tag -width Ev
+.It Ev MALLOC_OPTIONS
+See above.
+.El
+.Sh FILES
+.Bl -tag -width "/etc/malloc.conf"
+.It Pa /etc/malloc.conf
+symbolic link to filename containing option flags
+.El
+.Sh DIAGNOSTICS
+If
+.Fn malloc ,
+.Fn calloc ,
+.Fn realloc ,
+or
+.Fn free
+detect an error or warning condition,
+a message will be printed to file descriptor
+2 (not using stdio).
+Errors will always result in the process being
+.Xr abort 3 'ed.
+If the
+.Cm A
+option has been specified, warnings will also
+.Xr abort 3
+the process.
+.Pp
+Here is a brief description of the error messages and what they mean:
+.Bl -tag -width Ds
+.It Dq (ES): mumble mumble mumble
+.Fn malloc
+has been compiled with
+.Dv \&-DEXTRA_SANITY
+and something looks fishy in there.
+Consult sources and/or wizards.
+.It Dq allocation failed
+If the
+.Cm A
+option is specified it is an error for
+.Fn malloc ,
+.Fn calloc ,
+or
+.Fn realloc
+to return
+.Dv NULL .
+.It Dq mmap(2) failed, check limits.
+This is a rather weird condition that is most likely to indicate a
+seriously overloaded system or a
+.Xr ulimit 1
+restriction.
+.It Dq freelist is destroyed.
+.Fn malloc Ns 's
+internal freelist has been stomped on.
+.El
+.Pp
+Here is a brief description of the warning messages and what they mean:
+.Bl -tag -width Ds
+.It Dq chunk/page is already free.
+There was an attempt to free a chunk that had already been freed.
+.It Dq junk pointer, too high to make sense.
+The pointer doesn't make sense.
+It's above the area of memory that
+.Fn malloc
+knows something about.
+This could be a pointer from some
+.Xr mmap 2 'ed
+memory.
+.It Dq junk pointer, too low to make sense.
+The pointer doesn't make sense.
+It's below the area of memory that
+.Fn malloc
+knows something about.
+This pointer probably came from your data or bss segments.
+.It Dq malloc() has never been called.
+Nothing has ever been allocated, yet something is being freed or
+realloc'ed.
+.It Dq modified (chunk-/page-) pointer.
+The pointer passed to
+.Fn free
+or
+.Fn realloc
+has been modified.
+.It Dq pointer to wrong page.
+The pointer that
+.Fn malloc
+is trying to free is not pointing to
+a sensible page.
+.It Dq recursive call.
+An attempt was made to call recursively into these functions, i.e., from a
+signal handler.
+This behavior is not supported.
+In particular, signal handlers should
+.Em not
+use any of the
+.Fn malloc
+functions nor utilize any other functions which may call
+.Fn malloc
+(e.g.,
+.Xr stdio 3
+routines).
+.It Dq unknown char in MALLOC_OPTIONS
+We found something we didn't understand.
+.El
 .Sh SEE ALSO
 .Xr brk 2 ,
-.Xr getpagesize 2 ,
-.Xr free 3 ,
-.Xr calloc 3 ,
 .Xr alloca 3 ,
-.Xr realloc 3 ,
+.Xr getpagesize 3
-.Xr memory 3
 .Sh STANDARDS
 The
 .Fn malloc
 function conforms to
 .St -ansiC .
-.Sh BUGS
+.Sh HISTORY
-The current implementation of
+The present implementation of
-.Xr malloc
+.Fn malloc
-does not always fail gracefully when system
+started out as a filesystem on a drum
-memory limits are approached.
+attached to a 20-bit binary challenged computer built with discrete germanium
-It may fail to allocate memory when larger free blocks could be broken
+transistors, and it has since graduated to handle primary storage rather than
-up, or when limits are exceeded because the size is rounded up.
+secondary.
-It is optimized for sizes that are powers of two.
+.Pp
+The main difference from other
+.Fn malloc
+implementations are believed to be that
+the free pages are not accessed until allocated.
+Most
+.Fn malloc
+implementations will store a data structure containing a,
+possibly double-, linked list in the free chunks of memory, used to tie
+all the free memory together.
+That is a quite suboptimal thing to do.
+Every time the free-list is traversed, all the otherwise unused, and very
+likely paged out, pages get faulted into primary memory, just to see what
+lies after them in the list.
+.Pp
+On systems which are paging, this can increase the page-faults
+of a process by a factor of five.
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 3c57fad024..028eff2b2d 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,421 +1,1870 @@
+/*      $OpenBSD: malloc.c,v 1.83 2006/05/14 19:53:40 otto Exp $        */
 /*
- * Copyright (c) 1983 Regents of the University of California.
+ * ----------------------------------------------------------------------------
- * All rights reserved.
+ * "THE BEER-WARE LICENSE" (Revision 42):
- *
+ * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
- * Redistribution and use in source and binary forms, with or without
+ * can do whatever you want with this stuff. If we meet some day, and you think
- * modification, are permitted provided that the following conditions
+ * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
+/*
-/*static char *sccsid = "from: @(#)malloc.c     5.11 (Berkeley) 2/23/91";*/
+ * Defining MALLOC_EXTRA_SANITY will enable extra checks which are
-static char *rcsid = "$Id: malloc.c,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $";
+ * related to internal conditions and consistency in malloc.c. This has
-#endif /* LIBC_SCCS and not lint */
+ * a noticeable runtime performance hit, and generally will not do you
+ * any good unless you fiddle with the internals of malloc or want
+ * to catch random pointer corruption as early as possible.
+ */
+#ifndef MALLOC_EXTRA_SANITY
+#undef  MALLOC_EXTRA_SANITY
+#endif
 /*
- * malloc.c (Caltech) 2/21/82
+ * Defining MALLOC_STATS will enable you to call malloc_dump() and set
- * Chris Kingsley, kingsley@cit-20.
+ * the [dD] options in the MALLOC_OPTIONS environment variable.
- *
+ * It has no run-time performance hit, but does pull in stdio...
- * This is a very fast storage allocator.  It allocates blocks of a small 
- * number of different sizes, and keeps free lists of each size.  Blocks that
- * don't exactly fit are passed up to the next larger size.  In this 
- * implementation, the available sizes are 2^n-4 (or 2^n-10) bytes long.
- * This is designed for use in a virtual memory environment.
 */
+#ifndef MALLOC_STATS
+#undef  MALLOC_STATS
+#endif
+/*
+ * What to use for Junk.  This is the byte value we use to fill with
+ * when the 'J' option is enabled.
+ */
+#define SOME_JUNK       0xd0    /* as in "Duh" :-) */
 #include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/param.h>
+#include <sys/mman.h>
+#include <sys/uio.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <errno.h>
+#include <err.h>
-#define NULL 0
+#include "thread_private.h"
-static void morecore();
-static int findbucket();
 /*
- * The overhead on a block is at least 4 bytes.  When free, this space
+ * The basic parameters you can tweak.
- * contains a pointer to the next free block, and the bottom two bits must
+ *
- * be zero.  When in use, the first byte is set to MAGIC, and the second
+ * malloc_pageshift     pagesize = 1 << malloc_pageshift
- * byte is the size index.  The remaining bytes are for alignment.
+ *                      It's probably best if this is the native
- * If range checking is enabled then a second word holds the size of the
+ *                      page size, but it shouldn't have to be.
- * requested block, less 1, rounded up to a multiple of sizeof(RMAGIC).
+ *
- * The order of elements is critical: ov_magic must overlay the low order
+ * malloc_minsize       minimum size of an allocation in bytes.
- * bits of ov_next, and ov_magic can not be a valid ov_next bit pattern.
+ *                      If this is too small it's too much work
+ *                      to manage them.  This is also the smallest
+ *                      unit of alignment used for the storage
+ *                      returned by malloc/realloc.
+ *
 */
-union   overhead {
-        union   overhead *ov_next;      /* when free */
-        struct {
-                u_char  ovu_magic;      /* magic number */
-                u_char  ovu_index;      /* bucket # */
-#ifdef RCHECK
-                u_short ovu_rmagic;     /* range magic number */
-                u_long  ovu_size;       /* actual block size */
-#endif
-        } ovu;
-#define ov_magic        ovu.ovu_magic
-#define ov_index        ovu.ovu_index
-#define ov_rmagic       ovu.ovu_rmagic
-#define ov_size         ovu.ovu_size
-};
-#define MAGIC           0xef            /* magic # on accounting info */
+#if defined(__sparc__)
-#define RMAGIC          0x5555          /* magic # on range info */
+#define malloc_pageshift        13U
+#endif /* __sparc__ */
-#ifdef RCHECK
+#ifndef malloc_pageshift
-#define RSLOP           sizeof (u_short)
+#define malloc_pageshift        (PGSHIFT)
-#else
-#define RSLOP           0
 #endif
 /*
- * nextf[i] is the pointer to the next free block of size 2^(i+3).  The
+ * No user serviceable parts behind this point.
- * smallest allocatable block is 8 bytes.  The overhead information
+ *
- * precedes the data area returned to the user.
+ * This structure describes a page worth of chunks.
 */
-#define NBUCKETS 30
+struct pginfo {
-static  union overhead *nextf[NBUCKETS];
+        struct pginfo   *next;  /* next on the free list */
-extern  char *sbrk();
+        void            *page;  /* Pointer to the page */
+        u_short         size;   /* size of this page's chunks */
+        u_short         shift;  /* How far to shift for this size chunks */
+        u_short         free;   /* How many free chunks */
+        u_short         total;  /* How many chunk */
+        u_long          bits[1];/* Which chunks are free */
+};
-static  int pagesz;                     /* page size */
+/* How many bits per u_long in the bitmap */
-static  int pagebucket;                 /* page size bucket */
+#define MALLOC_BITS     (NBBY * sizeof(u_long))
-#ifdef MSTATS
 /*
- * nmalloc[i] is the difference between the number of mallocs and frees
+ * This structure describes a number of free pages.
- * for a given block size.
 */
-static  u_int nmalloc[NBUCKETS];
+struct pgfree {
-#include <stdio.h>
+        struct pgfree   *next;  /* next run of free pages */
+        struct pgfree   *prev;  /* prev run of free pages */
+        void            *page;  /* pointer to free pages */
+        void            *pdir;  /* pointer to the base page's dir */
+        size_t          size;   /* number of bytes free */
+};
+/*
+ * Magic values to put in the page_directory
+ */
+#define MALLOC_NOT_MINE ((struct pginfo*) 0)
+#define MALLOC_FREE     ((struct pginfo*) 1)
+#define MALLOC_FIRST    ((struct pginfo*) 2)
+#define MALLOC_FOLLOW   ((struct pginfo*) 3)
+#define MALLOC_MAGIC    ((struct pginfo*) 4)
+#ifndef malloc_minsize
+#define malloc_minsize                  16UL
 #endif
-#if defined(DEBUG) || defined(RCHECK)
+#if !defined(malloc_pagesize)
-#define ASSERT(p)   if (!(p)) botch("p")
+#define malloc_pagesize                 (1UL<<malloc_pageshift)
-#include <stdio.h>
+#endif
-static
-botch(s)
+#if ((1UL<<malloc_pageshift) != malloc_pagesize)
-        char *s;
+#error  "(1UL<<malloc_pageshift) != malloc_pagesize"
+#endif
+#ifndef malloc_maxsize
+#define malloc_maxsize                  ((malloc_pagesize)>>1)
+#endif
+/* A mask for the offset inside a page. */
+#define malloc_pagemask ((malloc_pagesize)-1)
+#define pageround(foo)  (((foo) + (malloc_pagemask)) & ~malloc_pagemask)
+#define ptr2index(foo)  (((u_long)(foo) >> malloc_pageshift)+malloc_pageshift)
+#define index2ptr(idx)  ((void*)(((idx)-malloc_pageshift)<<malloc_pageshift))
+/* Set when initialization has been done */
+static unsigned int     malloc_started;
+/* Number of free pages we cache */
+static unsigned int     malloc_cache = 16;
+/* Structure used for linking discrete directory pages. */
+struct pdinfo {
+        struct pginfo   **base;
+        struct pdinfo   *prev;
+        struct pdinfo   *next;
+        u_long          dirnum;
+};
+static struct pdinfo *last_dir; /* Caches to the last and previous */
+static struct pdinfo *prev_dir; /* referenced directory pages. */
+static size_t   pdi_off;
+static u_long   pdi_mod;
+#define PD_IDX(num)     ((num) / (malloc_pagesize/sizeof(struct pginfo *)))
+#define PD_OFF(num)     ((num) & ((malloc_pagesize/sizeof(struct pginfo *))-1))
+#define PI_IDX(index)   ((index) / pdi_mod)
+#define PI_OFF(index)   ((index) % pdi_mod)
+/* The last index in the page directory we care about */
+static u_long   last_index;
+/* Pointer to page directory. Allocated "as if with" malloc */
+static struct pginfo **page_dir;
+/* Free pages line up here */
+static struct pgfree free_list;
+/* Abort(), user doesn't handle problems. */
+static int      malloc_abort = 2;
+/* Are we trying to die ? */
+static int      suicide;
+#ifdef MALLOC_STATS
+/* dump statistics */
+static int      malloc_stats;
+#endif
+/* avoid outputting warnings? */
+static int      malloc_silent;
+/* always realloc ? */
+static int      malloc_realloc;
+/* mprotect free pages PROT_NONE? */
+static int      malloc_freeprot;
+/* use guard pages after allocations? */
+static size_t   malloc_guard = 0;
+static size_t   malloc_guarded;
+/* align pointers to end of page? */
+static int      malloc_ptrguard;
+static int      malloc_hint;
+/* xmalloc behaviour ? */
+static int      malloc_xmalloc;
+/* zero fill ? */
+static int      malloc_zero;
+/* junk fill ? */
+static int      malloc_junk;
+#ifdef __FreeBSD__
+/* utrace ? */
+static int      malloc_utrace;
+struct ut {
+        void            *p;
+        size_t          s;
+        void            *r;
+};
+void            utrace(struct ut *, int);
+#define UTRACE(a, b, c) \
+        if (malloc_utrace) \
+                {struct ut u; u.p=a; u.s = b; u.r=c; utrace(&u, sizeof u);}
+#else                           /* !__FreeBSD__ */
+#define UTRACE(a,b,c)
+#endif
+/* Status of malloc. */
+static int      malloc_active;
+/* Allocated memory. */
+static size_t   malloc_used;
+/* My last break. */
+static caddr_t  malloc_brk;
+/* One location cache for free-list holders. */
+static struct pgfree *px;
+/* Compile-time options. */
+char            *malloc_options;
+/* Name of the current public function. */
+static char     *malloc_func;
+#define MMAP(size) \
+        mmap((void *)0, (size), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, \
+            -1, (off_t)0)
+/*
+ * Necessary function declarations.
+ */
+static void     *imalloc(size_t size);
+static void     ifree(void *ptr);
+static void     *irealloc(void *ptr, size_t size);
+static void     *malloc_bytes(size_t size);
+/*
+ * Function for page directory lookup.
+ */
+static int
+pdir_lookup(u_long index, struct pdinfo ** pdi)
 {
-        fprintf(stderr, "\r\nassertion botched: %s\r\n", s);
+        struct pdinfo   *spi;
-        (void) fflush(stderr);          /* just in case user buffered it */
+        u_long          pidx = PI_IDX(index);
-        abort();
+        if (last_dir != NULL && PD_IDX(last_dir->dirnum) == pidx)
+                *pdi = last_dir;
+        else if (prev_dir != NULL && PD_IDX(prev_dir->dirnum) == pidx)
+                *pdi = prev_dir;
+        else if (last_dir != NULL && prev_dir != NULL) {
+                if ((PD_IDX(last_dir->dirnum) > pidx) ?
+                    (PD_IDX(last_dir->dirnum) - pidx) :
+                    (pidx - PD_IDX(last_dir->dirnum))
+                    < (PD_IDX(prev_dir->dirnum) > pidx) ?
+                    (PD_IDX(prev_dir->dirnum) - pidx) :
+                    (pidx - PD_IDX(prev_dir->dirnum)))
+                        *pdi = last_dir;
+                else
+                        *pdi = prev_dir;
+                if (PD_IDX((*pdi)->dirnum) > pidx) {
+                        for (spi = (*pdi)->prev;
+                            spi != NULL && PD_IDX(spi->dirnum) > pidx;
+                            spi = spi->prev)
+                                *pdi = spi;
+                        if (spi != NULL)
+                                *pdi = spi;
+                } else
+                        for (spi = (*pdi)->next;
+                            spi != NULL && PD_IDX(spi->dirnum) <= pidx;
+                            spi = spi->next)
+                                *pdi = spi;
+        } else {
+                *pdi = (struct pdinfo *) ((caddr_t) page_dir + pdi_off);
+                for (spi = *pdi;
+                    spi != NULL && PD_IDX(spi->dirnum) <= pidx;
+                    spi = spi->next)
+                        *pdi = spi;
+        }
+        return ((PD_IDX((*pdi)->dirnum) == pidx) ? 0 :
+            (PD_IDX((*pdi)->dirnum) > pidx) ? 1 : -1);
 }
-#else
-#define ASSERT(p)
-#endif
-void *
+#ifdef MALLOC_STATS
-malloc(nbytes)
+void
-        size_t nbytes;
+malloc_dump(int fd)
 {
-        register union overhead *op;
+        char            buf[1024];
-        register long bucket, n;
+        struct pginfo   **pd;
-        register unsigned amt;
+        struct pgfree   *pf;
+        struct pdinfo   *pi;
+        u_long          j;
-        /*
+        pd = page_dir;
-         * First time malloc is called, setup page size and
+        pi = (struct pdinfo *) ((caddr_t) pd + pdi_off);
-         * align break pointer so all data will be page aligned.
-         */
+        /* print out all the pages */
-        if (pagesz == 0) {
+        for (j = 0; j <= last_index;) {
-                pagesz = n = getpagesize();
+                snprintf(buf, sizeof buf, "%08lx %5lu ", j << malloc_pageshift, j);
-                op = (union overhead *)sbrk(0);
+                write(fd, buf, strlen(buf));
-                n = n - sizeof (*op) - ((long)op & (n - 1));
+                if (pd[PI_OFF(j)] == MALLOC_NOT_MINE) {
-                if (n < 0)
+                        for (j++; j <= last_index && pd[PI_OFF(j)] == MALLOC_NOT_MINE;) {
-                        n += pagesz;
+                                if (!PI_OFF(++j)) {
-                if (n) {
+                                        if ((pi = pi->next) == NULL ||
-                        if (sbrk(n) == (char *)-1)
+                                            PD_IDX(pi->dirnum) != PI_IDX(j))
-                                return (NULL);
+                                                break;
+                                        pd = pi->base;
+                                        j += pdi_mod;
+                                }
+                        }
+                        j--;
+                        snprintf(buf, sizeof buf, ".. %5lu not mine\n", j);
+                        write(fd, buf, strlen(buf));
+                } else if (pd[PI_OFF(j)] == MALLOC_FREE) {
+                        for (j++; j <= last_index && pd[PI_OFF(j)] == MALLOC_FREE;) {
+                                if (!PI_OFF(++j)) {
+                                        if ((pi = pi->next) == NULL ||
+                                            PD_IDX(pi->dirnum) != PI_IDX(j))
+                                                break;
+                                        pd = pi->base;
+                                        j += pdi_mod;
+                                }
+                        }
+                        j--;
+                        snprintf(buf, sizeof buf, ".. %5lu free\n", j);
+                        write(fd, buf, strlen(buf));
+                } else if (pd[PI_OFF(j)] == MALLOC_FIRST) {
+                        for (j++; j <= last_index && pd[PI_OFF(j)] == MALLOC_FOLLOW;) {
+                                if (!PI_OFF(++j)) {
+                                        if ((pi = pi->next) == NULL ||
+                                            PD_IDX(pi->dirnum) != PI_IDX(j))
+                                                break;
+                                        pd = pi->base;
+                                        j += pdi_mod;
+                                }
+                        }
+                        j--;
+                        snprintf(buf, sizeof buf, ".. %5lu in use\n", j);
+                        write(fd, buf, strlen(buf));
+                } else if (pd[PI_OFF(j)] < MALLOC_MAGIC) {
+                        snprintf(buf, sizeof buf, "(%p)\n", pd[PI_OFF(j)]);
+                        write(fd, buf, strlen(buf));
+                } else {
+                        snprintf(buf, sizeof buf, "%p %d (of %d) x %d @ %p --> %p\n",
+                            pd[PI_OFF(j)], pd[PI_OFF(j)]->free,
+                            pd[PI_OFF(j)]->total, pd[PI_OFF(j)]->size,
+                            pd[PI_OFF(j)]->page, pd[PI_OFF(j)]->next);
+                        write(fd, buf, strlen(buf));
                }
-                bucket = 0;
+                if (!PI_OFF(++j)) {
-                amt = 8;
+                        if ((pi = pi->next) == NULL)
-                while (pagesz > amt) {
+                                break;
-                        amt <<= 1;
+                        pd = pi->base;
-                        bucket++;
+                        j += (1 + PD_IDX(pi->dirnum) - PI_IDX(j)) * pdi_mod;
                }
-                pagebucket = bucket;
        }
-        /*
-         * Convert amount of memory requested into closest block size
+        for (pf = free_list.next; pf; pf = pf->next) {
-         * stored in hash buckets which satisfies request.
+                snprintf(buf, sizeof buf, "Free: @%p [%p...%p[ %ld ->%p <-%p\n",
-         * Account for space used per block for accounting.
+                    pf, pf->page, (char *)pf->page + pf->size,
-         */
+                    pf->size, pf->prev, pf->next);
-        if (nbytes <= (n = pagesz - sizeof (*op) - RSLOP)) {
+                write(fd, buf, strlen(buf));
-#ifndef RCHECK
+                if (pf == pf->next) {
-                amt = 8;        /* size of first bucket */
+                        snprintf(buf, sizeof buf, "Free_list loops\n");
-                bucket = 0;
+                        write(fd, buf, strlen(buf));
-#else
+                        break;
-                amt = 16;       /* size of first bucket */
+                }
-                bucket = 1;
+        }
+        /* print out various info */
+        snprintf(buf, sizeof buf, "Minsize\t%lu\n", malloc_minsize);
+        write(fd, buf, strlen(buf));
+        snprintf(buf, sizeof buf, "Maxsize\t%lu\n", malloc_maxsize);
+        write(fd, buf, strlen(buf));
+        snprintf(buf, sizeof buf, "Pagesize\t%lu\n", malloc_pagesize);
+        write(fd, buf, strlen(buf));
+        snprintf(buf, sizeof buf, "Pageshift\t%u\n", malloc_pageshift);
+        write(fd, buf, strlen(buf));
+        snprintf(buf, sizeof buf, "In use\t%lu\n", (u_long) malloc_used);
+        write(fd, buf, strlen(buf));
+        snprintf(buf, sizeof buf, "Guarded\t%lu\n", (u_long) malloc_guarded);
+        write(fd, buf, strlen(buf));
+}
+#endif /* MALLOC_STATS */
+extern char     *__progname;
+static void
+wrterror(char *p)
+{
+        char            *q = " error: ";
+        struct iovec    iov[5];
+        iov[0].iov_base = __progname;
+        iov[0].iov_len = strlen(__progname);
+        iov[1].iov_base = malloc_func;
+        iov[1].iov_len = strlen(malloc_func);
+        iov[2].iov_base = q;
+        iov[2].iov_len = strlen(q);
+        iov[3].iov_base = p;
+        iov[3].iov_len = strlen(p);
+        iov[4].iov_base = "\n";
+        iov[4].iov_len = 1;
+        writev(STDERR_FILENO, iov, 5);
+        suicide = 1;
+#ifdef MALLOC_STATS
+        if (malloc_stats)
+                malloc_dump(STDERR_FILENO);
+#endif /* MALLOC_STATS */
+        malloc_active--;
+        if (malloc_abort)
+                abort();
+}
+static void
+wrtwarning(char *p)
+{
+        char            *q = " warning: ";
+        struct iovec    iov[5];
+        if (malloc_abort)
+                wrterror(p);
+        else if (malloc_silent)
+                return;
+        iov[0].iov_base = __progname;
+        iov[0].iov_len = strlen(__progname);
+        iov[1].iov_base = malloc_func;
+        iov[1].iov_len = strlen(malloc_func);
+        iov[2].iov_base = q;
+        iov[2].iov_len = strlen(q);
+        iov[3].iov_base = p;
+        iov[3].iov_len = strlen(p);
+        iov[4].iov_base = "\n";
+        iov[4].iov_len = 1;
+        
+        writev(STDERR_FILENO, iov, 5);
+}
+#ifdef MALLOC_STATS
+static void
+malloc_exit(void)
+{
+        char    *q = "malloc() warning: Couldn't dump stats\n";
+        int     save_errno = errno, fd;
+        fd = open("malloc.out", O_RDWR|O_APPEND);
+        if (fd != -1) {
+                malloc_dump(fd);
+                close(fd);
+        } else
+                write(STDERR_FILENO, q, strlen(q));
+        errno = save_errno;
+}
+#endif /* MALLOC_STATS */
+/*
+ * Allocate a number of pages from the OS
+ */
+static void *
+map_pages(size_t pages)
+{
+        struct pdinfo   *pi, *spi;
+        struct pginfo   **pd;
+        u_long          idx, pidx, lidx;
+        caddr_t         result, tail;
+        u_long          index, lindex;
+        void            *pdregion = NULL;
+        size_t          dirs, cnt;
+        pages <<= malloc_pageshift;
+        result = MMAP(pages + malloc_guard);
+        if (result == MAP_FAILED) {
+#ifdef MALLOC_EXTRA_SANITY
+                wrtwarning("(ES): map_pages fails");
+#endif /* MALLOC_EXTRA_SANITY */
+                errno = ENOMEM;
+                return (NULL);
+        }
+        index = ptr2index(result);
+        tail = result + pages + malloc_guard;
+        lindex = ptr2index(tail) - 1;
+        if (malloc_guard)
+                mprotect(result + pages, malloc_guard, PROT_NONE);
+        pidx = PI_IDX(index);
+        lidx = PI_IDX(lindex);
+        if (tail > malloc_brk) {
+                malloc_brk = tail;
+                last_index = lindex;
+        }
+        dirs = lidx - pidx;
+        /* Insert directory pages, if needed. */
+        if (pdir_lookup(index, &pi) != 0)
+                dirs++;
+        if (dirs > 0) {
+                pdregion = MMAP(malloc_pagesize * dirs);
+                if (pdregion == MAP_FAILED) {
+                        munmap(result, tail - result);
+#ifdef MALLOC_EXTRA_SANITY
+                wrtwarning("(ES): map_pages fails");
 #endif
-                n = -((long)sizeof (*op) + RSLOP);
+                        errno = ENOMEM;
-        } else {
+                        return (NULL);
-                amt = pagesz;
+                }
-                bucket = pagebucket;
        }
-        while (nbytes > amt + n) {
-                amt <<= 1;
+        cnt = 0;
-                if (amt == 0)
+        for (idx = pidx, spi = pi; idx <= lidx; idx++) {
+                if (pi == NULL || PD_IDX(pi->dirnum) != idx) {
+                        pd = (struct pginfo **)((char *)pdregion +
+                            cnt * malloc_pagesize);
+                        cnt++;
+                        memset(pd, 0, malloc_pagesize);
+                        pi = (struct pdinfo *) ((caddr_t) pd + pdi_off);
+                        pi->base = pd;
+                        pi->prev = spi;
+                        pi->next = spi->next;
+                        pi->dirnum = idx * (malloc_pagesize /
+                            sizeof(struct pginfo *));
+                        if (spi->next != NULL)
+                                spi->next->prev = pi;
+                        spi->next = pi;
+                }
+                if (idx > pidx && idx < lidx) {
+                        pi->dirnum += pdi_mod;
+                } else if (idx == pidx) {
+                        if (pidx == lidx) {
+                                pi->dirnum += (u_long)(tail - result) >>
+                                    malloc_pageshift;
+                        } else {
+                                pi->dirnum += pdi_mod - PI_OFF(index);
+                        }
+                } else {
+                        pi->dirnum += PI_OFF(ptr2index(tail - 1)) + 1;
+                }
+#ifdef MALLOC_EXTRA_SANITY
+                if (PD_OFF(pi->dirnum) > pdi_mod || PD_IDX(pi->dirnum) > idx) {
+                        wrterror("(ES): pages directory overflow");
+                        errno = EFAULT;
                        return (NULL);
-                bucket++;
+                }
+#endif /* MALLOC_EXTRA_SANITY */
+                if (idx == pidx && pi != last_dir) {
+                        prev_dir = last_dir;
+                        last_dir = pi;
+                }
+                spi = pi;
+                pi = spi->next;
        }
-        /*
+#ifdef MALLOC_EXTRA_SANITY
-         * If nothing in hash bucket right now,
+        if (cnt > dirs)
-         * request more memory from the system.
+                wrtwarning("(ES): cnt > dirs");
-         */
+#endif /* MALLOC_EXTRA_SANITY */
-        if ((op = nextf[bucket]) == NULL) {
+        if (cnt < dirs)
-                morecore(bucket);
+                munmap((char *)pdregion + cnt * malloc_pagesize,
-                if ((op = nextf[bucket]) == NULL)
+                    (dirs - cnt) * malloc_pagesize);
-                        return (NULL);
-        }
+        return (result);
-        /* remove from linked list */
-        nextf[bucket] = op->ov_next;
-        op->ov_magic = MAGIC;
-        op->ov_index = bucket;
-#ifdef MSTATS
-        nmalloc[bucket]++;
-#endif
-#ifdef RCHECK
-        /*
-         * Record allocated size of block and
-         * bound space with magic numbers.
-         */
-        op->ov_size = (nbytes + RSLOP - 1) & ~(RSLOP - 1);
-        op->ov_rmagic = RMAGIC;
-        *(u_short *)((caddr_t)(op + 1) + op->ov_size) = RMAGIC;
-#endif
-        return ((char *)(op + 1));
 }
 /*
- * Allocate more memory to the indicated bucket.
+ * Initialize the world
 */
 static void
-morecore(bucket)
+malloc_init(void)
-        int bucket;
 {
-        register union overhead *op;
+        char            *p, b[64];
-        register long sz;               /* size of desired block */
+        int             i, j, save_errno = errno;
-        long amt;                       /* amount to allocate */
-        int nblks;                      /* how many blocks we get */
+        _MALLOC_LOCK_INIT();
+#ifdef MALLOC_EXTRA_SANITY
+        malloc_junk = 1;
+#endif /* MALLOC_EXTRA_SANITY */
+        for (i = 0; i < 3; i++) {
+                switch (i) {
+                case 0:
+                        j = readlink("/etc/malloc.conf", b, sizeof b - 1);
+                        if (j <= 0)
+                                continue;
+                        b[j] = '\0';
+                        p = b;
+                        break;
+                case 1:
+                        if (issetugid() == 0)
+                                p = getenv("MALLOC_OPTIONS");
+                        else
+                                continue;
+                        break;
+                case 2:
+                        p = malloc_options;
+                        break;
+                default:
+                        p = NULL;
+                }
+                for (; p != NULL && *p != '\0'; p++) {
+                        switch (*p) {
+                        case '>':
+                                malloc_cache <<= 1;
+                                break;
+                        case '<':
+                                malloc_cache >>= 1;
+                                break;
+                        case 'a':
+                                malloc_abort = 0;
+                                break;
+                        case 'A':
+                                malloc_abort = 1;
+                                break;
+#ifdef MALLOC_STATS
+                        case 'd':
+                                malloc_stats = 0;
+                                break;
+                        case 'D':
+                                malloc_stats = 1;
+                                break;
+#endif /* MALLOC_STATS */
+                        case 'f':
+                                malloc_freeprot = 0;
+                                break;
+                        case 'F':
+                                malloc_freeprot = 1;
+                                break;
+                        case 'g':
+                                malloc_guard = 0;
+                                break;
+                        case 'G':
+                                malloc_guard = malloc_pagesize;
+                                break;
+                        case 'h':
+                                malloc_hint = 0;
+                                break;
+                        case 'H':
+                                malloc_hint = 1;
+                                break;
+                        case 'j':
+                                malloc_junk = 0;
+                                break;
+                        case 'J':
+                                malloc_junk = 1;
+                                break;
+                        case 'n':
+                                malloc_silent = 0;
+                                break;
+                        case 'N':
+                                malloc_silent = 1;
+                                break;
+                        case 'p':
+                                malloc_ptrguard = 0;
+                                break;
+                        case 'P':
+                                malloc_ptrguard = 1;
+                                break;
+                        case 'r':
+                                malloc_realloc = 0;
+                                break;
+                        case 'R':
+                                malloc_realloc = 1;
+                                break;
+#ifdef __FreeBSD__
+                        case 'u':
+                                malloc_utrace = 0;
+                                break;
+                        case 'U':
+                                malloc_utrace = 1;
+                                break;
+#endif /* __FreeBSD__ */
+                        case 'x':
+                                malloc_xmalloc = 0;
+                                break;
+                        case 'X':
+                                malloc_xmalloc = 1;
+                                break;
+                        case 'z':
+                                malloc_zero = 0;
+                                break;
+                        case 'Z':
+                                malloc_zero = 1;
+                                break;
+                        default:
+                                j = malloc_abort;
+                                malloc_abort = 0;
+                                wrtwarning("unknown char in MALLOC_OPTIONS");
+                                malloc_abort = j;
+                                break;
+                        }
+                }
+        }
+        UTRACE(0, 0, 0);
        /*
-         * sbrk_size <= 0 only for big, FLUFFY, requests (about
+         * We want junk in the entire allocation, and zero only in the part
-         * 2^30 bytes on a VAX, I think) or for a negative arg.
+         * the user asked for.
         */
-        sz = 1 << (bucket + 3);
+        if (malloc_zero)
-#ifdef DEBUG
+                malloc_junk = 1;
-        ASSERT(sz > 0);
-#else
+#ifdef MALLOC_STATS
-        if (sz <= 0)
+        if (malloc_stats && (atexit(malloc_exit) == -1))
+                wrtwarning("atexit(2) failed."
+                    "  Will not be able to dump malloc stats on exit");
+#endif /* MALLOC_STATS */
+        /* Allocate one page for the page directory. */
+        page_dir = (struct pginfo **)MMAP(malloc_pagesize);
+        if (page_dir == MAP_FAILED) {
+                wrterror("mmap(2) failed, check limits");
+                errno = ENOMEM;
                return;
-#endif
-        if (sz < pagesz) {
-                amt = pagesz;
-                nblks = amt / sz;
-        } else {
-                amt = sz + pagesz;
-                nblks = 1;
        }
-        op = (union overhead *)sbrk(amt);
+        pdi_off = (malloc_pagesize - sizeof(struct pdinfo)) & ~(malloc_minsize - 1);
-        /* no more room! */
+        pdi_mod = pdi_off / sizeof(struct pginfo *);
-        if ((long)op == -1)
-                return;
+        last_dir = (struct pdinfo *) ((caddr_t) page_dir + pdi_off);
+        last_dir->base = page_dir;
+        last_dir->prev = last_dir->next = NULL;
+        last_dir->dirnum = malloc_pageshift;
+        /* Been here, done that. */
+        malloc_started++;
+        /* Recalculate the cache size in bytes, and make sure it's nonzero. */
+        if (!malloc_cache)
+                malloc_cache++;
+        malloc_cache <<= malloc_pageshift;
+        errno = save_errno;
+}
+/*
+ * Allocate a number of complete pages
+ */
+static void *
+malloc_pages(size_t size)
+{
+        void            *p, *delay_free = NULL, *tp;
+        int             i;
+        struct pginfo   **pd;
+        struct pdinfo   *pi;
+        u_long          pidx, index;
+        struct pgfree   *pf;
+        size = pageround(size) + malloc_guard;
+        p = NULL;
+        /* Look for free pages before asking for more */
+        for (pf = free_list.next; pf; pf = pf->next) {
+#ifdef MALLOC_EXTRA_SANITY
+                if (pf->size & malloc_pagemask) {
+                        wrterror("(ES): junk length entry on free_list");
+                        errno = EFAULT;
+                        return (NULL);
+                }
+                if (!pf->size) {
+                        wrterror("(ES): zero length entry on free_list");
+                        errno = EFAULT;
+                        return (NULL);
+                }
+                if (pf->page > (pf->page + pf->size)) {
+                        wrterror("(ES): sick entry on free_list");
+                        errno = EFAULT;
+                        return (NULL);
+                }
+                if ((pi = pf->pdir) == NULL) {
+                        wrterror("(ES): invalid page directory on free-list");
+                        errno = EFAULT;
+                        return (NULL);
+                }
+                if ((pidx = PI_IDX(ptr2index(pf->page))) != PD_IDX(pi->dirnum)) {
+                        wrterror("(ES): directory index mismatch on free-list");
+                        errno = EFAULT;
+                        return (NULL);
+                }
+                pd = pi->base;
+                if (pd[PI_OFF(ptr2index(pf->page))] != MALLOC_FREE) {
+                        wrterror("(ES): non-free first page on free-list");
+                        errno = EFAULT;
+                        return (NULL);
+                }
+                pidx = PI_IDX(ptr2index((pf->page) + (pf->size)) - 1);
+                for (pi = pf->pdir; pi != NULL && PD_IDX(pi->dirnum) < pidx;
+                    pi = pi->next)
+                        ;
+                if (pi == NULL || PD_IDX(pi->dirnum) != pidx) {
+                        wrterror("(ES): last page not referenced in page directory");
+                        errno = EFAULT;
+                        return (NULL);
+                }
+                pd = pi->base;
+                if (pd[PI_OFF(ptr2index((pf->page) + (pf->size)) - 1)] != MALLOC_FREE) {
+                        wrterror("(ES): non-free last page on free-list");
+                        errno = EFAULT;
+                        return (NULL);
+                }
+#endif /* MALLOC_EXTRA_SANITY */
+                if (pf->size < size)
+                        continue;
+                if (pf->size == size) {
+                        p = pf->page;
+                        pi = pf->pdir;
+                        if (pf->next != NULL)
+                                pf->next->prev = pf->prev;
+                        pf->prev->next = pf->next;
+                        delay_free = pf;
+                        break;
+                }
+                p = pf->page;
+                pf->page = (char *) pf->page + size;
+                pf->size -= size;
+                pidx = PI_IDX(ptr2index(pf->page));
+                for (pi = pf->pdir; pi != NULL && PD_IDX(pi->dirnum) < pidx;
+                    pi = pi->next)
+                        ;
+                if (pi == NULL || PD_IDX(pi->dirnum) != pidx) {
+                        wrterror("(ES): hole in directories");
+                        errno = EFAULT;
+                        return (NULL);
+                }
+                tp = pf->pdir;
+                pf->pdir = pi;
+                pi = tp;
+                break;
+        }
+        size -= malloc_guard;
+#ifdef MALLOC_EXTRA_SANITY
+        if (p != NULL && pi != NULL) {
+                pidx = PD_IDX(pi->dirnum);
+                pd = pi->base;
+        }
+        if (p != NULL && pd[PI_OFF(ptr2index(p))] != MALLOC_FREE) {
+                wrterror("(ES): allocated non-free page on free-list");
+                errno = EFAULT;
+                return (NULL);
+        }
+#endif /* MALLOC_EXTRA_SANITY */
+        if (p != NULL && (malloc_guard || malloc_freeprot))
+                mprotect(p, size, PROT_READ | PROT_WRITE);
+        size >>= malloc_pageshift;
+        /* Map new pages */
+        if (p == NULL)
+                p = map_pages(size);
+        if (p != NULL) {
+                index = ptr2index(p);
+                pidx = PI_IDX(index);
+                pdir_lookup(index, &pi);
+#ifdef MALLOC_EXTRA_SANITY
+                if (pi == NULL || PD_IDX(pi->dirnum) != pidx) {
+                        wrterror("(ES): mapped pages not found in directory");
+                        errno = EFAULT;
+                        return (NULL);
+                }
+#endif /* MALLOC_EXTRA_SANITY */
+                if (pi != last_dir) {
+                        prev_dir = last_dir;
+                        last_dir = pi;
+                }
+                pd = pi->base;
+                pd[PI_OFF(index)] = MALLOC_FIRST;
+                for (i = 1; i < size; i++) {
+                        if (!PI_OFF(index + i)) {
+                                pidx++;
+                                pi = pi->next;
+#ifdef MALLOC_EXTRA_SANITY
+                                if (pi == NULL || PD_IDX(pi->dirnum) != pidx) {
+                                        wrterror("(ES): hole in mapped pages directory");
+                                        errno = EFAULT;
+                                        return (NULL);
+                                }
+#endif /* MALLOC_EXTRA_SANITY */
+                                pd = pi->base;
+                        }
+                        pd[PI_OFF(index + i)] = MALLOC_FOLLOW;
+                }
+                if (malloc_guard) {
+                        if (!PI_OFF(index + i)) {
+                                pidx++;
+                                pi = pi->next;
+#ifdef MALLOC_EXTRA_SANITY
+                                if (pi == NULL || PD_IDX(pi->dirnum) != pidx) {
+                                        wrterror("(ES): hole in mapped pages directory");
+                                        errno = EFAULT;
+                                        return (NULL);
+                                }
+#endif /* MALLOC_EXTRA_SANITY */
+                                pd = pi->base;
+                        }
+                        pd[PI_OFF(index + i)] = MALLOC_FIRST;
+                }
+                malloc_used += size << malloc_pageshift;
+                malloc_guarded += malloc_guard;
+                if (malloc_junk)
+                        memset(p, SOME_JUNK, size << malloc_pageshift);
+        }
+        if (delay_free) {
+                if (px == NULL)
+                        px = delay_free;
+                else
+                        ifree(delay_free);
+        }
+        return (p);
+}
+/*
+ * Allocate a page of fragments
+ */
+static __inline__ int
+malloc_make_chunks(int bits)
+{
+        struct pginfo   *bp, **pd;
+        struct pdinfo   *pi;
+#ifdef  MALLOC_EXTRA_SANITY
+        u_long          pidx;
+#endif  /* MALLOC_EXTRA_SANITY */
+        void            *pp;
+        long            i, k;
+        size_t          l;
+        /* Allocate a new bucket */
+        pp = malloc_pages((size_t) malloc_pagesize);
+        if (pp == NULL)
+                return (0);
+        /* Find length of admin structure */
+        l = sizeof *bp - sizeof(u_long);
+        l += sizeof(u_long) *
+            (((malloc_pagesize >> bits) + MALLOC_BITS - 1) / MALLOC_BITS);
+        /* Don't waste more than two chunks on this */
        /*
-         * Add new memory allocated to that on
+         * If we are to allocate a memory protected page for the malloc(0)
-         * free list for this hash bucket.
+         * case (when bits=0), it must be from a different page than the
+         * pginfo page.
+         * --> Treat it like the big chunk alloc, get a second data page.
         */
-        nextf[bucket] = op;
+        if (bits != 0 && (1UL << (bits)) <= l + l) {
-        while (--nblks > 0) {
+                bp = (struct pginfo *) pp;
-                op->ov_next = (union overhead *)((caddr_t)op + sz);
+        } else {
-                op = (union overhead *)((caddr_t)op + sz);
+                bp = (struct pginfo *) imalloc(l);
-        }
+                if (bp == NULL) {
+                        ifree(pp);
+                        return (0);
+                }
+        }
+        /* memory protect the page allocated in the malloc(0) case */
+        if (bits == 0) {
+                bp->size = 0;
+                bp->shift = 1;
+                i = malloc_minsize - 1;
+                while (i >>= 1)
+                        bp->shift++;
+                bp->total = bp->free = malloc_pagesize >> bp->shift;
+                bp->page = pp;
+                k = mprotect(pp, malloc_pagesize, PROT_NONE);
+                if (k < 0) {
+                        ifree(pp);
+                        ifree(bp);
+                        return (0);
+                }
+        } else {
+                bp->size = (1UL << bits);
+                bp->shift = bits;
+                bp->total = bp->free = malloc_pagesize >> bits;
+                bp->page = pp;
+        }
+        /* set all valid bits in the bitmap */
+        k = bp->total;
+        i = 0;
+        /* Do a bunch at a time */
+        for (; (k - i) >= MALLOC_BITS; i += MALLOC_BITS)
+                bp->bits[i / MALLOC_BITS] = ~0UL;
+        for (; i < k; i++)
+                bp->bits[i / MALLOC_BITS] |= 1UL << (i % MALLOC_BITS);
+        k = (long)l;
+        if (bp == bp->page) {
+                /* Mark the ones we stole for ourselves */
+                for (i = 0; k > 0; i++) {
+                        bp->bits[i / MALLOC_BITS] &= ~(1UL << (i % MALLOC_BITS));
+                        bp->free--;
+                        bp->total--;
+                        k -= (1 << bits);
+                }
+        }
+        /* MALLOC_LOCK */
+        pdir_lookup(ptr2index(pp), &pi);
+#ifdef MALLOC_EXTRA_SANITY
+        pidx = PI_IDX(ptr2index(pp));
+        if (pi == NULL || PD_IDX(pi->dirnum) != pidx) {
+                wrterror("(ES): mapped pages not found in directory");
+                errno = EFAULT;
+                return (0);
+        }
+#endif /* MALLOC_EXTRA_SANITY */
+        if (pi != last_dir) {
+                prev_dir = last_dir;
+                last_dir = pi;
+        }
+        pd = pi->base;
+        pd[PI_OFF(ptr2index(pp))] = bp;
+        bp->next = page_dir[bits];
+        page_dir[bits] = bp;
+        /* MALLOC_UNLOCK */
+        return (1);
 }
-void
+/*
-free(cp)
+ * Allocate a fragment
-        void *cp;
+ */
-{   
+static void *
-        register long size;
+malloc_bytes(size_t size)
-        register union overhead *op;
+{
+        int             i, j;
-        if (cp == NULL)
+        size_t          k;
-                return;
+        u_long          u, *lp;
-        op = (union overhead *)((caddr_t)cp - sizeof (union overhead));
+        struct pginfo   *bp;
-#ifdef DEBUG
-        ASSERT(op->ov_magic == MAGIC);          /* make sure it was in use */
+        /* Don't bother with anything less than this */
-#else
+        /* unless we have a malloc(0) requests */
-        if (op->ov_magic != MAGIC)
+        if (size != 0 && size < malloc_minsize)
-                return;                         /* sanity */
+                size = malloc_minsize;
-#endif
-#ifdef RCHECK
+        /* Find the right bucket */
-        ASSERT(op->ov_rmagic == RMAGIC);
+        if (size == 0)
-        ASSERT(*(u_short *)((caddr_t)(op + 1) + op->ov_size) == RMAGIC);
+                j = 0;
-#endif
+        else {
-        size = op->ov_index;
+                j = 1;
-        ASSERT(size < NBUCKETS);
+                i = size - 1;
-        op->ov_next = nextf[size];      /* also clobbers ov_magic */
+                while (i >>= 1)
-        nextf[size] = op;
+                        j++;
-#ifdef MSTATS
+        }
-        nmalloc[size]--;
-#endif
+        /* If it's empty, make a page more of that size chunks */
+        if (page_dir[j] == NULL && !malloc_make_chunks(j))
+                return (NULL);
+        bp = page_dir[j];
+        /* Find first word of bitmap which isn't empty */
+        for (lp = bp->bits; !*lp; lp++);
+        /* Find that bit, and tweak it */
+        u = 1;
+        k = 0;
+        while (!(*lp & u)) {
+                u += u;
+                k++;
+        }
+        if (malloc_guard) {
+                /* Walk to a random position. */
+                i = arc4random() % bp->free;
+                while (i > 0) {
+                        u += u;
+                        k++;
+                        if (k >= MALLOC_BITS) {
+                                lp++;
+                                u = 1;
+                                k = 0;
+                        }
+#ifdef MALLOC_EXTRA_SANITY
+                        if (lp - bp->bits > (bp->total - 1) / MALLOC_BITS) {
+                                wrterror("chunk overflow");
+                                errno = EFAULT;
+                                return (NULL);
+                        }
+#endif /* MALLOC_EXTRA_SANITY */
+                        if (*lp & u)
+                                i--;
+                }
+        }
+        *lp ^= u;
+        /* If there are no more free, remove from free-list */
+        if (!--bp->free) {
+                page_dir[j] = bp->next;
+                bp->next = NULL;
+        }
+        /* Adjust to the real offset of that chunk */
+        k += (lp - bp->bits) * MALLOC_BITS;
+        k <<= bp->shift;
+        if (malloc_junk && bp->size != 0)
+                memset((char *)bp->page + k, SOME_JUNK, (size_t)bp->size);
+        return ((u_char *) bp->page + k);
 }
 /*
- * When a program attempts "storage compaction" as mentioned in the
+ * Magic so that malloc(sizeof(ptr)) is near the end of the page.
- * old malloc man page, it realloc's an already freed block.  Usually
- * this is the last block it freed; occasionally it might be farther
- * back.  We have to search all the free lists for the block in order
- * to determine its bucket: 1st we make one pass thru the lists
- * checking only the first block in each; if that fails we search
- * ``realloc_srchlen'' blocks in each list for a match (the variable
- * is extern so the caller can modify it).  If that fails we just copy
- * however many bytes was given to realloc() and hope it's not huge.
 */
-int realloc_srchlen = 4;        /* 4 should be plenty, -1 =>'s whole list */
+#define PTR_GAP         (malloc_pagesize - sizeof(void *))
+#define PTR_SIZE        (sizeof(void *))
+#define PTR_ALIGNED(p)  (((unsigned long)p & malloc_pagemask) == PTR_GAP)
-void *
+/*
-realloc(cp, nbytes)
+ * Allocate a piece of memory
-        void *cp; 
+ */
-        size_t nbytes;
+static void *
-{   
+imalloc(size_t size)
-        register u_long onb;
+{
-        register long i;
+        void            *result;
-        union overhead *op;
+        int             ptralloc = 0;
-        char *res;
-        int was_alloced = 0;
+        if (!malloc_started)
+                malloc_init();
-        if (cp == NULL)
-                return (malloc(nbytes));
+        if (suicide)
-        op = (union overhead *)((caddr_t)cp - sizeof (union overhead));
+                abort();
-        if (op->ov_magic == MAGIC) {
-                was_alloced++;
+        /* does not matter if malloc_bytes fails */
-                i = op->ov_index;
+        if (px == NULL)
+                px = malloc_bytes(sizeof *px);
+        if (malloc_ptrguard && size == PTR_SIZE) {
+                ptralloc = 1;
+                size = malloc_pagesize;
+        }
+        if ((size + malloc_pagesize) < size) {  /* Check for overflow */
+                result = NULL;
+                errno = ENOMEM;
+        } else if (size <= malloc_maxsize)
+                result = malloc_bytes(size);
+        else
+                result = malloc_pages(size);
+        if (malloc_abort == 1 && result == NULL)
+                wrterror("allocation failed");
+        if (malloc_zero && result != NULL)
+                memset(result, 0, size);
+        if (result && ptralloc)
+                return ((char *) result + PTR_GAP);
+        return (result);
+}
+/*
+ * Change the size of an allocation.
+ */
+static void *
+irealloc(void *ptr, size_t size)
+{
+        void            *p;
+        size_t          osize;
+        u_long          index, i;
+        struct pginfo   **mp;
+        struct pginfo   **pd;
+        struct pdinfo   *pi;
+#ifdef  MALLOC_EXTRA_SANITY
+        u_long          pidx;
+#endif  /* MALLOC_EXTRA_SANITY */
+        if (suicide)
+                abort();
+        if (!malloc_started) {
+                wrtwarning("malloc() has never been called");
+                return (NULL);
+        }
+        if (malloc_ptrguard && PTR_ALIGNED(ptr)) {
+                if (size <= PTR_SIZE)
+                        return (ptr);
+                p = imalloc(size);
+                if (p)
+                        memcpy(p, ptr, PTR_SIZE);
+                ifree(ptr);
+                return (p);
+        }
+        index = ptr2index(ptr);
+        if (index < malloc_pageshift) {
+                wrtwarning("junk pointer, too low to make sense");
+                return (NULL);
+        }
+        if (index > last_index) {
+                wrtwarning("junk pointer, too high to make sense");
+                return (NULL);
+        }
+        pdir_lookup(index, &pi);
+#ifdef MALLOC_EXTRA_SANITY
+        pidx = PI_IDX(index);
+        if (pi == NULL || PD_IDX(pi->dirnum) != pidx) {
+                wrterror("(ES): mapped pages not found in directory");
+                errno = EFAULT;
+                return (NULL);
+        }
+#endif /* MALLOC_EXTRA_SANITY */
+        if (pi != last_dir) {
+                prev_dir = last_dir;
+                last_dir = pi;
+        }
+        pd = pi->base;
+        mp = &pd[PI_OFF(index)];
+        if (*mp == MALLOC_FIRST) {      /* Page allocation */
+                /* Check the pointer */
+                if ((u_long) ptr & malloc_pagemask) {
+                        wrtwarning("modified (page-) pointer");
+                        return (NULL);
+                }
+                /* Find the size in bytes */
+                i = index;
+                if (!PI_OFF(++i)) {
+                        pi = pi->next;
+                        if (pi != NULL && PD_IDX(pi->dirnum) != PI_IDX(i))
+                                pi = NULL;
+                        if (pi != NULL)
+                                pd = pi->base;
+                }
+                for (osize = malloc_pagesize;
+                    pi != NULL && pd[PI_OFF(i)] == MALLOC_FOLLOW;) {
+                        osize += malloc_pagesize;
+                        if (!PI_OFF(++i)) {
+                                pi = pi->next;
+                                if (pi != NULL && PD_IDX(pi->dirnum) != PI_IDX(i))
+                                        pi = NULL;
+                                if (pi != NULL)
+                                        pd = pi->base;
+                        }
+                }
+                if (!malloc_realloc && size <= osize &&
+                    size > osize - malloc_pagesize) {
+                        if (malloc_junk)
+                                memset((char *)ptr + size, SOME_JUNK, osize - size);
+                        return (ptr);   /* ..don't do anything else. */
+                }
+        } else if (*mp >= MALLOC_MAGIC) {       /* Chunk allocation */
+                /* Check the pointer for sane values */
+                if ((u_long) ptr & ((1UL << ((*mp)->shift)) - 1)) {
+                        wrtwarning("modified (chunk-) pointer");
+                        return (NULL);
+                }
+                /* Find the chunk index in the page */
+                i = ((u_long) ptr & malloc_pagemask) >> (*mp)->shift;
+                /* Verify that it isn't a free chunk already */
+                if ((*mp)->bits[i / MALLOC_BITS] & (1UL << (i % MALLOC_BITS))) {
+                        wrtwarning("chunk is already free");
+                        return (NULL);
+                }
+                osize = (*mp)->size;
+                if (!malloc_realloc && size <= osize &&
+                    (size > osize / 2 || osize == malloc_minsize)) {
+                        if (malloc_junk)
+                                memset((char *) ptr + size, SOME_JUNK, osize - size);
+                        return (ptr);   /* ..don't do anything else. */
+                }
+        } else {
+                wrtwarning("irealloc: pointer to wrong page");
+                return (NULL);
+        }
+        p = imalloc(size);
+        if (p != NULL) {
+                /* copy the lesser of the two sizes, and free the old one */
+                /* Don't move from/to 0 sized region !!! */
+                if (osize != 0 && size != 0) {
+                        if (osize < size)
+                                memcpy(p, ptr, osize);
+                        else
+                                memcpy(p, ptr, size);
+                }
+                ifree(ptr);
+        }
+        return (p);
+}
+/*
+ * Free a sequence of pages
+ */
+static __inline__ void
+free_pages(void *ptr, u_long index, struct pginfo * info)
+{
+        u_long          i, pidx, lidx;
+        size_t          l, cachesize = 0;
+        struct pginfo   **pd;
+        struct pdinfo   *pi, *spi;
+        struct pgfree   *pf, *pt = NULL;
+        caddr_t         tail;
+        if (info == MALLOC_FREE) {
+                wrtwarning("page is already free");
+                return;
+        }
+        if (info != MALLOC_FIRST) {
+                wrtwarning("free_pages: pointer to wrong page");
+                return;
+        }
+        if ((u_long) ptr & malloc_pagemask) {
+                wrtwarning("modified (page-) pointer");
+                return;
+        }
+        /* Count how many pages and mark them free at the same time */
+        pidx = PI_IDX(index);
+        pdir_lookup(index, &pi);
+#ifdef MALLOC_EXTRA_SANITY
+        if (pi == NULL || PD_IDX(pi->dirnum) != pidx) {
+                wrterror("(ES): mapped pages not found in directory");
+                errno = EFAULT;
+                return;
+        }
+#endif /* MALLOC_EXTRA_SANITY */
+        spi = pi;               /* Save page index for start of region. */
+        pd = pi->base;
+        pd[PI_OFF(index)] = MALLOC_FREE;
+        i = 1;
+        if (!PI_OFF(index + i)) {
+                pi = pi->next;
+                if (pi == NULL || PD_IDX(pi->dirnum) != PI_IDX(index + i))
+                        pi = NULL;
+                else
+                        pd = pi->base;
+        }
+        while (pi != NULL && pd[PI_OFF(index + i)] == MALLOC_FOLLOW) {
+                pd[PI_OFF(index + i)] = MALLOC_FREE;
+                i++;
+                if (!PI_OFF(index + i)) {
+                        if ((pi = pi->next) == NULL ||
+                            PD_IDX(pi->dirnum) != PI_IDX(index + i))
+                                pi = NULL;
+                        else
+                                pd = pi->base;
+                }
+        }
+        l = i << malloc_pageshift;
+        if (malloc_junk)
+                memset(ptr, SOME_JUNK, l);
+        malloc_used -= l;
+        malloc_guarded -= malloc_guard;
+        if (malloc_guard) {
+#ifdef MALLOC_EXTRA_SANITY
+                if (pi == NULL || PD_IDX(pi->dirnum) != PI_IDX(index + i)) {
+                        wrterror("(ES): hole in mapped pages directory");
+                        errno = EFAULT;
+                        return;
+                }
+#endif /* MALLOC_EXTRA_SANITY */
+                pd[PI_OFF(index + i)] = MALLOC_FREE;
+                l += malloc_guard;
+        }
+        tail = (caddr_t)ptr + l;
+        if (malloc_hint)
+                madvise(ptr, l, MADV_FREE);
+        if (malloc_freeprot)
+                mprotect(ptr, l, PROT_NONE);
+        /* Add to free-list. */
+        if (px == NULL && (px = malloc_bytes(sizeof *px)) == NULL)
+                        goto not_return;
+        px->page = ptr;
+        px->pdir = spi;
+        px->size = l;
+        if (free_list.next == NULL) {
+                /* Nothing on free list, put this at head. */
+                px->next = NULL;
+                px->prev = &free_list;
+                free_list.next = px;
+                pf = px;
+                px = NULL;
        } else {
                /*
-                 * Already free, doing "compaction".
+                 * Find the right spot, leave pf pointing to the modified
-                 *
+                 * entry.
-                 * Search for the old block of memory on the
-                 * free list.  First, check the most common
-                 * case (last element free'd), then (this failing)
-                 * the last ``realloc_srchlen'' items free'd.
-                 * If all lookups fail, then assume the size of
-                 * the memory block being realloc'd is the
-                 * largest possible (so that all "nbytes" of new
-                 * memory are copied into).  Note that this could cause
-                 * a memory fault if the old area was tiny, and the moon
-                 * is gibbous.  However, that is very unlikely.
                 */
-                if ((i = findbucket(op, 1)) < 0 &&
-                    (i = findbucket(op, realloc_srchlen)) < 0)
+                /* Race ahead here, while calculating cache size. */
-                        i = NBUCKETS;
+                for (pf = free_list.next;
+                    (caddr_t)ptr > ((caddr_t)pf->page + pf->size)
+                    && pf->next != NULL;
+                    pf = pf->next)
+                        cachesize += pf->size;
+                /* Finish cache size calculation. */
+                pt = pf;
+                while (pt) {
+                        cachesize += pt->size;
+                        pt = pt->next;
+                }
+                if ((caddr_t)pf->page > tail) {
+                        /* Insert before entry */
+                        px->next = pf;
+                        px->prev = pf->prev;
+                        pf->prev = px;
+                        px->prev->next = px;
+                        pf = px;
+                        px = NULL;
+                } else if (((caddr_t)pf->page + pf->size) == ptr) {
+                        /* Append to the previous entry. */
+                        cachesize -= pf->size;
+                        pf->size += l;
+                        if (pf->next != NULL &&
+                            pf->next->page == ((caddr_t)pf->page + pf->size)) {
+                                /* And collapse the next too. */
+                                pt = pf->next;
+                                pf->size += pt->size;
+                                pf->next = pt->next;
+                                if (pf->next != NULL)
+                                        pf->next->prev = pf;
+                        }
+                } else if (pf->page == tail) {
+                        /* Prepend to entry. */
+                        cachesize -= pf->size;
+                        pf->size += l;
+                        pf->page = ptr;
+                        pf->pdir = spi;
+                } else if (pf->next == NULL) {
+                        /* Append at tail of chain. */
+                        px->next = NULL;
+                        px->prev = pf;
+                        pf->next = px;
+                        pf = px;
+                        px = NULL;
+                } else {
+                        wrterror("freelist is destroyed");
+                        errno = EFAULT;
+                        return;
+                }
        }
-        onb = 1 << (i + 3);
-        if (onb < pagesz)
+        if (pf->pdir != last_dir) {
-                onb -= sizeof (*op) + RSLOP;
+                prev_dir = last_dir;
-        else
+                last_dir = pf->pdir;
-                onb += pagesz - sizeof (*op) - RSLOP;
+        }
-        /* avoid the copy if same size block */
-        if (was_alloced) {
+        /* Return something to OS ? */
-                if (i) {
+        if (pf->size > (malloc_cache - cachesize)) {
-                        i = 1 << (i + 2);
-                        if (i < pagesz)
+                /*
-                                i -= sizeof (*op) + RSLOP;
+                 * Keep the cache intact.  Notice that the '>' above guarantees that
-                        else
+                 * the pf will always have at least one page afterwards.
-                                i += pagesz - sizeof (*op) - RSLOP;
+                 */
+                if (munmap((char *) pf->page + (malloc_cache - cachesize),
+                    pf->size - (malloc_cache - cachesize)) != 0)
+                        goto not_return;
+                tail = (caddr_t)pf->page + pf->size;
+                lidx = ptr2index(tail) - 1;
+                pf->size = malloc_cache - cachesize;
+                index = ptr2index((caddr_t)pf->page + pf->size);
+                pidx = PI_IDX(index);
+                if (prev_dir != NULL && PD_IDX(prev_dir->dirnum) >= pidx)
+                        prev_dir = NULL;        /* Will be wiped out below ! */
+                for (pi = pf->pdir; pi != NULL && PD_IDX(pi->dirnum) < pidx;
+                    pi = pi->next)
+                        ;
+                spi = pi;
+                if (pi != NULL && PD_IDX(pi->dirnum) == pidx) {
+                        pd = pi->base;
+                        for (i = index; i <= lidx;) {
+                                if (pd[PI_OFF(i)] != MALLOC_NOT_MINE) {
+                                        pd[PI_OFF(i)] = MALLOC_NOT_MINE;
+#ifdef MALLOC_EXTRA_SANITY
+                                        if (!PD_OFF(pi->dirnum)) {
+                                                wrterror("(ES): pages directory underflow");
+                                                errno = EFAULT;
+                                                return;
+                                        }
+#endif /* MALLOC_EXTRA_SANITY */
+                                        pi->dirnum--;
+                                }
+#ifdef MALLOC_EXTRA_SANITY
+                                else
+                                        wrtwarning("(ES): page already unmapped");
+#endif /* MALLOC_EXTRA_SANITY */
+                                i++;
+                                if (!PI_OFF(i)) {
+                                        /*
+                                         * If no page in that dir, free
+                                         * directory page.
+                                         */
+                                        if (!PD_OFF(pi->dirnum)) {
+                                                /* Remove from list. */
+                                                if (spi == pi)
+                                                        spi = pi->prev;
+                                                if (pi->prev != NULL)
+                                                        pi->prev->next = pi->next;
+                                                if (pi->next != NULL)
+                                                        pi->next->prev = pi->prev;
+                                                pi = pi->next;
+                                                munmap(pd, malloc_pagesize);
+                                        } else
+                                                pi = pi->next;
+                                        if (pi == NULL ||
+                                            PD_IDX(pi->dirnum) != PI_IDX(i))
+                                                break;
+                                        pd = pi->base;
+                                }
+                        }
+                        if (pi && !PD_OFF(pi->dirnum)) {
+                                /* Resulting page dir is now empty. */
+                                /* Remove from list. */
+                                if (spi == pi)  /* Update spi only if first. */
+                                        spi = pi->prev;
+                                if (pi->prev != NULL)
+                                        pi->prev->next = pi->next;
+                                if (pi->next != NULL)
+                                        pi->next->prev = pi->prev;
+                                pi = pi->next;
+                                munmap(pd, malloc_pagesize);
+                        }
+                }
+                if (pi == NULL && malloc_brk == tail) {
+                        /* Resize down the malloc upper boundary. */
+                        last_index = index - 1;
+                        malloc_brk = index2ptr(index);
+                }
+                /* XXX: We could realloc/shrink the pagedir here I guess. */
+                if (pf->size == 0) {    /* Remove from free-list as well. */
+                        if (px)
+                                ifree(px);
+                        if ((px = pf->prev) != &free_list) {
+                                if (pi == NULL && last_index == (index - 1)) {
+                                        if (spi == NULL) {
+                                                malloc_brk = NULL;
+                                                i = 11;
+                                        } else {
+                                                pd = spi->base;
+                                                if (PD_IDX(spi->dirnum) < pidx)
+                                                        index =
+                                                            ((PD_IDX(spi->dirnum) + 1) *
+                                                            pdi_mod) - 1;
+                                                for (pi = spi, i = index;
+                                                    pd[PI_OFF(i)] == MALLOC_NOT_MINE;
+                                                    i--)
+#ifdef MALLOC_EXTRA_SANITY
+                                                        if (!PI_OFF(i)) {
+                                                                pi = pi->prev;
+                                                                if (pi == NULL || i == 0)
+                                                                        break;
+                                                                pd = pi->base;
+                                                                i = (PD_IDX(pi->dirnum) + 1) * pdi_mod;
+                                                        }
+#else /* !MALLOC_EXTRA_SANITY */
+                                                {
+                                                }
+#endif /* MALLOC_EXTRA_SANITY */
+                                                malloc_brk = index2ptr(i + 1);
+                                        }
+                                        last_index = i;
+                                }
+                                if ((px->next = pf->next) != NULL)
+                                        px->next->prev = px;
+                        } else {
+                                if ((free_list.next = pf->next) != NULL)
+                                        free_list.next->prev = &free_list;
+                        }
+                        px = pf;
+                        last_dir = prev_dir;
+                        prev_dir = NULL;
                }
-                if (nbytes <= onb && nbytes > i) {
-#ifdef RCHECK
-                        op->ov_size = (nbytes + RSLOP - 1) & ~(RSLOP - 1);
-                        *(u_short *)((caddr_t)(op + 1) + op->ov_size) = RMAGIC;
-#endif
-                        return(cp);
-                } else
-                        free(cp);
        }
-        if ((res = malloc(nbytes)) == NULL)
+not_return:
-                return (NULL);
+        if (pt != NULL)
-        if (cp != res)          /* common optimization if "compacting" */
+                ifree(pt);
-                bcopy(cp, res, (nbytes < onb) ? nbytes : onb);
-        return (res);
 }
 /*
- * Search ``srchlen'' elements of each free list for a block whose
+ * Free a chunk, and possibly the page it's on, if the page becomes empty.
- * header starts at ``freep''.  If srchlen is -1 search the whole list.
- * Return bucket number, or -1 if not found.
 */
-static
-findbucket(freep, srchlen)
+/* ARGSUSED */
-        union overhead *freep;
+static __inline__ void
-        int srchlen;
+free_bytes(void *ptr, u_long index, struct pginfo * info)
 {
-        register union overhead *p;
+        struct pginfo   **mp, **pd;
-        register int i, j;
+        struct pdinfo   *pi;
+#ifdef  MALLOC_EXTRA_SANITY
+        u_long          pidx;
+#endif  /* MALLOC_EXTRA_SANITY */
+        void            *vp;
+        long            i;
-        for (i = 0; i < NBUCKETS; i++) {
+        /* Find the chunk number on the page */
-                j = 0;
+        i = ((u_long) ptr & malloc_pagemask) >> info->shift;
-                for (p = nextf[i]; p && j != srchlen; p = p->ov_next) {
-                        if (p == freep)
+        if ((u_long) ptr & ((1UL << (info->shift)) - 1)) {
-                                return (i);
+                wrtwarning("modified (chunk-) pointer");
-                        j++;
+                return;
+        }
+        if (info->bits[i / MALLOC_BITS] & (1UL << (i % MALLOC_BITS))) {
+                wrtwarning("chunk is already free");
+                return;
+        }
+        if (malloc_junk && info->size != 0)
+                memset(ptr, SOME_JUNK, (size_t)info->size);
+        info->bits[i / MALLOC_BITS] |= 1UL << (i % MALLOC_BITS);
+        info->free++;
+        if (info->size != 0)
+                mp = page_dir + info->shift;
+        else
+                mp = page_dir;
+        if (info->free == 1) {
+                /* Page became non-full */
+                /* Insert in address order */
+                while (*mp != NULL && (*mp)->next != NULL &&
+                    (*mp)->next->page < info->page)
+                        mp = &(*mp)->next;
+                info->next = *mp;
+                *mp = info;
+                return;
+        }
+        if (info->free != info->total)
+                return;
+        /* Find & remove this page in the queue */
+        while (*mp != info) {
+                mp = &((*mp)->next);
+#ifdef MALLOC_EXTRA_SANITY
+                if (!*mp) {
+                        wrterror("(ES): Not on queue");
+                        errno = EFAULT;
+                        return;
                }
+#endif /* MALLOC_EXTRA_SANITY */
+        }
+        *mp = info->next;
+        /* Free the page & the info structure if need be */
+        pdir_lookup(ptr2index(info->page), &pi);
+#ifdef MALLOC_EXTRA_SANITY
+        pidx = PI_IDX(ptr2index(info->page));
+        if (pi == NULL || PD_IDX(pi->dirnum) != pidx) {
+                wrterror("(ES): mapped pages not found in directory");
+                errno = EFAULT;
+                return;
+        }
+#endif /* MALLOC_EXTRA_SANITY */
+        if (pi != last_dir) {
+                prev_dir = last_dir;
+                last_dir = pi;
        }
-        return (-1);
+        pd = pi->base;
+        pd[PI_OFF(ptr2index(info->page))] = MALLOC_FIRST;
+        /* If the page was mprotected, unprotect it before releasing it */
+        if (info->size == 0)
+                mprotect(info->page, malloc_pagesize, PROT_READ | PROT_WRITE);
+        vp = info->page;        /* Order is important ! */
+        if (vp != (void *) info)
+                ifree(info);
+        ifree(vp);
+}
+static void
+ifree(void *ptr)
+{
+        struct pginfo   *info, **pd;
+        u_long          index;
+#ifdef  MALLOC_EXTRA_SANITY
+        u_long          pidx;
+#endif  /* MALLOC_EXTRA_SANITY */
+        struct pdinfo   *pi;
+        if (!malloc_started) {
+                wrtwarning("malloc() has never been called");
+                return;
+        }
+        /* If we're already sinking, don't make matters any worse. */
+        if (suicide)
+                return;
+        if (malloc_ptrguard && PTR_ALIGNED(ptr))
+                ptr = (char *) ptr - PTR_GAP;
+        index = ptr2index(ptr);
+        if (index < malloc_pageshift) {
+                warnx("(%p)", ptr);
+                wrtwarning("ifree: junk pointer, too low to make sense");
+                return;
+        }
+        if (index > last_index) {
+                warnx("(%p)", ptr);
+                wrtwarning("ifree: junk pointer, too high to make sense");
+                return;
+        }
+        pdir_lookup(index, &pi);
+#ifdef MALLOC_EXTRA_SANITY
+        pidx = PI_IDX(index);
+        if (pi == NULL || PD_IDX(pi->dirnum) != pidx) {
+                wrterror("(ES): mapped pages not found in directory");
+                errno = EFAULT;
+                return;
+        }
+#endif /* MALLOC_EXTRA_SANITY */
+        if (pi != last_dir) {
+                prev_dir = last_dir;
+                last_dir = pi;
+        }
+        pd = pi->base;
+        info = pd[PI_OFF(index)];
+        if (info < MALLOC_MAGIC)
+                free_pages(ptr, index, info);
+        else
+                free_bytes(ptr, index, info);
+        /* does not matter if malloc_bytes fails */
+        if (px == NULL)
+                px = malloc_bytes(sizeof *px);
+        return;
 }
-#ifdef MSTATS
 /*
- * mstats - print out statistics about malloc
+ * Common function for handling recursion.  Only
- * 
+ * print the error message once, to avoid making the problem
- * Prints two lines of numbers, one showing the length of the free list
+ * potentially worse.
- * for each size category, the second showing the number of mallocs -
- * frees for each size category.
 */
-mstats(s)
+static void
-        char *s;
+malloc_recurse(void)
 {
-        register int i, j;
+        static int      noprint;
-        register union overhead *p;
-        int totfree = 0,
+        if (noprint == 0) {
-        totused = 0;
+                noprint = 1;
+                wrtwarning("recursive call");
-        fprintf(stderr, "Memory allocation statistics %s\nfree:\t", s);
+        }
-        for (i = 0; i < NBUCKETS; i++) {
+        malloc_active--;
-                for (j = 0, p = nextf[i]; p; p = p->ov_next, j++)
+        _MALLOC_UNLOCK();
-                        ;
+        errno = EDEADLK;
-                fprintf(stderr, " %d", j);
+}
-                totfree += j * (1 << (i + 3));
-        }
+/*
-        fprintf(stderr, "\nused:\t");
+ * These are the public exported interface routines.
-        for (i = 0; i < NBUCKETS; i++) {
+ */
-                fprintf(stderr, " %d", nmalloc[i]);
+void *
-                totused += nmalloc[i] * (1 << (i + 3));
+malloc(size_t size)
-        }
+{
-        fprintf(stderr, "\n\tTotal in use: %d, total free: %d\n",
+        void            *r;
-            totused, totfree);
+        _MALLOC_LOCK();
+        malloc_func = " in malloc():";
+        if (malloc_active++) {
+                malloc_recurse();
+                return (NULL);
+        }
+        r = imalloc(size);
+        UTRACE(0, size, r);
+        malloc_active--;
+        _MALLOC_UNLOCK();
+        if (malloc_xmalloc && r == NULL) {
+                wrterror("out of memory");
+                errno = ENOMEM;
+        }
+        return (r);
+}
+void
+free(void *ptr)
+{
+        /* This is legal. XXX quick path */
+        if (ptr == NULL)
+                return;
+        _MALLOC_LOCK();
+        malloc_func = " in free():";
+        if (malloc_active++) {
+                malloc_recurse();
+                return;
+        }
+        ifree(ptr);
+        UTRACE(ptr, 0, 0);
+        malloc_active--;
+        _MALLOC_UNLOCK();
+        return;
+}
+void *
+realloc(void *ptr, size_t size)
+{
+        void            *r;
+        _MALLOC_LOCK();
+        malloc_func = " in realloc():";
+        if (malloc_active++) {
+                malloc_recurse();
+                return (NULL);
+        }
+        if (ptr == NULL)
+                r = imalloc(size);
+        else
+                r = irealloc(ptr, size);
+        UTRACE(ptr, size, r);
+        malloc_active--;
+        _MALLOC_UNLOCK();
+        if (malloc_xmalloc && r == NULL) {
+                wrterror("out of memory");
+                errno = ENOMEM;
+        }
+        return (r);
 }
-#endif
diff --git a/src/lib/libc/stdlib/merge.c b/src/lib/libc/stdlib/merge.c
index 381fdc0830..623f652134 100644
--- a/src/lib/libc/stdlib/merge.c
+++ b/src/lib/libc/stdlib/merge.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: merge.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
 /*-
 * Copyright (c) 1992, 1993
 *      The Regents of the University of California.  All rights reserved.
@@ -13,11 +14,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -34,11 +31,6 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char sccsid[] = "from: @(#)merge.c     8.2 (Berkeley) 2/14/94";*/
-static char *rcsid = "$Id: merge.c,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 /*
 * Hybrid exponential search/linear search merge sort with hybrid
 * natural/pairwise first pass.  Requires about .3% more comparisons
@@ -59,8 +51,8 @@ static char *rcsid = "$Id: merge.c,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $";
 #include <stdlib.h>
 #include <string.h>
-static void setup __P((u_char *, u_char *, size_t, size_t, int (*)()));
+static void setup(u_char *, u_char *, size_t, size_t, int (*)());
-static void insertionsort __P((u_char *, size_t, size_t, int (*)()));
+static void insertionsort(u_char *, size_t, size_t, int (*)());
 #define ISIZE sizeof(int)
 #define PSIZE sizeof(u_char *)
@@ -96,15 +88,12 @@ static void insertionsort __P((u_char *, size_t, size_t, int (*)()));
 * Arguments are as for qsort.
 */
 int
-mergesort(base, nmemb, size, cmp)
+mergesort(void *base, size_t nmemb, size_t size,
-        void *base;
+    int (*cmp)(const void *, const void *))
-        size_t nmemb;
-        register size_t size;
-        int (*cmp) __P((const void *, const void *));
 {
-        register int i, sense;
+        int i, sense;
        int big, iflag;
-        register u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
+        u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
        u_char *list2, *list1, *p2, *p, *last, **p1;
        if (size < PSIZE / 2) {         /* Pointers must fit into 2 * size. */
@@ -148,7 +137,7 @@ mergesort(base, nmemb, size, cmp)
                                sense = 0;
                        }
                        if (!big) {     /* here i = 0 */
-LINEAR:                         while ((b += size) < t && cmp(q, b) >sense)
+                                while ((b += size) < t && cmp(q, b) >sense)
                                        if (++i == 6) {
                                                big = 1;
                                                goto EXPONENTIAL;
@@ -169,7 +158,7 @@ EXPONENTIAL:	    		for (i = size; ; i <<= 1)
                                                goto FASTCASE;
                                        } else
                                                b = p;
-SLOWCASE:                       while (t > b+size) {
+                                while (t > b+size) {
                                        i = (((t - b) / size) >> 1) * size;
                                        if ((*cmp)(q, p = b + i) <= sense)
                                                t = p;
@@ -256,10 +245,8 @@ COPY:	    			b = t;
 * is defined.  Otherwise simple pairwise merging is used.)
 */
 void
-setup(list1, list2, n, size, cmp)
+setup(u_char *list1, u_char *list2, size_t n, size_t size,
-        size_t n, size;
+    int (*cmp)(const void *, const void *))
-        int (*cmp) __P((const void *, const void *));
-        u_char *list1, *list2;
 {
        int i, length, size2, tmp, sense;
        u_char *f1, *f2, *s, *l2, *last, *p2;
@@ -330,10 +317,8 @@ setup(list1, list2, n, size, cmp)
 * last 4 elements.
 */
 static void
-insertionsort(a, n, size, cmp)
+insertionsort(u_char *a, size_t n, size_t size,
-        u_char *a;
+    int (*cmp)(const void *, const void *))
-        size_t n, size;
-        int (*cmp) __P((const void *, const void *));
 {
        u_char *ai, *s, *t, *u, tmp;
        int i;
diff --git a/src/lib/libc/stdlib/mrand48.c b/src/lib/libc/stdlib/mrand48.c
index 43356e66b3..977264aba5 100644
--- a/src/lib/libc/stdlib/mrand48.c
+++ b/src/lib/libc/stdlib/mrand48.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: mrand48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
 /*
 * Copyright (c) 1993 Martin Birgmeier
 * All rights reserved.
diff --git a/src/lib/libc/stdlib/nrand48.c b/src/lib/libc/stdlib/nrand48.c
index 63f839cb05..f1f548c3af 100644
--- a/src/lib/libc/stdlib/nrand48.c
+++ b/src/lib/libc/stdlib/nrand48.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: nrand48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
 /*
 * Copyright (c) 1993 Martin Birgmeier
 * All rights reserved.
diff --git a/src/lib/libc/stdlib/putenv.c b/src/lib/libc/stdlib/putenv.c
index 2194c2c608..54482f6a14 100644
--- a/src/lib/libc/stdlib/putenv.c
+++ b/src/lib/libc/stdlib/putenv.c
@@ -1,6 +1,7 @@
+/*      $OpenBSD: putenv.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
 /*-
- * Copyright (c) 1988 The Regents of the University of California.
+ * Copyright (c) 1988, 1993
- * All rights reserved.
+ *     The Regents of the University of California.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,29 +28,23 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)putenv.c     5.4 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: putenv.c,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 #include <string.h>
 int
-putenv(str)
+putenv(const char *str)
-        const char *str;
 {
-        register char *p, *equal;
+        char *p, *equal;
        int rval;
-        if (!(p = strdup(str)))
+        if ((p = strdup(str)) == NULL)
-                return(1);
+                return (-1);
-        if (!(equal = strchr(p, '='))) {
+        if ((equal = strchr(p, '=')) == NULL) {
                (void)free(p);
-                return(1);
+                return (-1);
        }
        *equal = '\0';
        rval = setenv(p, equal + 1, 1);
        (void)free(p);
-        return(rval);
+        return (rval);
 }
diff --git a/src/lib/libc/stdlib/qabs.3 b/src/lib/libc/stdlib/qabs.3
index cb1e052191..863758e1c7 100644
--- a/src/lib/libc/stdlib/qabs.3
+++ b/src/lib/libc/stdlib/qabs.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)labs.3        5.3 (Berkeley) 6/29/91
+.\"     $OpenBSD: qabs.3,v 1.10 2006/01/15 17:31:06 jmc Exp $
-.\"     $Id: qabs.3,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt QABS 3
@@ -49,14 +44,14 @@
 .Sh DESCRIPTION
 The
 .Fn qabs
-function
+function returns the absolute value of the quad integer
-returns the absolute value of the quad integer
+.Fa j .
-.Ar j .
 .Sh SEE ALSO
 .Xr abs 3 ,
-.Xr labs 3 ,
-.Xr floor 3 ,
 .Xr cabs 3 ,
+.Xr floor 3 ,
+.Xr imaxabs 3 ,
+.Xr labs 3 ,
 .Xr math 3
 .Sh BUGS
 The absolute value of the most negative integer remains negative.
diff --git a/src/lib/libc/stdlib/qabs.c b/src/lib/libc/stdlib/qabs.c
index 9c51a8baa9..656b93c822 100644
--- a/src/lib/libc/stdlib/qabs.c
+++ b/src/lib/libc/stdlib/qabs.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: qabs.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
 /*-
 * Copyright (c) 1990 The Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,16 +28,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)labs.c       5.2 (Berkeley) 5/17/90";*/
-static char *rcsid = "$Id: qabs.c,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 quad_t
-qabs(j)
+qabs(quad_t j)
-        quad_t j;
 {
        return(j < 0 ? -j : j);
 }
diff --git a/src/lib/libc/stdlib/qdiv.3 b/src/lib/libc/stdlib/qdiv.3
index 0efcfc96ef..643672ea5b 100644
--- a/src/lib/libc/stdlib/qdiv.3
+++ b/src/lib/libc/stdlib/qdiv.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)qdiv.3        5.3 (Berkeley) 6/29/91
+.\"     $OpenBSD: qdiv.3,v 1.7 2006/01/13 17:58:09 millert Exp $
-.\"     $Id: qdiv.3,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt QDIV 3
@@ -49,18 +44,19 @@
 .Sh DESCRIPTION
 The
 .Fn qdiv
-function
+function computes the value
-computes the value
+.Fa num Ns / Ns Fa denom
-.Ar num/denom
 and returns the quotient and remainder in a structure named
-.Ar qdiv_t
+.Li qdiv_t
 that contains two
-.Em quad integer
+.Li quad integer
 members named
-.Ar quot
+.Fa quot
 and
-.Ar rem .
+.Fa rem .
 .Sh SEE ALSO
 .Xr div 3 ,
+.Xr imaxdiv 3 ,
 .Xr ldiv 3 ,
+.Xr lldiv 3 ,
 .Xr math 3
diff --git a/src/lib/libc/stdlib/qdiv.c b/src/lib/libc/stdlib/qdiv.c
index 8f8e3f89c4..f3db0915ed 100644
--- a/src/lib/libc/stdlib/qdiv.c
+++ b/src/lib/libc/stdlib/qdiv.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: qdiv.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
 /*
 * Copyright (c) 1990 Regents of the University of California.
 * All rights reserved.
@@ -13,11 +14,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -34,16 +31,10 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)ldiv.c       5.2 (Berkeley) 4/16/91";*/
-static char *rcsid = "$Id: qdiv.c,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>             /* qdiv_t */
 qdiv_t
-qdiv(num, denom)
+qdiv(quad_t num, quad_t denom)
-        quad_t num, denom;
 {
        qdiv_t r;
diff --git a/src/lib/libc/stdlib/qsort.3 b/src/lib/libc/stdlib/qsort.3
index eb122cde12..668ea90243 100644
--- a/src/lib/libc/stdlib/qsort.3
+++ b/src/lib/libc/stdlib/qsort.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,14 +29,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)qsort.3       8.1 (Berkeley) 6/4/93
+.\"     $OpenBSD: qsort.3,v 1.14 2003/10/01 08:11:58 jmc Exp $
-.\"     $Id: qsort.3,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $
 .\"
 .Dd June 4, 1993
 .Dt QSORT 3
 .Os
 .Sh NAME
-.Nm qsort, heapsort, mergesort
+.Nm qsort ,
+.Nm heapsort ,
+.Nm mergesort
 .Nd sort functions
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
@@ -72,7 +69,7 @@ objects, the initial member of which is pointed to by
 .Fa base .
 The size of each object is specified by
 .Fa size .
-.Fn Mergesort
+.Fn mergesort
 behaves similarly, but
 .Em requires
 that
@@ -106,51 +103,49 @@ is stable.
 .Pp
 The
 .Fn qsort
-function is an implementation of C.A.R. Hoare's ``quicksort'' algorithm,
+function is an implementation of C.A.R. Hoare's
+.Dq quicksort
+algorithm,
 a variant of partition-exchange sorting; in particular, see D.E. Knuth's
 Algorithm Q.
-.Fn Qsort
+.Fn qsort
 takes O N lg N average time.
 This implementation uses median selection to avoid its
 O N**2 worst-case behavior.
 .Pp
 The
 .Fn heapsort
-function is an implementation of J.W.J. William's ``heapsort'' algorithm,
+function is an implementation of J.W.J. William's
+.Dq heapsort
+algorithm,
 a variant of selection sorting; in particular, see D.E. Knuth's Algorithm H.
-.Fn Heapsort
+.Fn heapsort
 takes O N lg N worst-case time.
-Its
+This implementation of
-.Em only
+.Fn heapsort
-advantage over
+is implemented without recursive function calls.
-.Fn qsort
-is that it uses almost no additional memory; while
-.Fn qsort
-does not allocate memory, it is implemented using recursion.
 .Pp
 The function
 .Fn mergesort
 requires additional memory of size
 .Fa nmemb *
-.Fa size 
+.Fa size
 bytes; it should be used only when space is not at a premium.
-.Fn Mergesort
+.Fn mergesort
 is optimized for data with pre-existing order; its worst case
 time is O N lg N; its best case is O N.
 .Pp
 Normally,
 .Fn qsort
 is faster than
-.Fn mergesort
+.Fn mergesort ,
-is faster than
+which is faster than
 .Fn heapsort .
-Memory availability and pre-existing order in the data can make this
+Memory availability and pre-existing order in the data can make this untrue.
-untrue.
 .Sh RETURN VALUES
 The
 .Fn qsort
-function
+function returns no value.
-returns no value.
 .Pp
 Upon successful completion,
 .Fn heapsort
@@ -163,30 +158,25 @@ is set to indicate the error.
 .Sh ERRORS
 The
 .Fn heapsort
-function succeeds unless:
+and
+.Fn mergesort
+functions succeed unless:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 The
 .Fa size
-argument is zero, or,
+argument is zero, or the
-the
 .Fa size
 argument to
 .Fn mergesort
 is less than
 .Dq "sizeof(void *) / 2" .
 .It Bq Er ENOMEM
-.Fn Heapsort
+.Fn heapsort
 or
 .Fn mergesort
 were unable to allocate memory.
 .El
-.Sh COMPATIBILITY
-Previous versions of
-.Fn qsort
-did not permit the comparison routine itself to call
-.Fn qsort 3 .
-This is no longer true.
 .Sh SEE ALSO
 .Xr sort 1 ,
 .Xr radixsort 3
@@ -204,7 +194,7 @@ This is no longer true.
 .%T "Heapsort"
 .%J "Communications of the ACM"
 .%V 7:1
-.%P pp. 347-348
+.%P pp. 347\-348
 .Re
 .Rs
 .%A Knuth, D.E.
@@ -212,23 +202,32 @@ This is no longer true.
 .%B "The Art of Computer Programming"
 .%V Vol. 3
 .%T "Sorting and Searching"
-.%P pp. 114-123, 145-149
+.%P pp. 114\-123, 145\-149
 .Re
 .Rs
-.%A Mcilroy, P.M.
+.%A McIlroy, P.M.
 .%T "Optimistic Sorting and Information Theoretic Complexity"
 .%J "Fourth Annual ACM-SIAM Symposium on Discrete Algorithms"
-.%V January 1992
+.%P pp. 467\-464
+.%D January 1993
 .Re
 .Rs
 .%A Bentley, J.L.
+.%A McIlroy, M.D.
 .%T "Engineering a Sort Function"
-.%J "bentley@research.att.com"
+.%J "Software \- Practice and Experience"
-.%V January 1992
+.%V Vol. 23(11)
+.%P pp. 1249\-1265
+.%D November 1993
 .Re
 .Sh STANDARDS
+Previous versions of
+.Fn qsort
+did not permit the comparison routine itself to call
+.Fn qsort .
+This is no longer true.
+.Pp
 The
 .Fn qsort
-function
+function conforms to
-conforms to
 .St -ansiC .
diff --git a/src/lib/libc/stdlib/qsort.c b/src/lib/libc/stdlib/qsort.c
index c06bd54054..bb4a9a11f2 100644
--- a/src/lib/libc/stdlib/qsort.c
+++ b/src/lib/libc/stdlib/qsort.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: qsort.c,v 1.10 2005/08/08 08:05:37 espie Exp $ */
 /*-
 * Copyright (c) 1992, 1993
 *      The Regents of the University of California.  All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,16 +28,11 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char sccsid[] = "from: @(#)qsort.c     8.1 (Berkeley) 6/4/93";*/
-static char *rcsid = "$Id: qsort.c,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/types.h>
 #include <stdlib.h>
-static inline char      *med3 __P((char *, char *, char *, int (*)()));
+static __inline char    *med3(char *, char *, char *, int (*)(const void *, const void *));
-static inline void       swapfunc __P((char *, char *, int, int));
+static __inline void     swapfunc(char *, char *, int, int);
 #define min(a, b)       (a) < (b) ? a : b
@@ -49,10 +41,10 @@ static inline void	 swapfunc __P((char *, char *, int, int));
 */
 #define swapcode(TYPE, parmi, parmj, n) {               \
        long i = (n) / sizeof (TYPE);                   \
-        register TYPE *pi = (TYPE *) (parmi);           \
+        TYPE *pi = (TYPE *) (parmi);                    \
-        register TYPE *pj = (TYPE *) (parmj);           \
+        TYPE *pj = (TYPE *) (parmj);                    \
        do {                                            \
-                register TYPE   t = *pi;                \
+                TYPE    t = *pi;                        \
                *pi++ = *pj;                            \
                *pj++ = t;                              \
        } while (--i > 0);                              \
@@ -61,12 +53,10 @@ static inline void	 swapfunc __P((char *, char *, int, int));
 #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
        es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-static inline void
+static __inline void
-swapfunc(a, b, n, swaptype)
+swapfunc(char *a, char *b, int n, int swaptype)
-        char *a, *b;
-        int n, swaptype;
 {
-        if(swaptype <= 1) 
+        if (swaptype <= 1) 
                swapcode(long, a, b, n)
        else
                swapcode(char, a, b, n)
@@ -82,10 +72,8 @@ swapfunc(a, b, n, swaptype)
 #define vecswap(a, b, n)        if ((n) > 0) swapfunc(a, b, n, swaptype)
-static inline char *
+static __inline char *
-med3(a, b, c, cmp)
+med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
-        char *a, *b, *c;
-        int (*cmp)();
 {
        return cmp(a, b) < 0 ?
               (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
@@ -93,27 +81,25 @@ med3(a, b, c, cmp)
 }
 void
-qsort(a, n, es, cmp)
+qsort(void *aa, size_t n, size_t es, int (*cmp)(const void *, const void *))
-        void *a;
-        size_t n, es;
-        int (*cmp)();
 {
        char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
        int d, r, swaptype, swap_cnt;
+        char *a = aa;
 loop:   SWAPINIT(a, es);
        swap_cnt = 0;
        if (n < 7) {
-                for (pm = a + es; pm < (char *) a + n * es; pm += es)
+                for (pm = (char *)a + es; pm < (char *) a + n * es; pm += es)
                        for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
                             pl -= es)
                                swap(pl, pl - es);
                return;
        }
-        pm = a + (n / 2) * es;
+        pm = (char *)a + (n / 2) * es;
        if (n > 7) {
-                pl = a;
+                pl = (char *)a;
-                pn = a + (n - 1) * es;
+                pn = (char *)a + (n - 1) * es;
                if (n > 40) {
                        d = (n / 8) * es;
                        pl = med3(pl, pl + d, pl + 2 * d, cmp);
@@ -123,9 +109,9 @@ loop:	SWAPINIT(a, es);
                pm = med3(pl, pm, pn, cmp);
        }
        swap(a, pm);
-        pa = pb = a + es;
+        pa = pb = (char *)a + es;
-        pc = pd = a + (n - 1) * es;
+        pc = pd = (char *)a + (n - 1) * es;
        for (;;) {
                while (pb <= pc && (r = cmp(pb, a)) <= 0) {
                        if (r == 0) {
@@ -151,14 +137,14 @@ loop:	SWAPINIT(a, es);
                pc -= es;
        }
        if (swap_cnt == 0) {  /* Switch to insertion sort */
-                for (pm = a + es; pm < (char *) a + n * es; pm += es)
+                for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
                        for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0; 
                             pl -= es)
                                swap(pl, pl - es);
                return;
        }
-        pn = a + n * es;
+        pn = (char *)a + n * es;
        r = min(pa - (char *)a, pb - pa);
        vecswap(a, pb - r, r);
        r = min(pd - pc, pn - pd - es);
diff --git a/src/lib/libc/stdlib/radixsort.3 b/src/lib/libc/stdlib/radixsort.3
index a2af9f17a4..8a4f71641f 100644
--- a/src/lib/libc/stdlib/radixsort.3
+++ b/src/lib/libc/stdlib/radixsort.3
@@ -9,11 +9,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -29,32 +25,33 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)radixsort.3   8.2 (Berkeley) 1/27/94
+.\"     $OpenBSD: radixsort.3,v 1.10 2005/07/26 04:20:23 jaredy Exp $
-.\"     $Id: radixsort.3,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $
 .\"
 .Dd January 27, 1994
 .Dt RADIXSORT 3
 .Os
 .Sh NAME
-.Nm radixsort
+.Nm radixsort ,
+.Nm sradixsort
 .Nd radix sort
 .Sh SYNOPSIS
 .Fd #include <limits.h>
 .Fd #include <stdlib.h>
 .Ft int
-.Fn radixsort "u_char **base" "int nmemb" "u_char *table" "u_int endbyte"
+.Fn radixsort "const u_char **base" "int nmemb" "const u_char *table" "u_int endbyte"
 .Ft int
-.Fn sradixsort "u_char **base" "int nmemb" "u_char *table" "u_int endbyte"
+.Fn sradixsort "const u_char **base" "int nmemb" "const u_char *table" "u_int endbyte"
 .Sh DESCRIPTION
 The
 .Fn radixsort
 and
 .Fn sradixsort
-functions
+functions are implementations of radix sort.
-are implementations of radix sort.
 .Pp
-These functions sort an array of pointers to byte strings, the initial
+These functions sort an array of
-member of which is referenced by
+.Fa nmemb
+pointers to byte strings.
+The initial member is referenced by
 .Fa base .
 The byte strings may contain any values; the end of each string
 is denoted by the user-specified value
@@ -63,26 +60,24 @@ is denoted by the user-specified value
 Applications may specify a sort order by providing the
 .Fa table
 argument.
-If
+If non-null,
-.Pf non- Dv NULL , 
 .Fa table
 must reference an array of
 .Dv UCHAR_MAX
-+ 1 bytes which contains the sort
+ 1 bytes which contains the sort weight of each possible byte value.
-weight of each possible byte value.
 The end-of-string byte must have a sort weight of 0 or 255
 (for sorting in reverse order).
 More than one byte may have the same sort weight.
 The
 .Fa table
-argument
+argument is useful for applications which wish to sort different characters
-is useful for applications which wish to sort different characters
+equally; for example, providing a table with the same weights
-equally, for example, providing a table with the same weights
+for A\-Z as for a\-z will result in a case-insensitive sort.
-for A-Z as for a-z will result in a case-insensitive sort.
 If
 .Fa table
-is NULL, the contents of the array are sorted in ascending order
+is
-according to the
+.Dv NULL ,
+the contents of the array are sorted in ascending order according to the
 .Tn ASCII
 order of the byte strings they reference and
 .Fa endbyte
@@ -90,7 +85,7 @@ has a sorting weight of 0.
 .Pp
 The
 .Fn sradixsort
-function is stable, that is, if two elements compare as equal, their
+function is stable; that is, if two elements compare as equal, their
 order in the sorted array is unchanged.
 The
 .Fn sradixsort
@@ -107,7 +102,7 @@ particular, see D.E. Knuth's Algorithm R and section 5.2.5, exercise 10.
 They take linear time relative to the number of bytes in the strings.
 .Sh RETURN VALUES
 Upon successful completion 0 is returned.
-Otherwise, \-1 is returned and the global variable 
+Otherwise, \-1 is returned and the global variable
 .Va errno
 is set to indicate the error.
 .Sh ERRORS
@@ -122,15 +117,13 @@ is not 0 or 255.
 .Pp
 Additionally, the
 .Fn sradixsort
-function
+function may fail and set
-may fail and set
 .Va errno
 for any of the errors specified for the library routine
 .Xr malloc 3 .
 .Sh SEE ALSO
 .Xr sort 1 ,
 .Xr qsort 3
-.Pp
 .Rs
 .%A Knuth, D.E.
 .%D 1968
@@ -158,4 +151,5 @@ for any of the errors specified for the library routine
 .Sh HISTORY
 The
 .Fn radixsort
-function first appeared in 4.4BSD.
+function first appeared in
+.Bx 4.4 .
diff --git a/src/lib/libc/stdlib/radixsort.c b/src/lib/libc/stdlib/radixsort.c
index dd51013c94..0b2ff27044 100644
--- a/src/lib/libc/stdlib/radixsort.c
+++ b/src/lib/libc/stdlib/radixsort.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: radixsort.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
 /*-
 * Copyright (c) 1990, 1993
 *      The Regents of the University of California.  All rights reserved.
@@ -13,11 +14,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -34,11 +31,6 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char sccsid[] = "from: @(#)radixsort.c 8.1 (Berkeley) 6/4/93";*/
-static char *rcsid = "$Id: radixsort.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 /*
 * Radixsort routines.
 * 
@@ -61,11 +53,11 @@ typedef struct {
        int sn, si;
 } stack;
-static inline void simplesort
+static __inline void simplesort
-            __P((const u_char **, int, int, const u_char *, u_int));
+(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int));
+static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_b __P((const u_char **,
+static void r_sort_b(const u_char **,
-            const u_char **, int, int, const u_char *, u_int));
+            const u_char **, int, int, const u_char *, u_int);
 #define THRESHOLD       20              /* Divert to simplesort(). */
 #define SIZE            512             /* Default stack size. */
@@ -90,10 +82,7 @@ static void r_sort_b __P((const u_char **,
 }
 int
-radixsort(a, n, tab, endch)
+radixsort(const u_char **a, int n, const u_char *tab, u_int endch)
-        const u_char **a, *tab;
-        int n;
-        u_int endch;
 {
        const u_char *tr;
        int c;
@@ -105,10 +94,7 @@ radixsort(a, n, tab, endch)
 }
 int
-sradixsort(a, n, tab, endch)
+sradixsort(const u_char **a, int n, const u_char *tab, u_int endch)
-        const u_char **a, *tab;
-        int n;
-        u_int endch;
 {
        const u_char *tr, **ta;
        int c;
@@ -133,15 +119,11 @@ sradixsort(a, n, tab, endch)
 /* Unstable, in-place sort. */
 void
-r_sort_a(a, n, i, tr, endch)
+r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
-        const u_char **a;
-        int n, i;
-        const u_char *tr;
-        u_int endch;
 {
        static int count[256], nc, bmin;
-        register int c;
+        int c;
-        register const u_char **ak, *r;
+        const u_char **ak, *r;
        stack s[SIZE], *sp, *sp0, *sp1, temp;
        int *cp, bigc;
        const u_char **an, *t, **aj, **top[256];
@@ -224,15 +206,12 @@ r_sort_a(a, n, i, tr, endch)
 /* Stable sort, requiring additional memory. */
 void
-r_sort_b(a, ta, n, i, tr, endch)
+r_sort_b(const u_char **a, const u_char **ta, int n, int i, const u_char *tr,
-        const u_char **a, **ta;
+    u_int endch)
-        int n, i;
-        const u_char *tr;
-        u_int endch;
 {
        static int count[256], nc, bmin;
-        register int c;
+        int c;
-        register const u_char **ak, **ai;
+        const u_char **ak, **ai;
        stack s[512], *sp, *sp0, *sp1, temp;
        const u_char **top[256];
        int *cp, bigc;
@@ -295,14 +274,11 @@ r_sort_b(a, ta, n, i, tr, endch)
        }
 }
                
-static inline void
+static __inline void
-simplesort(a, n, b, tr, endch)  /* insertion sort */
+simplesort(const u_char **a, int n, int b, const u_char *tr, u_int endch)
-        register const u_char **a;
+    /* insertion sort */
-        int n, b;
-        register const u_char *tr;
-        u_int endch;
 {
-        register u_char ch;
+        u_char ch;
        const u_char  **ak, **ai, *s, *t;
        for (ak = a+1; --n >= 1; ak++)
diff --git a/src/lib/libc/stdlib/rand.3 b/src/lib/libc/stdlib/rand.3
index a0e7740e66..0d9c52a3b9 100644
--- a/src/lib/libc/stdlib/rand.3
+++ b/src/lib/libc/stdlib/rand.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)rand.3        6.7 (Berkeley) 6/29/91
+.\"     $OpenBSD: rand.3,v 1.9 2003/06/02 20:18:38 millert Exp $
-.\"     $Id: rand.3,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt RAND 3
@@ -46,12 +41,15 @@
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
 .Ft void
-.Fn srand "unsigned seed"
+.Fn srand "unsigned int seed"
 .Ft int
 .Fn rand void
+.Ft int
+.Fn rand_r "unsigned int *seed"
 .Sh DESCRIPTION
 .Bf -symbolic
-These interfaces are obsoleted by random(3).
+These interfaces are obsoleted by
+.Xr random 3 .
 .Ef
 .Pp
 The
@@ -73,13 +71,28 @@ with the same seed value.
 .Pp
 If no seed value is provided, the functions are automatically
 seeded with a value of 1.
+.Pp
+The
+.Fn rand_r
+is a thread-safe version of
+.Fn rand .
+Storage for the seed must be provided through the
+.Fa seed
+argument, and needs to have been initialized by the caller.
 .Sh SEE ALSO
+.Xr arc4random 3 ,
+.Xr rand48 3 ,
 .Xr random 3
 .Sh STANDARDS
 The
 .Fn rand
 and
 .Fn srand
-functions
+functions conform to
-conform to
 .St -ansiC .
+.Pp
+The
+.Fn rand_r
+function conforms to ISO/IEC 9945-1 ANSI/IEEE
+.Pq Dq Tn POSIX
+Std 1003.1c Draft 10.
diff --git a/src/lib/libc/stdlib/rand.c b/src/lib/libc/stdlib/rand.c
index 361d473448..0f9c100807 100644
--- a/src/lib/libc/stdlib/rand.c
+++ b/src/lib/libc/stdlib/rand.c
@@ -10,11 +10,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,25 +27,26 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)rand.c       5.6 (Berkeley) 6/24/91";*/
-static char *rcsid = "$Id: rand.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/types.h>
 #include <stdlib.h>
-static u_long next = 1;
+static u_int next = 1;
+int
+rand_r(u_int *seed)
+{
+        *seed = *seed * 1103515245 + 12345;
+        return (*seed % ((u_int)RAND_MAX + 1));
+}
 int
-rand()
+rand(void)
 {
-        return ((next = next * 1103515245 + 12345) % ((u_int)RAND_MAX + 1));
+        return (rand_r(&next));
 }
 void
-srand(seed)
+srand(u_int seed)
-u_int seed;
 {
        next = seed;
 }
diff --git a/src/lib/libc/stdlib/rand48.3 b/src/lib/libc/stdlib/rand48.3
index 5a772c9a8c..78cd0a7cd5 100644
--- a/src/lib/libc/stdlib/rand48.3
+++ b/src/lib/libc/stdlib/rand48.3
@@ -1,4 +1,4 @@
-\" Copyright (c) 1993 Martin Birgmeier
+.\" Copyright (c) 1993 Martin Birgmeier
 .\" All rights reserved.
 .\"
 .\" You may redistribute unmodified or modified versions of this source
@@ -9,7 +9,7 @@
 .\" of any kind. I shall in no event be liable for anything that happens
 .\" to anyone/anything when using this software.
 .\"
-.\"     $Id: rand48.3,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $
+.\"     $OpenBSD: rand48.3,v 1.10 2003/06/01 19:27:27 jmc Exp $
 .\"
 .Dd October 8, 1993
 .Dt RAND48 3
@@ -24,10 +24,10 @@
 .Nm srand48 ,
 .Nm seed48 ,
 .Nm lcong48
-.Nd pseudo random number generators and initialization routines
+.Nd pseudo-random number generators and initialization routines
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
-.Ft double 
+.Ft double
 .Fn drand48 void
 .Ft double
 .Fn erand48 "unsigned short xseed[3]"
@@ -49,12 +49,13 @@
 The
 .Fn rand48
 family of functions generates pseudo-random numbers using a linear
-congruential algorithm working on integers 48 bits in size. The
+congruential algorithm working on integers 48 bits in size.
-particular formula employed is
+The particular formula employed is
 r(n+1) = (a * r(n) + c) mod m
 where the default values are
 for the multiplicand a = 0xfdeece66d = 25214903917 and
-the addend c = 0xb = 11. The modulus is always fixed at m = 2 ** 48.
+the addend c = 0xb = 11.
+The modulus is always fixed at m = 2 ** 48.
 r(n) is called the seed of the random number generator.
 .Pp
 For all the six generator routines described next, the first
@@ -63,15 +64,17 @@ computational step is to perform a single iteration of the algorithm.
 .Fn drand48
 and
 .Fn erand48
-return values of type double. The full 48 bits of r(n+1) are
+return values of type double.
+The full 48 bits of r(n+1) are
 loaded into the mantissa of the returned value, with the exponent set
-such that the values produced lie in the interval [0.0, 1.0).
+such that the values produced lie in the interval [0.0, 1.0].
 .Pp
 .Fn lrand48
 and
 .Fn nrand48
 return values of type long in the range
-[0, 2**31-1]. The high-order (31) bits of
+[0, 2**31-1].
+The high-order (31) bits of
 r(n+1) are loaded into the lower bits of the returned value, with
 the topmost (sign) bit set to zero.
 .Pp
@@ -79,14 +82,15 @@ the topmost (sign) bit set to zero.
 and
 .Fn jrand48
 return values of type long in the range
-[-2**31, 2**31-1]. The high-order (32) bits of
+[-2**31, 2**31-1].
-r(n+1) are loaded into the returned value.
+The high-order (32) bits of r(n+1) are loaded into the returned value.
 .Pp
 .Fn drand48 ,
 .Fn lrand48 ,
 and
 .Fn mrand48
-use an internal buffer to store r(n). For these functions
+use an internal buffer to store r(n).
+For these functions
 the initial value of r(0) = 0x1234abcd330e = 20017429951246.
 .Pp
 On the other hand,
@@ -118,12 +122,12 @@ also initializes the internal buffer r(n) of
 and
 .Fn mrand48 ,
 but here all 48 bits of the seed can be specified in an array of 3 shorts,
-where the zeroth member specifies the lowest bits. Again,
+where the zeroth member specifies the lowest bits.
-the constant multiplicand and addend of the algorithm are
+Again, the constant multiplicand and addend of the algorithm are
 reset to the default values given above.
 .Fn seed48
 returns a pointer to an array of 3 shorts which contains the old seed.
-This array is statically allocated, thus its contents are lost after
+This array is statically allocated, so its contents are lost after
 each new call to
 .Fn seed48 .
 .Pp
@@ -152,9 +156,10 @@ always also set the multiplicand and addend for any of the six
 generator calls.
 .Pp
 For a more powerful random number generator, see
-.Xr random 3
+.Xr random 3 .
-.Sh AUTHOR
-Martin Birgmeier
 .Sh SEE ALSO
+.Xr arc4random 3 ,
 .Xr rand 3 ,
-.Xr random 3 .
+.Xr random 3
+.Sh AUTHORS
+Martin Birgmeier
diff --git a/src/lib/libc/stdlib/rand48.h b/src/lib/libc/stdlib/rand48.h
index 12496d1c8c..afa49f65f3 100644
--- a/src/lib/libc/stdlib/rand48.h
+++ b/src/lib/libc/stdlib/rand48.h
@@ -9,6 +9,8 @@
 * This software is provided ``as is'', and comes with no warranties
 * of any kind. I shall in no event be liable for anything that happens
 * to anyone/anything when using this software.
+ *
+ *      $OpenBSD: rand48.h,v 1.3 2002/02/16 21:27:24 millert Exp $
 */
 #ifndef _RAND48_H_
@@ -17,7 +19,7 @@
 #include <math.h>
 #include <stdlib.h>
-void            __dorand48 __P((unsigned short[3]));
+void            __dorand48(unsigned short[3]);
 #define RAND48_SEED_0   (0x330e)
 #define RAND48_SEED_1   (0xabcd)
diff --git a/src/lib/libc/stdlib/random.3 b/src/lib/libc/stdlib/random.3
index 38c15a9803..626b040b50 100644
--- a/src/lib/libc/stdlib/random.3
+++ b/src/lib/libc/stdlib/random.3
@@ -9,11 +9,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -29,97 +25,105 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)random.3      6.5 (Berkeley) 4/19/91
+.\"     $OpenBSD: random.3,v 1.18 2005/11/30 07:51:02 otto Exp $
-.\"     $Id: random.3,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $
 .\"
 .Dd April 19, 1991
 .Dt RANDOM 3
-.Os BSD 4.2
+.Os
 .Sh NAME
 .Nm random ,
 .Nm srandom ,
+.Nm srandomdev ,
 .Nm initstate ,
 .Nm setstate
 .Nd better random number generator; routines for changing generators
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
-.Ft long 
+.Ft long
 .Fn random void
 .Ft void
-.Fn srandom "unsigned seed"
+.Fn srandom "unsigned int seed"
+.Ft void
+.Fn srandomdev void
 .Ft char *
-.Fn initstate "unsigned seed" "char *state" "int n"
+.Fn initstate "unsigned int seed" "char *state" "size_t n"
 .Ft char *
-.Fn setstate "char *state"
+.Fn setstate "const char *state"
 .Sh DESCRIPTION
 The
 .Fn random
-function
+function uses a non-linear additive feedback random number generator employing
-uses a non-linear additive feedback random number generator employing a
+a default table of size 31 long integers to return successive pseudo-random
-default table of size 31 long integers to return successive pseudo-random
+numbers in the range from 0 to (2**31)\-1.
-numbers in the range from 0 to
-.if t 2\u\s731\s10\d\(mi1.
-.if n (2**31)\(mi1.
 The period of this random number generator is very large, approximately
-.if t 16\(mu(2\u\s731\s10\d\(mi1).
+16*((2**31)\-1).
-.if n 16*((2**31)\(mi1).
 .Pp
 The
-.Fn random Ns / Fn srandom
+.Fn random
-have (almost) the same calling sequence and initialization properties as
+and
-.Xr rand 3 Ns / Xr srand 3 .
+.Fn srandom
+functions have (almost) the same calling sequence and initialization
+properties as
+.Xr rand 3 Ns / Ns Xr srand 3 .
 The difference is that
 .Xr rand
 produces a much less random sequence \(em in fact, the low dozen bits
-generated by rand go through a cyclic pattern.  All the bits generated by
+generated by rand go through a cyclic pattern.
+All the bits generated by
 .Fn random
-are usable.  For example,
+are usable.
+For example,
 .Sq Li random()&01
 will produce a random binary
 value.
 .Pp
-Unlike
+Like
-.Xr srand ,
-.Fn srandom
-does not return the old seed; the reason for this is that the amount of
-state information used is much more than a single word.  (Two other
-routines are provided to deal with restarting/changing random
-number generators).  Like
 .Xr rand 3 ,
-however,
 .Fn random
 will by default produce a sequence of numbers that can be duplicated
 by calling
 .Fn srandom
-with 
+with
 .Ql 1
 as the seed.
 .Pp
 The
+.Fn srandomdev
+routine initializes a state array using
+random numbers obtained from the kernel,
+suitable for cryptographic use.
+Note that this particular seeding procedure can generate
+states which are impossible to reproduce by calling
+.Fn srandom
+with any value, since the succeeding terms in the
+state buffer are no longer derived from the LC algorithm applied to
+a fixed seed.
+.Pp
+The
 .Fn initstate
 routine allows a state array, passed in as an argument, to be initialized
-for future use.  The size of the state array (in bytes) is used by
+for future use.
+The size of the state array (in bytes) is used by
 .Fn initstate
 to decide how sophisticated a random number generator it should use \(em the
 more state, the better the random numbers will be.
 (Current "optimal" values for the amount of state information are
 8, 32, 64, 128, and 256 bytes; other amounts will be rounded down to
-the nearest known amount.  Using less than 8 bytes will cause an error.)
+the nearest known amount.
+Using less than 8 bytes will cause an error.)
 The seed for the initialization (which specifies a starting point for
 the random number sequence, and provides for restarting at the same
 point) is also an argument.
 The
 .Fn initstate
-function
+function returns a pointer to the previous state information array.
-returns a pointer to the previous state information array.
 .Pp
 Once a state has been initialized, the
 .Fn setstate
 routine provides for rapid switching between states.
 The
 .Fn setstate
-function
+function returns a pointer to the previous state array; its
-returns a pointer to the previous state array; its
 argument state array is used for further random number generation
 until the next call to
 .Fn initstate
@@ -143,12 +147,8 @@ is that the size of the state array does not have to be remembered after
 it is initialized.
 .Pp
 With 256 bytes of state information, the period of the random number
-generator is greater than
+generator is greater than 2**69
-.if t 2\u\s769\s10\d,
-.if n 2**69
 which should be sufficient for most purposes.
-.Sh AUTHOR
-Earl T. Cohen
 .Sh DIAGNOSTICS
 If
 .Fn initstate
@@ -157,11 +157,29 @@ is called with less than 8 bytes of state information, or if
 detects that the state information has been garbled, error
 messages are printed on the standard error output.
 .Sh SEE ALSO
-.Xr rand 3
+.Xr arc4random 3 ,
+.Xr drand48 3 ,
+.Xr rand 3 ,
+.Xr random 4
+.Sh STANDARDS
+The
+.Fn random ,
+.Fn srandom ,
+.Fn initstate ,
+and
+.Fn setstate
+functions conform to
+.St -xpg4.2 .
+.Pp
+The
+.Fn srandomdev
+function is an extension.
 .Sh HISTORY
 These
-functions appeared in 
+functions appeared in
 .Bx 4.2 .
+.Sh AUTHORS
+.An Earl T. Cohen
 .Sh BUGS
 About 2/3 the speed of
 .Xr rand 3 .
diff --git a/src/lib/libc/stdlib/random.c b/src/lib/libc/stdlib/random.c
index 469b6d976a..48e892042b 100644
--- a/src/lib/libc/stdlib/random.c
+++ b/src/lib/libc/stdlib/random.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: random.c,v 1.15 2005/11/30 07:51:02 otto Exp $ */
 /*
 * Copyright (c) 1983 Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,13 +28,13 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
+#include <sys/param.h>
-/*static char *sccsid = "from: @(#)random.c     5.9 (Berkeley) 2/23/91";*/
+#include <sys/sysctl.h>
-static char *rcsid = "$Id: random.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $";
+#include <sys/time.h>
-#endif /* LIBC_SCCS and not lint */
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 /*
 * random.c:
@@ -55,10 +52,10 @@ static char *rcsid = "$Id: random.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $"
 * congruential generator.  If the amount of state information is less than
 * 32 bytes, a simple linear congruential R.N.G. is used.
 *
- * Internally, the state information is treated as an array of longs; the
+ * Internally, the state information is treated as an array of int32_t; the
 * zeroeth element of the array is the type of R.N.G. being used (small
 * integer); the remainder of the array is the state information for the
- * R.N.G.  Thus, 32 bytes of state information will give 7 longs worth of
+ * R.N.G.  Thus, 32 bytes of state information will give 7 int32_ts worth of
 * state information, which will allow a degree seven polynomial.  (Note:
 * the zeroeth word of state information also has some other information
 * stored in it -- see setstate() for details).
@@ -134,14 +131,14 @@ static int seps [MAX_TYPES] =	{ SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 };
 *      MAX_TYPES * (rptr - state) + TYPE_3 == TYPE_3.
 */
-static long randtbl[DEG_3 + 1] = {
+static int32_t randtbl[DEG_3 + 1] = {
        TYPE_3,
-        0x9a319039, 0x32d9c024, 0x9b663182, 0x5da1f342, 0xde3b81e0, 0xdf0a6fb5,
+        0x991539b1, 0x16a5bce3, 0x6774a4cd, 0x3e01511e, 0x4e508aaa, 0x61048c05, 
-        0xf103bc02, 0x48f340fb, 0x7449e56b, 0xbeb1dbb0, 0xab5c5918, 0x946554fd,
+        0xf5500617, 0x846b7115, 0x6a19892c, 0x896a97af, 0xdb48f936, 0x14898454, 
-        0x8c2e680f, 0xeb3d799f, 0xb11ee0b7, 0x2d436b86, 0xda672e2a, 0x1588ca88,
+        0x37ffd106, 0xb58bff9c, 0x59e17104, 0xcf918a49, 0x09378c83, 0x52c7a471, 
-        0xe369735d, 0x904f35f7, 0xd7158fd6, 0x6fa6f051, 0x616e6b96, 0xac94efdc,
+        0x8d293ea9, 0x1f4fc301, 0xc3db71be, 0x39b44e1c, 0xf8a44ef9, 0x4c8b80b1, 
-        0x36413f93, 0xc622c298, 0xf5a42ab8, 0x8a88d77b, 0xf5ad9d0e, 0x8999220b,
+        0x19edc328, 0x87bf4bdd, 0xc9b240e5, 0xe9ee4b1b, 0x4382aee7, 0x535b6b41, 
-        0x27fb47b9,
+        0xf3bec5da,
 };
 /*
@@ -158,8 +155,8 @@ static long randtbl[DEG_3 + 1] = {
 * in the initialization of randtbl) because the state table pointer is set
 * to point to randtbl[1] (as explained below).
 */
-static long *fptr = &randtbl[SEP_3 + 1];
+static int32_t *fptr = &randtbl[SEP_3 + 1];
-static long *rptr = &randtbl[1];
+static int32_t *rptr = &randtbl[1];
 /*
 * The following things are the pointer to the state information table, the
@@ -171,11 +168,11 @@ static long *rptr = &randtbl[1];
 * this is more efficient than indexing every time to find the address of
 * the last element to see if the front and rear pointers have wrapped.
 */
-static long *state = &randtbl[1];
+static int32_t *state = &randtbl[1];
+static int32_t *end_ptr = &randtbl[DEG_3 + 1];
 static int rand_type = TYPE_3;
 static int rand_deg = DEG_3;
 static int rand_sep = SEP_3;
-static long *end_ptr = &randtbl[DEG_3 + 1];
 /*
 * srandom:
@@ -190,18 +187,28 @@ static long *end_ptr = &randtbl[DEG_3 + 1];
 * for default usage relies on values produced by this routine.
 */
 void
-srandom(x)
+srandom(unsigned int x)
-        u_int x;
 {
-        register int i, j;
+        int i;
+        int32_t test;
+        div_t val;
        if (rand_type == TYPE_0)
                state[0] = x;
        else {
-                j = 1;
                state[0] = x;
-                for (i = 1; i < rand_deg; i++)
+                for (i = 1; i < rand_deg; i++) {
-                        state[i] = 1103515245 * state[i - 1] + 12345;
+                        /*
+                         * Implement the following, without overflowing 31 bits:
+                         *
+                         *      state[i] = (16807 * state[i - 1]) % 2147483647;
+                         *
+                         *      2^31-1 (prime) = 2147483647 = 127773*16807+2836
+                         */
+                        val = div(state[i-1], 127773);
+                        test = 16807 * val.rem - 2836 * val.quot;
+                        state[i] = test + (test < 0 ? 2147483647 : 0);
+                }
                fptr = &state[rand_sep];
                rptr = &state[0];
                for (i = 0; i < 10 * rand_deg; i++)
@@ -210,6 +217,38 @@ srandom(x)
 }
 /*
+ * srandomdev:
+ *
+ * Many programs choose the seed value in a totally predictable manner.
+ * This often causes problems.  We seed the generator using random
+ * data from the kernel.
+ * Note that this particular seeding procedure can generate states
+ * which are impossible to reproduce by calling srandom() with any
+ * value, since the succeeding terms in the state buffer are no longer
+ * derived from the LC algorithm applied to a fixed seed.
+ */
+void
+srandomdev(void)
+{
+        int mib[2];
+        size_t len;
+        if (rand_type == TYPE_0)
+                len = sizeof(state[0]);
+        else
+                len = rand_deg * sizeof(state[0]);
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_ARND;
+        sysctl(mib, 2, state, &len, NULL, 0);
+        if (rand_type != TYPE_0) {
+                fptr = &state[rand_sep];
+                rptr = &state[0];
+        }
+}
+/*
 * initstate:
 *
 * Initialize the state information in the given array of n bytes for future
@@ -229,22 +268,16 @@ srandom(x)
 * Returns a pointer to the old state.
 */
 char *
-initstate(seed, arg_state, n)
+initstate(u_int seed, char *arg_state, size_t n)
-        u_int seed;                     /* seed for R.N.G. */
-        char *arg_state;                /* pointer to state array */
-        int n;                          /* # bytes of state info */
 {
-        register char *ostate = (char *)(&state[-1]);
+        char *ostate = (char *)(&state[-1]);
        if (rand_type == TYPE_0)
                state[-1] = rand_type;
        else
                state[-1] = MAX_TYPES * (rptr - state) + rand_type;
-        if (n < BREAK_0) {
+        if (n < BREAK_0)
-                (void)fprintf(stderr,
+                return(NULL);
-                    "random: not enough state (%d bytes); ignored.\n", n);
-                return(0);
-        }
        if (n < BREAK_1) {
                rand_type = TYPE_0;
                rand_deg = DEG_0;
@@ -266,7 +299,7 @@ initstate(seed, arg_state, n)
                rand_deg = DEG_4;
                rand_sep = SEP_4;
        }
-        state = &(((long *)arg_state)[1]);      /* first location */
+        state = &(((int32_t *)arg_state)[1]);   /* first location */
        end_ptr = &state[rand_deg];     /* must set end_ptr before srandom */
        srandom(seed);
        if (rand_type == TYPE_0)
@@ -292,12 +325,11 @@ initstate(seed, arg_state, n)
 * Returns a pointer to the old state information.
 */
 char *
-setstate(arg_state)
+setstate(const char *arg_state)
-        char *arg_state;
 {
-        register long *new_state = (long *)arg_state;
+        int32_t *new_state = (int32_t *)arg_state;
-        register int type = new_state[0] % MAX_TYPES;
+        int32_t type = new_state[0] % MAX_TYPES;
-        register int rear = new_state[0] / MAX_TYPES;
+        int32_t rear = new_state[0] / MAX_TYPES;
        char *ostate = (char *)(&state[-1]);
        if (rand_type == TYPE_0)
@@ -315,8 +347,7 @@ setstate(arg_state)
                rand_sep = seps[type];
                break;
        default:
-                (void)fprintf(stderr,
+                return(NULL);
-                    "random: state info corrupted; not changed.\n");
        }
        state = &new_state[1];
        if (rand_type != TYPE_0) {
@@ -345,9 +376,9 @@ setstate(arg_state)
 * Returns a 31-bit random number.
 */
 long
-random()
+random(void)
 {
-        long i;
+        int32_t i;
        if (rand_type == TYPE_0)
                i = state[0] = (state[0] * 1103515245 + 12345) & 0x7fffffff;
@@ -360,5 +391,5 @@ random()
                } else if (++rptr >= end_ptr)
                        rptr = state;
        }
-        return(i);
+        return((long)i);
 }
diff --git a/src/lib/libc/stdlib/realloc.3 b/src/lib/libc/stdlib/realloc.3
deleted file mode 100644
index 66f09b2081..0000000000
--- a/src/lib/libc/stdlib/realloc.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" 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. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
-.\"
-.\"     from: @(#)realloc.3     5.1 (Berkeley) 5/2/91
-.\"     $Id: realloc.3,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $
-.\"
-.Dd May 2, 1991
-.Dt REALLOC 3
-.Os
-.Sh NAME
-.Nm realloc
-.Nd reallocation of memory function
-.Sh SYNOPSIS
-.Fd #include <stdlib.h>
-.Ft void *
-.Fn realloc "void *ptr" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn realloc
-function changes the size of the object pointed to by
-.Fa ptr
-to the size specified by
-.Fa size .
-The contents of the object are unchanged up to the lesser
-of the new and old sizes.
-If the new size is larger, the value of the newly allocated portion
-of the object is indeterminate.
-If
-.Fa ptr
-is a null pointer, the
-.Fn realloc
-function behaves like the
-.Xr malloc 3
-function for the specified size.
-Otherwise, if
-.Fa ptr
-does not match a pointer earlier returned by the
-.Xr calloc 3 ,
-.Xr malloc 3 ,
-or 
-.Fn realloc
-function, or if the space has been deallocated
-by a call to the
-.Xr free
-or
-.Fn realloc
-function, unpredictable and usually detrimental
-behavior will occur.
-If the space cannot be allocated, the object 
-pointed to by
-.Fa ptr
-is unchanged.
-If
-.Fa size
-is zero and
-.Fa ptr
-is not a null pointer, the object it points to is freed.
-.Pp
-The
-.Fn realloc
-function returns either a null pointer or a pointer
-to the possibly moved allocated space.
-.Sh SEE ALSO
-.Xr alloca 3 ,
-.Xr calloc 3 ,
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Sh STANDARDS
-The
-.Fn realloc
-function conforms to
-.St -ansiC .
diff --git a/src/lib/libc/stdlib/realpath.3 b/src/lib/libc/stdlib/realpath.3
index 9d8b1ff2ce..e1e0b10605 100644
--- a/src/lib/libc/stdlib/realpath.3
+++ b/src/lib/libc/stdlib/realpath.3
@@ -12,11 +12,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -32,10 +28,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)realpath.3    8.2 (Berkeley) 2/16/94
+.\"     $OpenBSD: realpath.3,v 1.13 2005/04/03 18:59:15 otto Exp $
-.\"     $Id: realpath.3,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $
 .\"
-.Dd "February 16, 1994"
+.Dd February 16, 1994
 .Dt REALPATH 3
 .Os
 .Sh NAME
@@ -45,7 +40,7 @@
 .Fd #include <sys/param.h>
 .Fd #include <stdlib.h>
 .Ft "char *"
-.Fn realpath "const char *pathname" "char resolvedname[MAXPATHLEN]"
+.Fn realpath "const char *pathname" "char resolved[PATH_MAX]"
 .Sh DESCRIPTION
 The
 .Fn realpath
@@ -57,18 +52,17 @@ and
 .Pa /../
 in
 .Fa pathname ,
-and copies the resulting absolute pathname into
+and copies the resulting absolute pathname into the memory referenced by
-the memory referenced by
+.Fa resolved .
-.Fa resolvedname .
 The
-.Fa resolvedname
+.Fa resolved
 argument
 .Em must
 refer to a buffer capable of storing at least
-.Dv MAXPATHLEN
+.Dv PATH_MAX
 characters.
 .Pp
-The 
+The
 .Fn realpath
 function will resolve both absolute and relative paths
 and return the absolute pathname corresponding to
@@ -78,33 +72,37 @@ All but the last component of
 must exist when
 .Fn realpath
 is called.
-.Sh "RETURN VALUES"
+.Sh RETURN VALUES
 The
 .Fn realpath
 function returns
-.Fa resolved_name
+.Fa resolved
 on success.
 If an error occurs,
 .Fn realpath
 returns
-.Dv NULL ,
+.Dv NULL
-and
+and the contents of
-.Fa resolved_name
+.Fa resolved
-contains the pathname which caused the problem.
+are undefined.
 .Sh ERRORS
 The function
 .Fn realpath
 may fail and set the external variable
 .Va errno
 for any of the errors specified for the library functions
-.Xr chdir 2 ,
-.Xr close 2 ,
-.Xr fchdir 2 ,
 .Xr lstat 2 ,
-.Xr open 2 ,
+.Xr readlink 2 ,
-.Xr readlink 2
 and
 .Xr getcwd 3 .
+.Sh SEE ALSO
+.Xr readlink 1 ,
+.Xr getcwd 3
+.Sh HISTORY
+The
+.Fn realpath
+function call first appeared in
+.Bx 4.4 .
 .Sh CAVEATS
 This implementation of
 .Fn realpath
@@ -114,13 +112,6 @@ The
 version always returns absolute pathnames,
 whereas the Solaris implementation will,
 under certain circumstances, return a relative
-.Fa resolved_path
+.Fa resolved
 when given a relative
 .Fa pathname .
-.Sh "SEE ALSO"
-.Xr getcwd 3
-.Sh HISTORY
-The
-.Fn realpath
-function call first appeared in
-.Bx 4.4 .
diff --git a/src/lib/libc/stdlib/realpath.c b/src/lib/libc/stdlib/realpath.c
index e349b7e068..4cb847b313 100644
--- a/src/lib/libc/stdlib/realpath.c
+++ b/src/lib/libc/stdlib/realpath.c
@@ -1,9 +1,6 @@
+/*      $OpenBSD: realpath.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
 /*
- * Copyright (c) 1994
+ * Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jan-Simon Pendry.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -13,18 +10,14 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. The names of the authors may not be used to endorse or promote
- *    must display the following acknowledgement:
+ *    products derived from this software without specific prior written
- *      This product includes software developed by the University of
+ *    permission.
- *      California, Berkeley and its contributors.
- * 4. 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
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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)
@@ -34,126 +27,164 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char sccsid[] = "from: @(#)realpath.c  8.1 (Berkeley) 2/16/94";*/
-static char *rcsid = "$Id: realpath.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 /*
- * char *realpath(const char *path, char resolved_path[MAXPATHLEN]);
+ * char *realpath(const char *path, char resolved[PATH_MAX]);
 *
 * Find the real name of path, by removing all ".", ".." and symlink
 * components.  Returns (resolved) on success, or (NULL) on failure,
 * in which case the path which caused trouble is left in (resolved).
 */
 char *
-realpath(path, resolved)
+realpath(const char *path, char resolved[PATH_MAX])
-        const char *path;
-        char *resolved;
 {
        struct stat sb;
-        int fd, n, rootd, serrno;
+        char *p, *q, *s;
-        char *p, *q, wbuf[MAXPATHLEN];
+        size_t left_len, resolved_len;
+        unsigned symlinks;
+        int serrno, slen;
+        char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX];
-        /* Save the starting point. */
+        serrno = errno;
-        if ((fd = open(".", O_RDONLY)) < 0) {
+        symlinks = 0;
-                (void)strcpy(resolved, ".");
+        if (path[0] == '/') {
+                resolved[0] = '/';
+                resolved[1] = '\0';
+                if (path[1] == '\0')
+                        return (resolved);
+                resolved_len = 1;
+                left_len = strlcpy(left, path + 1, sizeof(left));
+        } else {
+                if (getcwd(resolved, PATH_MAX) == NULL) {
+                        strlcpy(resolved, ".", PATH_MAX);
+                        return (NULL);
+                }
+                resolved_len = strlen(resolved);
+                left_len = strlcpy(left, path, sizeof(left));
+        }
+        if (left_len >= sizeof(left) || resolved_len >= PATH_MAX) {
+                errno = ENAMETOOLONG;
                return (NULL);
        }
        /*
-         * Find the dirname and basename from the path to be resolved.
+         * Iterate over path components in `left'.
-         * Change directory to the dirname component.
-         * lstat the basename part.
-         *     if it is a symlink, read in the value and loop.
-         *     if it is a directory, then change to that directory.
-         * get the current directory name and append the basename.
         */
-        (void)strncpy(resolved, path, MAXPATHLEN - 1);
+        while (left_len != 0) {
-        resolved[MAXPATHLEN - 1] = '\0';
+                /*
-loop:
+                 * Extract the next path component and adjust `left'
-        q = strrchr(resolved, '/');
+                 * and its length.
-        if (q != NULL) {
+                 */
-                p = q + 1;
+                p = strchr(left, '/');
-                if (q == resolved)
+                s = p ? p : left + left_len;
-                        q = "/";
+                if (s - left >= sizeof(next_token)) {
-                else {
+                        errno = ENAMETOOLONG;
-                        do {
+                        return (NULL);
-                                --q;
-                        } while (q > resolved && *q == '/');
-                        q[1] = '\0';
-                        q = resolved;
                }
-                if (chdir(q) < 0)
+                memcpy(next_token, left, s - left);
-                        goto err1;
+                next_token[s - left] = '\0';
-        } else
+                left_len -= s - left;
-                p = resolved;
+                if (p != NULL)
+                        memmove(left, s + 1, left_len + 1);
-        /* Deal with the last component. */
+                if (resolved[resolved_len - 1] != '/') {
-        if (lstat(p, &sb) == 0) {
+                        if (resolved_len + 1 >= PATH_MAX) {
-                if (S_ISLNK(sb.st_mode)) {
+                                errno = ENAMETOOLONG;
-                        n = readlink(p, resolved, MAXPATHLEN);
+                                return (NULL);
-                        if (n < 0)
+                        }
-                                goto err1;
+                        resolved[resolved_len++] = '/';
-                        resolved[n] = '\0';
+                        resolved[resolved_len] = '\0';
-                        goto loop;
                }
-                if (S_ISDIR(sb.st_mode)) {
+                if (next_token[0] == '\0')
-                        if (chdir(p) < 0)
+                        continue;
-                                goto err1;
+                else if (strcmp(next_token, ".") == 0)
-                        p = "";
+                        continue;
+                else if (strcmp(next_token, "..") == 0) {
+                        /*
+                         * Strip the last path component except when we have
+                         * single "/"
+                         */
+                        if (resolved_len > 1) {
+                                resolved[resolved_len - 1] = '\0';
+                                q = strrchr(resolved, '/') + 1;
+                                *q = '\0';
+                                resolved_len = q - resolved;
+                        }
+                        continue;
                }
-        }
-        /*
-         * Save the last component name and get the full pathname of
-         * the current directory.
-         */
-        (void)strcpy(wbuf, p);
-        if (getcwd(resolved, MAXPATHLEN) == 0)
-                goto err1;
-        /*
+                /*
-         * Join the two strings together, ensuring that the right thing
+                 * Append the next path component and lstat() it. If
-         * happens if the last component is empty, or the dirname is root.
+                 * lstat() fails we still can return successfully if
-         */
+                 * there are no more path components left.
-        if (resolved[0] == '/' && resolved[1] == '\0')
+                 */
-                rootd = 1;
+                resolved_len = strlcat(resolved, next_token, PATH_MAX);
-        else
+                if (resolved_len >= PATH_MAX) {
-                rootd = 0;
-        if (*wbuf) {
-                if (strlen(resolved) + strlen(wbuf) + rootd + 1 > MAXPATHLEN) {
                        errno = ENAMETOOLONG;
-                        goto err1;
+                        return (NULL);
                }
-                if (rootd == 0)
+                if (lstat(resolved, &sb) != 0) {
-                        (void)strcat(resolved, "/");
+                        if (errno == ENOENT && p == NULL) {
-                (void)strcat(resolved, wbuf);
+                                errno = serrno;
-        }
+                                return (resolved);
+                        }
+                        return (NULL);
+                }
+                if (S_ISLNK(sb.st_mode)) {
+                        if (symlinks++ > MAXSYMLINKS) {
+                                errno = ELOOP;
+                                return (NULL);
+                        }
+                        slen = readlink(resolved, symlink, sizeof(symlink) - 1);
+                        if (slen < 0)
+                                return (NULL);
+                        symlink[slen] = '\0';
+                        if (symlink[0] == '/') {
+                                resolved[1] = 0;
+                                resolved_len = 1;
+                        } else if (resolved_len > 1) {
+                                /* Strip the last path component. */
+                                resolved[resolved_len - 1] = '\0';
+                                q = strrchr(resolved, '/') + 1;
+                                *q = '\0';
+                                resolved_len = q - resolved;
+                        }
-        /* Go back to where we came from. */
+                        /*
-        if (fchdir(fd) < 0) {
+                         * If there are any path components left, then
-                serrno = errno;
+                         * append them to symlink. The result is placed
-                goto err2;
+                         * in `left'.
+                         */
+                        if (p != NULL) {
+                                if (symlink[slen - 1] != '/') {
+                                        if (slen + 1 >= sizeof(symlink)) {
+                                                errno = ENAMETOOLONG;
+                                                return (NULL);
+                                        }
+                                        symlink[slen] = '/';
+                                        symlink[slen + 1] = 0;
+                                }
+                                left_len = strlcat(symlink, left, sizeof(left));
+                                if (left_len >= sizeof(left)) {
+                                        errno = ENAMETOOLONG;
+                                        return (NULL);
+                                }
+                        }
+                        left_len = strlcpy(left, symlink, sizeof(left));
+                }
        }
-        /* It's okay if the close fails, what's an fd more or less? */
+        /*
-        (void)close(fd);
+         * Remove trailing slash except when the resolved pathname
+         * is a single "/".
+         */
+        if (resolved_len > 1 && resolved[resolved_len - 1] == '/')
+                resolved[resolved_len - 1] = '\0';
        return (resolved);
-err1:   serrno = errno;
-        (void)fchdir(fd);
-err2:   (void)close(fd);
-        errno = serrno;
-        return (NULL);
 }
diff --git a/src/lib/libc/stdlib/remque.c b/src/lib/libc/stdlib/remque.c
new file mode 100644
index 0000000000..ae249ae053
--- /dev/null
+++ b/src/lib/libc/stdlib/remque.c
@@ -0,0 +1,44 @@
+/*      $OpenBSD: remque.c,v 1.2 2005/08/08 08:05:37 espie Exp $        */
+/*
+ *  Copyright (c) 1993 John Brezak
+ *  All rights reserved.
+ * 
+ *  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. The name of the author may be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `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 AUTHOR 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.
+ */
+#include <search.h>
+struct qelem {
+        struct qelem *q_forw;
+        struct qelem *q_back;
+};
+void
+remque(void *element)
+{
+        struct qelem *e = (struct qelem *) element;
+        e->q_forw->q_back = e->q_back;
+        e->q_back->q_forw = e->q_forw;
+}
diff --git a/src/lib/libc/stdlib/seed48.c b/src/lib/libc/stdlib/seed48.c
index e3d31901dd..583262f2d5 100644
--- a/src/lib/libc/stdlib/seed48.c
+++ b/src/lib/libc/stdlib/seed48.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: seed48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
 /*
 * Copyright (c) 1993 Martin Birgmeier
 * All rights reserved.
diff --git a/src/lib/libc/stdlib/setenv.c b/src/lib/libc/stdlib/setenv.c
index a36669888d..36540ebb0c 100644
--- a/src/lib/libc/stdlib/setenv.c
+++ b/src/lib/libc/stdlib/setenv.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: setenv.c,v 1.9 2005/08/08 08:05:37 espie Exp $ */
 /*
 * Copyright (c) 1987 Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,30 +28,24 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)setenv.c     5.6 (Berkeley) 6/4/91";*/
-static char *rcsid = "$Id: setenv.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <stdlib.h>
 #include <string.h>
+char *__findenv(const char *name, int *offset);
+extern char **environ;
 /*
 * setenv --
 *      Set the value of the environmental variable "name" to be
 *      "value".  If rewrite is set, replace any current value.
 */
 int
-setenv(name, value, rewrite)
+setenv(const char *name, const char *value, int rewrite)
-        register const char *name;
-        register const char *value;
-        int rewrite;
 {
-        extern char **environ;
+        static char **lastenv;                  /* last value of environ */
-        static int alloced;                     /* if allocated space before */
+        char *C;
-        register char *C;
        int l_value, offset;
-        char *__findenv();
        if (*value == '=')                      /* no `=' in value */
                ++value;
@@ -63,39 +54,34 @@ setenv(name, value, rewrite)
                if (!rewrite)
                        return (0);
                if (strlen(C) >= l_value) {     /* old larger; copy over */
-                        while (*C++ = *value++);
+                        while ((*C++ = *value++))
+                                ;
                        return (0);
                }
        } else {                                        /* create new slot */
-                register int    cnt;
+                size_t cnt;
-                register char   **P;
+                char **P;
-                for (P = environ, cnt = 0; *P; ++P, ++cnt);
+                for (P = environ; *P != NULL; P++)
-                if (alloced) {                  /* just increase size */
+                        ;
-                        environ = (char **)realloc((char *)environ,
+                cnt = P - environ;
-                            (size_t)(sizeof(char *) * (cnt + 2)));
+                P = (char **)realloc(lastenv, sizeof(char *) * (cnt + 2));
-                        if (!environ)
+                if (!P)
-                                return (-1);
+                        return (-1);
-                }
+                if (lastenv != environ)
-                else {                          /* get new space */
+                        memcpy(P, environ, cnt * sizeof(char *));
-                        alloced = 1;            /* copy old entries into it */
+                lastenv = environ = P;
-                        P = (char **)malloc((size_t)(sizeof(char *) *
-                            (cnt + 2)));
-                        if (!P)
-                                return (-1);
-                        bcopy(environ, P, cnt * sizeof(char *));
-                        environ = P;
-                }
-                environ[cnt + 1] = NULL;
                offset = cnt;
+                environ[cnt + 1] = NULL;
        }
-        for (C = (char *)name; *C && *C != '='; ++C);   /* no `=' in name */
+        for (C = (char *)name; *C && *C != '='; ++C)
+                ;                               /* no `=' in name */
        if (!(environ[offset] =                 /* name + `=' + value */
            malloc((size_t)((int)(C - name) + l_value + 2))))
                return (-1);
        for (C = environ[offset]; (*C = *name++) && *C != '='; ++C)
                ;
-        for (*C++ = '='; *C++ = *value++; )
+        for (*C++ = '='; (*C++ = *value++); )
                ;
        return (0);
 }
@@ -105,15 +91,12 @@ setenv(name, value, rewrite)
 *      Delete environmental variable "name".
 */
 void
-unsetenv(name)
+unsetenv(const char *name)
-        const char      *name;
 {
-        extern char **environ;
+        char **P;
-        register char **P;
        int offset;
-        char *__findenv();
-        while (__findenv(name, &offset))                /* if set multiple times */
+        while (__findenv(name, &offset))        /* if set multiple times */
                for (P = &environ[offset];; ++P)
                        if (!(*P = *(P + 1)))
                                break;
diff --git a/src/lib/libc/stdlib/srand48.c b/src/lib/libc/stdlib/srand48.c
index daf733f93e..f76b6cca86 100644
--- a/src/lib/libc/stdlib/srand48.c
+++ b/src/lib/libc/stdlib/srand48.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: srand48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
 /*
 * Copyright (c) 1993 Martin Birgmeier
 * All rights reserved.
diff --git a/src/lib/libc/stdlib/strtod.3 b/src/lib/libc/stdlib/strtod.3
index 0b7f973857..e25b0a5511 100644
--- a/src/lib/libc/stdlib/strtod.3
+++ b/src/lib/libc/stdlib/strtod.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)strtod.3      5.3 (Berkeley) 6/29/91
+.\"     $OpenBSD: strtod.3,v 1.8 2003/06/02 20:18:38 millert Exp $
-.\"     $Id: strtod.3,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt STRTOD 3
@@ -51,20 +46,25 @@ string to double
 .Sh DESCRIPTION
 The
 .Fn strtod
-function converts the initial portion of the string 
+function converts the initial portion of the string pointed to by
-pointed to by
 .Fa nptr
 to
-.Em double
+.Li double
 representation.
 .Pp
-The expected form of the string is an optional plus (``+'') or minus
+The expected form of the string is an optional plus
-sign (``-'') followed by a sequence of digits optionally containing
+.Pq Ql +
+or minus sign
+.Pq Ql -
+followed by a sequence of digits optionally containing
 a decimal-point character, optionally followed by an exponent.
-An exponent consists of an ``E'' or ``e'', followed by an optional plus
+An exponent consists of an
-or minus sign, followed by a sequence of digits.
+.Sq E
+or
+.Sq e ,
+followed by an optional plus or minus sign, followed by a sequence of digits.
 .Pp
-Leading white-space characters in the string (as defined by the
+Leading whitespace characters in the string (as defined by the
 .Xr isspace 3
 function) are skipped.
 .Sh RETURN VALUES
@@ -88,18 +88,18 @@ is stored in the location referenced by
 If the correct value would cause overflow, plus or minus
 .Dv HUGE_VAL
 is returned (according to the sign of the value), and
-.Dv ERANGE
+.Er ERANGE
 is stored in
 .Va errno .
-If the correct value would cause underflow, zero is
+If the correct value would cause underflow, zero is returned and
-returned and
+.Er ERANGE
-.Dv ERANGE
+is stored in
-is stored in 
 .Va errno .
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er ERANGE
 Overflow or underflow occurred.
+.El
 .Sh SEE ALSO
 .Xr atof 3 ,
 .Xr atoi 3 ,
@@ -109,6 +109,5 @@ Overflow or underflow occurred.
 .Sh STANDARDS
 The
 .Fn strtod
-function
+function conforms to
-conforms to
 .St -ansiC .
diff --git a/src/lib/libc/stdlib/strtod.c b/src/lib/libc/stdlib/strtod.c
index b13fa128f5..d01158e10c 100644
--- a/src/lib/libc/stdlib/strtod.c
+++ b/src/lib/libc/stdlib/strtod.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: strtod.c,v 1.22 2006/05/19 14:15:27 thib Exp $ */
 /****************************************************************
 *
 * The author of this software is David M. Gay.
@@ -79,7 +80,6 @@
 * #define Just_16 to store 16 bits per 32-bit Long when doing high-precision
 *      integer arithmetic.  Whether this speeds things up or slows things
 *      down depends on the machine and the number being converted.
- * #define KR_headers for old-style C function headers.
 * #define Bad_float_h if your system lacks a float.h or if it does not
 *      define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
 *      FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
@@ -89,13 +89,11 @@
 *      directly -- and assumed always to succeed.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$Id: strtod.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
-    defined(__mips__) || defined(__ns32k__) || defined(__alpha__)
+    defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
-#include <machine/endian.h>
+    defined(__powerpc__) || defined(__m88k__) || defined(__hppa__) || \
+    defined(__x86_64__) || (defined(__arm__) && defined(__VFP_FP__))
+#include <sys/types.h>
 #if BYTE_ORDER == BIG_ENDIAN
 #define IEEE_BIG_ENDIAN
 #else
@@ -103,7 +101,16 @@ static char *rcsid = "$Id: strtod.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $"
 #endif
 #endif
-#ifdef vax
+#if defined(__arm__) && !defined(__VFP_FP__)
+/*
+ * Although the CPU is little endian the FP has different
+ * byte and word endianness. The byte order is still little endian
+ * but the word order is big endian.
+ */
+#define IEEE_BIG_ENDIAN
+#endif
+#ifdef __vax__
 #define VAX
 #endif
@@ -119,22 +126,13 @@ static char *rcsid = "$Id: strtod.c,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $"
 #include "malloc.h"
 #include "memory.h"
 #else
-#ifndef KR_headers
 #include "stdlib.h"
 #include "string.h"
 #include "locale.h"
-#else
-#include "malloc.h"
-#include "memory.h"
-#endif
 #endif
 #ifdef MALLOC
-#ifdef KR_headers
-extern char *MALLOC();
-#else
 extern void *MALLOC(size_t);
-#endif
 #else
 #define MALLOC malloc
 #endif
@@ -143,7 +141,6 @@ extern void *MALLOC(size_t);
 #include "errno.h"
 #ifdef Bad_float_h
-#undef __STDC__
 #ifdef IEEE_BIG_ENDIAN
 #define IEEE_ARITHMETIC
 #endif
@@ -193,12 +190,8 @@ extern "C" {
 #endif
 #ifndef CONST
-#ifdef KR_headers
-#define CONST /* blank */
-#else
 #define CONST const
 #endif
-#endif
 #ifdef Unsigned_Shifts
 #define Sign_Extend(a,b) if (b < 0) a |= 0xffff0000;
@@ -212,19 +205,24 @@ Exactly one of IEEE_LITTLE_ENDIAN IEEE_BIG_ENDIAN, VAX, or
 IBM should be defined.
 #endif
+typedef union {
+        double d;
+        ULong ul[2];
+} _double;
+#define value(x) ((x).d)
 #ifdef IEEE_LITTLE_ENDIAN
-#define word0(x) ((ULong *)&x)[1]
+#define word0(x) ((x).ul[1])
-#define word1(x) ((ULong *)&x)[0]
+#define word1(x) ((x).ul[0])
 #else
-#define word0(x) ((ULong *)&x)[0]
+#define word0(x) ((x).ul[0])
-#define word1(x) ((ULong *)&x)[1]
+#define word1(x) ((x).ul[1])
 #endif
 /* The following definition of Storeinc is appropriate for MIPS processors.
 * An alternative that might be better on some machines is
 * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
 */
-#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX)
+#if defined(IEEE_LITTLE_ENDIAN) + defined(VAX) + defined(__arm__)
 #define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
 ((unsigned short *)a)[0] = (unsigned short)c, a++)
 #else
@@ -326,11 +324,7 @@ IBM should be defined.
 #ifdef RND_PRODQUOT
 #define rounded_product(a,b) a = rnd_prod(a, b)
 #define rounded_quotient(a,b) a = rnd_quot(a, b)
-#ifdef KR_headers
-extern double rnd_prod(), rnd_quot();
-#else
 extern double rnd_prod(double, double), rnd_quot(double, double);
-#endif
 #else
 #define rounded_product(a,b) a *= b
 #define rounded_quotient(a,b) a /= b
@@ -370,17 +364,12 @@ Bigint {
 static Bigint *freelist[Kmax+1];
 static Bigint *
-Balloc
+Balloc(int k)
-#ifdef KR_headers
-        (k) int k;
-#else
-        (int k)
-#endif
 {
        int x;
        Bigint *rv;
-        if (rv = freelist[k]) {
+        if ((rv = freelist[k])) {
                freelist[k] = rv->next;
                }
        else {
@@ -394,12 +383,7 @@ Balloc
        }
 static void
-Bfree
+Bfree(Bigint *v)
-#ifdef KR_headers
-        (v) Bigint *v;
-#else
-        (Bigint *v)
-#endif
 {
        if (v) {
                v->next = freelist[v->k];
@@ -411,12 +395,7 @@ Bfree
 y->wds*sizeof(Long) + 2*sizeof(int))
 static Bigint *
-multadd
+multadd(Bigint *b, int m, int a)        /* multiply by m and add a */
-#ifdef KR_headers
-        (b, m, a) Bigint *b; int m, a;
-#else
-        (Bigint *b, int m, int a)       /* multiply by m and add a */
-#endif
 {
        int i, wds;
        ULong *x, y;
@@ -456,12 +435,7 @@ multadd
        }
 static Bigint *
-s2b
+s2b(CONST char *s, int nd0, int nd, ULong y9)
-#ifdef KR_headers
-        (s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
-#else
-        (CONST char *s, int nd0, int nd, ULong y9)
-#endif
 {
        Bigint *b;
        int i, k;
@@ -494,14 +468,9 @@ s2b
        }
 static int
-hi0bits
+hi0bits(ULong x)
-#ifdef KR_headers
-        (x) register ULong x;
-#else
-        (register ULong x)
-#endif
 {
-        register int k = 0;
+        int k = 0;
        if (!(x & 0xffff0000)) {
                k = 16;
@@ -528,15 +497,10 @@ hi0bits
        }
 static int
-lo0bits
+lo0bits(ULong *y)
-#ifdef KR_headers
-        (y) ULong *y;
-#else
-        (ULong *y)
-#endif
 {
-        register int k;
+        int k;
-        register ULong x = *y;
+        ULong x = *y;
        if (x & 7) {
                if (x & 1)
@@ -568,7 +532,7 @@ lo0bits
        if (!(x & 1)) {
                k++;
                x >>= 1;
-                if (!x & 1)
+                if (!(x & 1))
                        return 32;
                }
        *y = x;
@@ -576,12 +540,7 @@ lo0bits
        }
 static Bigint *
-i2b
+i2b(int i)
-#ifdef KR_headers
-        (i) int i;
-#else
-        (int i)
-#endif
 {
        Bigint *b;
@@ -592,12 +551,7 @@ i2b
        }
 static Bigint *
-mult
+mult(Bigint *a, Bigint *b)
-#ifdef KR_headers
-        (a, b) Bigint *a, *b;
-#else
-        (Bigint *a, Bigint *b)
-#endif
 {
        Bigint *c;
        int k, wa, wb, wc;
@@ -628,7 +582,7 @@ mult
        xc0 = c->x;
 #ifdef Pack_32
        for(; xb < xbe; xb++, xc0++) {
-                if (y = *xb & 0xffff) {
+                if ((y = *xb & 0xffff)) {
                        x = xa;
                        xc = xc0;
                        carry = 0;
@@ -642,7 +596,7 @@ mult
                                while(x < xae);
                        *xc = carry;
                        }
-                if (y = *xb >> 16) {
+                if ((y = *xb >> 16)) {
                        x = xa;
                        xc = xc0;
                        carry = 0;
@@ -682,18 +636,13 @@ mult
 static Bigint *p5s;
 static Bigint *
-pow5mult
+pow5mult(Bigint *b, int k)
-#ifdef KR_headers
-        (b, k) Bigint *b; int k;
-#else
-        (Bigint *b, int k)
-#endif
 {
        Bigint *b1, *p5, *p51;
        int i;
        static int p05[3] = { 5, 25, 125 };
-        if (i = k & 3)
+        if ((i = k & 3))
                b = multadd(b, p05[i-1], 0);
        if (!(k >>= 2))
@@ -721,12 +670,7 @@ pow5mult
        }
 static Bigint *
-lshift
+lshift(Bigint *b, int k)
-#ifdef KR_headers
-        (b, k) Bigint *b; int k;
-#else
-        (Bigint *b, int k)
-#endif
 {
        int i, k1, n, n1;
        Bigint *b1;
@@ -756,7 +700,7 @@ lshift
                        z = *x++ >> k1;
                        }
                        while(x < xe);
-                if (*x1 = z)
+                if ((*x1 = z))
                        ++n1;
                }
 #else
@@ -781,12 +725,7 @@ lshift
        }
 static int
-cmp
+cmp(Bigint *a, Bigint *b)
-#ifdef KR_headers
-        (a, b) Bigint *a, *b;
-#else
-        (Bigint *a, Bigint *b)
-#endif
 {
        ULong *xa, *xa0, *xb, *xb0;
        int i, j;
@@ -815,12 +754,7 @@ cmp
        }
 static Bigint *
-diff
+diff(Bigint *a, Bigint *b)
-#ifdef KR_headers
-        (a, b) Bigint *a, *b;
-#else
-        (Bigint *a, Bigint *b)
-#endif
 {
        Bigint *c;
        int i, wa, wb;
@@ -897,16 +831,13 @@ diff
        }
 static double
-ulp
+ulp(double _x)
-#ifdef KR_headers
-        (x) double x;
-#else
-        (double x)
-#endif
 {
-        register Long L;
+        _double x;
-        double a;
+        Long L;
+        _double a;
+        value(x) = _x;
        L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
 #ifndef Sudden_Underflow
        if (L > 0) {
@@ -931,20 +862,15 @@ ulp
                        }
                }
 #endif
-        return a;
+        return value(a);
        }
 static double
-b2d
+b2d(Bigint *a, int *e)
-#ifdef KR_headers
-        (a, e) Bigint *a; int *e;
-#else
-        (Bigint *a, int *e)
-#endif
 {
        ULong *xa, *xa0, w, y, z;
        int k;
-        double d;
+        _double d;
 #ifdef VAX
        ULong d0, d1;
 #else
@@ -1001,22 +927,22 @@ b2d
 #undef d0
 #undef d1
 #endif
-        return d;
+        return value(d);
        }
 static Bigint *
-d2b
+d2b(double _d, int *e, int *bits)
-#ifdef KR_headers
-        (d, e, bits) double d; int *e, *bits;
-#else
-        (double d, int *e, int *bits)
-#endif
 {
        Bigint *b;
        int de, i, k;
        ULong *x, y, z;
+        _double d;
 #ifdef VAX
        ULong d0, d1;
+#endif
+        value(d) = _d;
+#ifdef VAX
        d0 = word0(d) >> 16 | word0(d) << 16;
        d1 = word1(d) >> 16 | word1(d) << 16;
 #else
@@ -1134,18 +1060,13 @@ d2b
 #undef d1
 static double
-ratio
+ratio(Bigint *a, Bigint *b)
-#ifdef KR_headers
-        (a, b) Bigint *a, *b;
-#else
-        (Bigint *a, Bigint *b)
-#endif
 {
-        double da, db;
+        _double da, db;
        int k, ka, kb;
-        da = b2d(a, &ka);
+        value(da) = b2d(a, &ka);
-        db = b2d(b, &kb);
+        value(db) = b2d(b, &kb);
 #ifdef Pack_32
        k = ka - kb + 32*(a->wds - b->wds);
 #else
@@ -1171,7 +1092,7 @@ ratio
                word0(db) += k*Exp_msk1;
                }
 #endif
-        return da / db;
+        return value(da) / value(db);
        }
 static CONST double
@@ -1201,32 +1122,24 @@ static CONST double tinytens[] = { 1e-16, 1e-32 };
 #endif
 double
-strtod
+strtod(CONST char *s00, char **se)
-#ifdef KR_headers
-        (s00, se) CONST char *s00; char **se;
-#else
-        (CONST char *s00, char **se)
-#endif
 {
        int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
                 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
        CONST char *s, *s0, *s1;
-        double aadj, aadj1, adj, rv, rv0;
+        double aadj, aadj1, adj;
+        _double rv, rv0;
        Long L;
        ULong y, z;
        Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
-#ifndef KR_headers
        CONST char decimal_point = localeconv()->decimal_point[0];
-#else
-        CONST char decimal_point = '.';
-#endif
        sign = nz0 = nz = 0;
-        rv = 0.;
+        value(rv) = 0.;
-        for(s = s00; isspace(*s); s++)
+        for(s = s00; isspace((unsigned char) *s); s++)
                ;
        if (*s == '-') {
@@ -1340,9 +1253,9 @@ strtod
        if (!nd0)
                nd0 = nd;
        k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
-        rv = y;
+        value(rv) = y;
        if (k > 9)
-                rv = tens[k - 9] * rv + z;
+                value(rv) = tens[k - 9] * value(rv) + z;
        bd0 = 0;
        if (nd <= DBL_DIG
 #ifndef RND_PRODQUOT
@@ -1356,7 +1269,8 @@ strtod
 #ifdef VAX
                                goto vax_ovfl_check;
 #else
-                                /* rv = */ rounded_product(rv, tens[e]);
+                                /* value(rv) = */ rounded_product(value(rv),
+                                    tens[e]);
                                goto ret;
 #endif
                                }
@@ -1366,27 +1280,30 @@ strtod
                                 * this for larger i values.
                                 */
                                e -= i;
-                                rv *= tens[i];
+                                value(rv) *= tens[i];
 #ifdef VAX
                                /* VAX exponent range is so narrow we must
                                 * worry about overflow here...
                                 */
 vax_ovfl_check:
                                word0(rv) -= P*Exp_msk1;
-                                /* rv = */ rounded_product(rv, tens[e]);
+                                /* value(rv) = */ rounded_product(value(rv),
+                                    tens[e]);
                                if ((word0(rv) & Exp_mask)
                                 > Exp_msk1*(DBL_MAX_EXP+Bias-1-P))
                                        goto ovfl;
                                word0(rv) += P*Exp_msk1;
 #else
-                                /* rv = */ rounded_product(rv, tens[e]);
+                                /* value(rv) = */ rounded_product(value(rv),
+                                    tens[e]);
 #endif
                                goto ret;
                                }
                        }
 #ifndef Inaccurate_Divide
                else if (e >= -Ten_pmax) {
-                        /* rv = */ rounded_quotient(rv, tens[-e]);
+                        /* value(rv) = */ rounded_quotient(value(rv),
+                            tens[-e]);
                        goto ret;
                        }
 #endif
@@ -1397,13 +1314,13 @@ strtod
        if (e1 > 0) {
                if (i = e1 & 15)
-                        rv *= tens[i];
+                        value(rv) *= tens[i];
                if (e1 &= ~15) {
                        if (e1 > DBL_MAX_10_EXP) {
 ovfl:
                                errno = ERANGE;
-#ifdef __STDC__
+#ifndef Bad_float_h
-                                rv = HUGE_VAL;
+                                value(rv) = HUGE_VAL;
 #else
                                /* Can't trust HUGE_VAL */
 #ifdef IEEE_Arith
@@ -1421,10 +1338,10 @@ strtod
                        if (e1 >>= 4) {
                                for(j = 0; e1 > 1; j++, e1 >>= 1)
                                        if (e1 & 1)
-                                                rv *= bigtens[j];
+                                                value(rv) *= bigtens[j];
                        /* The last multiplication could overflow. */
                                word0(rv) -= P*Exp_msk1;
-                                rv *= bigtens[j];
+                                value(rv) *= bigtens[j];
                                if ((z = word0(rv) & Exp_mask)
                                 > Exp_msk1*(DBL_MAX_EXP+Bias-P))
                                        goto ovfl;
@@ -1443,23 +1360,23 @@ strtod
        else if (e1 < 0) {
                e1 = -e1;
                if (i = e1 & 15)
-                        rv /= tens[i];
+                        value(rv) /= tens[i];
                if (e1 &= ~15) {
                        e1 >>= 4;
                        if (e1 >= 1 << n_bigtens)
                                goto undfl;
                        for(j = 0; e1 > 1; j++, e1 >>= 1)
                                if (e1 & 1)
-                                        rv *= tinytens[j];
+                                        value(rv) *= tinytens[j];
                        /* The last multiplication could underflow. */
-                        rv0 = rv;
+                        value(rv0) = value(rv);
-                        rv *= tinytens[j];
+                        value(rv) *= tinytens[j];
-                        if (!rv) {
+                        if (!value(rv)) {
-                                rv = 2.*rv0;
+                                value(rv) = 2.*value(rv0);
-                                rv *= tinytens[j];
+                                value(rv) *= tinytens[j];
-                                if (!rv) {
+                                if (!value(rv)) {
 undfl:
-                                        rv = 0.;
+                                        value(rv) = 0.;
                                        errno = ERANGE;
                                        if (bd0)
                                                goto retfree;
@@ -1483,7 +1400,7 @@ strtod
        for(;;) {
                bd = Balloc(bd0->k);
                Bcopy(bd, bd0);
-                bb = d2b(rv, &bbe, &bbbits);    /* rv = bb * 2^bbe */
+                bb = d2b(value(rv), &bbe, &bbbits);     /* rv = bb * 2^bbe */
                bs = i2b(1);
                if (e >= 0) {
@@ -1595,12 +1512,12 @@ strtod
                                break;
 #endif
                        if (dsign)
-                                rv += ulp(rv);
+                                value(rv) += ulp(value(rv));
 #ifndef ROUND_BIASED
                        else {
-                                rv -= ulp(rv);
+                                value(rv) -= ulp(value(rv));
 #ifndef Sudden_Underflow
-                                if (!rv)
+                                if (!value(rv))
                                        goto undfl;
 #endif
                                }
@@ -1651,10 +1568,10 @@ strtod
                /* Check for overflow */
                if (y == Exp_msk1*(DBL_MAX_EXP+Bias-1)) {
-                        rv0 = rv;
+                        value(rv0) = value(rv);
                        word0(rv) -= P*Exp_msk1;
-                        adj = aadj1 * ulp(rv);
+                        adj = aadj1 * ulp(value(rv));
-                        rv += adj;
+                        value(rv) += adj;
                        if ((word0(rv) & Exp_mask) >=
                                        Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
                                if (word0(rv0) == Big0 && word1(rv0) == Big1)
@@ -1669,10 +1586,10 @@ strtod
                else {
 #ifdef Sudden_Underflow
                        if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
-                                rv0 = rv;
+                                value(rv0) = value(rv);
                                word0(rv) += P*Exp_msk1;
-                                adj = aadj1 * ulp(rv);
+                                adj = aadj1 * ulp(value(rv));
-                                rv += adj;
+                                value(rv) += adj;
 #ifdef IBM
                                if ((word0(rv) & Exp_mask) <  P*Exp_msk1)
 #else
@@ -1690,8 +1607,8 @@ strtod
                                        word0(rv) -= P*Exp_msk1;
                                }
                        else {
-                                adj = aadj1 * ulp(rv);
+                                adj = aadj1 * ulp(value(rv));
-                                rv += adj;
+                                value(rv) += adj;
                                }
 #else
                        /* Compute adj so that the IEEE rounding rules will
@@ -1706,8 +1623,8 @@ strtod
                                if (!dsign)
                                        aadj1 = -aadj1;
                                }
-                        adj = aadj1 * ulp(rv);
+                        adj = aadj1 * ulp(value(rv));
-                        rv += adj;
+                        value(rv) += adj;
 #endif
                        }
                z = word0(rv) & Exp_mask;
@@ -1738,16 +1655,11 @@ strtod
 ret:
        if (se)
                *se = (char *)s;
-        return sign ? -rv : rv;
+        return sign ? -value(rv) : value(rv);
        }
 static int
-quorem
+quorem(Bigint *b, Bigint *S)
-#ifdef KR_headers
-        (b, S) Bigint *b, *S;
-#else
-        (Bigint *b, Bigint *S)
-#endif
 {
        int n;
        Long borrow, y;
@@ -1882,13 +1794,7 @@ quorem
 */
 char *
-__dtoa
+__dtoa(double _d, int mode, int ndigits, int *decpt, int *sign, char **rve)
-#ifdef KR_headers
-        (d, mode, ndigits, decpt, sign, rve)
-        double d; int mode, ndigits, *decpt, *sign; char **rve;
-#else
-        (double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
-#endif
 {
 /*     Arguments ndigits, decpt, sign are similar to those
        of ecvt and fcvt; trailing zeros are suppressed from
@@ -1933,11 +1839,13 @@ __dtoa
        ULong x;
 #endif
        Bigint *b, *b1, *delta, *mlo, *mhi, *S;
-        double d2, ds, eps;
+        double ds;
        char *s, *s0;
        static Bigint *result;
        static int result_k;
+        _double d, d2, eps;
+        value(d) = _d;
        if (result) {
                result->k = result_k;
                result->maxwds = 1 << result_k;
@@ -1964,7 +1872,7 @@ __dtoa
                *decpt = 9999;
                s =
 #ifdef IEEE_Arith
-                        !word1(d) && !(word0(d) & 0xfffff) ? "Infinity" :
+                        !word1(d) && !(word0(d) & 0xfffff) ? ndigits < 8 ? "Inf" : "Infinity" :
 #endif
                                "NaN";
                if (rve)
@@ -1977,9 +1885,9 @@ __dtoa
                }
 #endif
 #ifdef IBM
-        d += 0; /* normalize */
+        value(d) += 0; /* normalize */
 #endif
-        if (!d) {
+        if (!value(d)) {
                *decpt = 1;
                s = "0";
                if (rve)
@@ -1987,18 +1895,18 @@ __dtoa
                return s;
                }
-        b = d2b(d, &be, &bbits);
+        b = d2b(value(d), &be, &bbits);
 #ifdef Sudden_Underflow
        i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
 #else
        if (i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1))) {
 #endif
-                d2 = d;
+                value(d2) = value(d);
                word0(d2) &= Frac_mask1;
                word0(d2) |= Exp_11;
 #ifdef IBM
                if (j = 11 - hi0bits(word0(d2) & Frac_mask))
-                        d2 /= 1 << j;
+                        value(d2) /= 1 << j;
 #endif
                /* log(x)       ~=~ log(1.5) + (x-1.5)/1.5
@@ -2037,19 +1945,20 @@ __dtoa
                i = bbits + be + (Bias + (P-1) - 1);
                x = i > 32  ? word0(d) << 64 - i | word1(d) >> i - 32
                            : word1(d) << 32 - i;
-                d2 = x;
+                value(d2) = x;
                word0(d2) -= 31*Exp_msk1; /* adjust exponent */
                i -= (Bias + (P-1) - 1) + 1;
                denorm = 1;
                }
 #endif
-        ds = (d2-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;
+        ds = (value(d2)-1.5)*0.289529654602168 + 0.1760912590558 +
+            i*0.301029995663981;
        k = (int)ds;
        if (ds < 0. && ds != k)
                k--;    /* want k = floor(ds) */
        k_check = 1;
        if (k >= 0 && k <= Ten_pmax) {
-                if (d < tens[k])
+                if (value(d) < tens[k])
                        k--;
                k_check = 0;
                }
@@ -2116,7 +2025,7 @@ __dtoa
                /* Try to get by with floating-point arithmetic. */
                i = 0;
-                d2 = d;
+                value(d2) = value(d);
                k0 = k;
                ilim0 = ilim;
                ieps = 2; /* conservative */
@@ -2126,7 +2035,7 @@ __dtoa
                        if (j & Bletch) {
                                /* prevent overflows */
                                j &= Bletch - 1;
-                                d /= bigtens[n_bigtens-1];
+                                value(d) /= bigtens[n_bigtens-1];
                                ieps++;
                                }
                        for(; j; j >>= 1, i++)
@@ -2134,32 +2043,32 @@ __dtoa
                                        ieps++;
                                        ds *= bigtens[i];
                                        }
-                        d /= ds;
+                        value(d) /= ds;
                        }
                else if (j1 = -k) {
-                        d *= tens[j1 & 0xf];
+                        value(d) *= tens[j1 & 0xf];
                        for(j = j1 >> 4; j; j >>= 1, i++)
                                if (j & 1) {
                                        ieps++;
-                                        d *= bigtens[i];
+                                        value(d) *= bigtens[i];
                                        }
                        }
-                if (k_check && d < 1. && ilim > 0) {
+                if (k_check && value(d) < 1. && ilim > 0) {
                        if (ilim1 <= 0)
                                goto fast_failed;
                        ilim = ilim1;
                        k--;
-                        d *= 10.;
+                        value(d) *= 10.;
                        ieps++;
                        }
-                eps = ieps*d + 7.;
+                value(eps) = ieps*value(d) + 7.;
                word0(eps) -= (P-1)*Exp_msk1;
                if (ilim == 0) {
                        S = mhi = 0;
-                        d -= 5.;
+                        value(d) -= 5.;
-                        if (d > eps)
+                        if (value(d) > value(eps))
                                goto one_digit;
-                        if (d < -eps)
+                        if (value(d) < -value(eps))
                                goto no_digits;
                        goto fast_failed;
                        }
@@ -2168,33 +2077,33 @@ __dtoa
                        /* Use Steele & White method of only
                         * generating digits needed.
                         */
-                        eps = 0.5/tens[ilim-1] - eps;
+                        value(eps) = 0.5/tens[ilim-1] - value(eps);
                        for(i = 0;;) {
-                                L = d;
+                                L = value(d);
-                                d -= L;
+                                value(d) -= L;
                                *s++ = '0' + (int)L;
-                                if (d < eps)
+                                if (value(d) < value(eps))
                                        goto ret1;
-                                if (1. - d < eps)
+                                if (1. - value(d) < value(eps))
                                        goto bump_up;
                                if (++i >= ilim)
                                        break;
-                                eps *= 10.;
+                                value(eps) *= 10.;
-                                d *= 10.;
+                                value(d) *= 10.;
                                }
                        }
                else {
 #endif
                        /* Generate ilim digits, then fix them up. */
-                        eps *= tens[ilim-1];
+                        value(eps) *= tens[ilim-1];
-                        for(i = 1;; i++, d *= 10.) {
+                        for(i = 1;; i++, value(d) *= 10.) {
-                                L = d;
+                                L = value(d);
-                                d -= L;
+                                value(d) -= L;
                                *s++ = '0' + (int)L;
                                if (i == ilim) {
-                                        if (d > 0.5 + eps)
+                                        if (value(d) > 0.5 + value(eps))
                                                goto bump_up;
-                                        else if (d < 0.5 - eps) {
+                                        else if (value(d) < 0.5 - value(eps)) {
                                                while(*--s == '0');
                                                s++;
                                                goto ret1;
@@ -2207,7 +2116,7 @@ __dtoa
 #endif
 fast_failed:
                s = s0;
-                d = d2;
+                value(d) = value(d2);
                k = k0;
                ilim = ilim0;
                }
@@ -2219,24 +2128,24 @@ __dtoa
                ds = tens[k];
                if (ndigits < 0 && ilim <= 0) {
                        S = mhi = 0;
-                        if (ilim < 0 || d <= 5*ds)
+                        if (ilim < 0 || value(d) <= 5*ds)
                                goto no_digits;
                        goto one_digit;
                        }
                for(i = 1;; i++) {
-                        L = d / ds;
+                        L = value(d) / ds;
-                        d -= L*ds;
+                        value(d) -= L*ds;
 #ifdef Check_FLT_ROUNDS
                        /* If FLT_ROUNDS == 2, L will usually be high by 1 */
-                        if (d < 0) {
+                        if (value(d) < 0) {
                                L--;
-                                d += ds;
+                                value(d) += ds;
                                }
 #endif
                        *s++ = '0' + (int)L;
                        if (i == ilim) {
-                                d += d;
+                                value(d) += value(d);
-                                if (d > ds || d == ds && L & 1) {
+                                if (value(d) > ds || value(d) == ds && L & 1) {
 bump_up:
                                        while(*--s == '9')
                                                if (s == s0) {
@@ -2248,7 +2157,7 @@ __dtoa
                                        }
                                break;
                                }
-                        if (!(d *= 10.))
+                        if (!(value(d) *= 10.))
                                break;
                        }
                goto ret1;
diff --git a/src/lib/libc/stdlib/strtoimax.c b/src/lib/libc/stdlib/strtoimax.c
new file mode 100644
index 0000000000..2c77f41650
--- /dev/null
+++ b/src/lib/libc/stdlib/strtoimax.c
@@ -0,0 +1,140 @@
+/*      $OpenBSD: strtoimax.c,v 1.1 2006/01/13 17:58:09 millert Exp $   */
+/*-
+ * Copyright (c) 1992 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.
+ */
+#include <ctype.h>
+#include <errno.h>
+#include <inttypes.h>
+/*
+ * Convert a string to an intmax_t
+ *
+ * Ignores `locale' stuff.  Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+intmax_t
+strtoimax(const char *nptr, char **endptr, int base)
+{
+        const char *s;
+        intmax_t acc, cutoff;
+        int c;
+        int neg, any, cutlim;
+        /*
+         * Skip white space and pick up leading +/- sign if any.
+         * If base is 0, allow 0x for hex and 0 for octal, else
+         * assume decimal; if base is already 16, allow 0x.
+         */
+        s = nptr;
+        do {
+                c = (unsigned char) *s++;
+        } while (isspace(c));
+        if (c == '-') {
+                neg = 1;
+                c = *s++;
+        } else {
+                neg = 0;
+                if (c == '+')
+                        c = *s++;
+        }
+        if ((base == 0 || base == 16) &&
+            c == '0' && (*s == 'x' || *s == 'X')) {
+                c = s[1];
+                s += 2;
+                base = 16;
+        }
+        if (base == 0)
+                base = c == '0' ? 8 : 10;
+        /*
+         * Compute the cutoff value between legal numbers and illegal
+         * numbers.  That is the largest legal value, divided by the
+         * base.  An input number that is greater than this value, if
+         * followed by a legal input character, is too big.  One that
+         * is equal to this value may be valid or not; the limit
+         * between valid and invalid numbers is then based on the last
+         * digit.  For instance, if the range for intmax_t is
+         * [-9223372036854775808..9223372036854775807] and the input base
+         * is 10, cutoff will be set to 922337203685477580 and cutlim to
+         * either 7 (neg==0) or 8 (neg==1), meaning that if we have
+         * accumulated a value > 922337203685477580, or equal but the
+         * next digit is > 7 (or 8), the number is too big, and we will
+         * return a range error.
+         *
+         * Set any if any `digits' consumed; make it negative to indicate
+         * overflow.
+         */
+        cutoff = neg ? INTMAX_MIN : INTMAX_MAX;
+        cutlim = cutoff % base;
+        cutoff /= base;
+        if (neg) {
+                if (cutlim > 0) {
+                        cutlim -= base;
+                        cutoff += 1;
+                }
+                cutlim = -cutlim;
+        }
+        for (acc = 0, any = 0;; c = (unsigned char) *s++) {
+                if (isdigit(c))
+                        c -= '0';
+                else if (isalpha(c))
+                        c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+                else
+                        break;
+                if (c >= base)
+                        break;
+                if (any < 0)
+                        continue;
+                if (neg) {
+                        if (acc < cutoff || (acc == cutoff && c > cutlim)) {
+                                any = -1;
+                                acc = INTMAX_MIN;
+                                errno = ERANGE;
+                        } else {
+                                any = 1;
+                                acc *= base;
+                                acc -= c;
+                        }
+                } else {
+                        if (acc > cutoff || (acc == cutoff && c > cutlim)) {
+                                any = -1;
+                                acc = INTMAX_MAX;
+                                errno = ERANGE;
+                        } else {
+                                any = 1;
+                                acc *= base;
+                                acc += c;
+                        }
+                }
+        }
+        if (endptr != 0)
+                *endptr = (char *) (any ? s - 1 : nptr);
+        return (acc);
+}
diff --git a/src/lib/libc/stdlib/strtol.3 b/src/lib/libc/stdlib/strtol.3
index 808ba90165..e45941e07b 100644
--- a/src/lib/libc/stdlib/strtol.3
+++ b/src/lib/libc/stdlib/strtol.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,49 +29,67 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)strtol.3      5.4 (Berkeley) 6/25/92
+.\"     $OpenBSD: strtol.3,v 1.15 2006/03/29 20:10:52 grunk Exp $
-.\"     $Id: strtol.3,v 1.1.1.1 1995/10/18 08:42:19 deraadt Exp $
 .\"
-.Dd June 25, 1992
+.Dd January 3, 2006
 .Dt STRTOL 3
 .Os
 .Sh NAME
-.Nm strtol, strtoq
+.Nm strtol ,
-.Nd convert string value to a long or quad_t integer
+.Nm strtoll ,
+.Nm strtoimax ,
+.Nm strtoq ,
+.Nd "convert string value to a long, long long or intmax_t integer"
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
 .Fd #include <limits.h>
 .Ft long
-.Fn strtol "char *nptr" "char **endptr" "int base"
+.Fn strtol "const char *nptr" "char **endptr" "int base"
+.Pp
+.Ft long long
+.Fn strtoll "const char *nptr" "char **endptr" "int base"
+.Pp
+.Fd #include <inttypes.h>
+.Ft intmax_t
+.Fn strtoimax "const char *nptr" "char **endptr" "int base"
+.Pp
 .Fd #include <sys/types.h>
 .Fd #include <stdlib.h>
 .Fd #include <limits.h>
 .Ft quad_t
-.Fn strtoq "char *nptr" "char **endptr" "int base"
+.Fn strtoq "const char *nptr" "char **endptr" "int base"
 .Sh DESCRIPTION
 The
 .Fn strtol
-function
+function converts the string in
-converts the string in
 .Fa nptr
 to a
-.Em long
+.Li long
 value.
 The
-.Fn strtoq
+.Fn strtoll
-function
+function converts the string in
-converts the string in
 .Fa nptr
 to a
-.Em quad_t
+.Li long long
+value.
+The
+.Fn strtoimax
+function converts the string in
+.Fa nptr
+to an
+.Li intmax_t
 value.
+The
+.Fn strtoq
+function is a deprecated equivalent of
+.Fn strtoll
+and is provided for backwards compatibility with legacy programs.
 The conversion is done according to the given
 .Fa base ,
-which must be between 2 and 36 inclusive,
+which must be a number between 2 and 36 inclusive or the special value 0.
-or be the special value 0.
 .Pp
-The string may begin with an arbitrary amount of white space
+The string may begin with an arbitrary amount of whitespace
 (as determined by
 .Xr isspace 3 )
 followed by a single optional
@@ -85,25 +99,25 @@ or
 sign.
 If
 .Fa base
-is zero or 16,
+is zero or 16, the string may then include a
-the string may then include a
 .Ql 0x
-prefix,
+prefix, and the number will be read in base 16; otherwise, a zero
-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
-.Em long
+.Li long ,
+.Li long long ,
+or
+.Li intmax_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
+in either upper or lower case represents 10,
-represents 10,
 .Ql B
 represents 11, and so forth, with
 .Ql Z
@@ -111,7 +125,7 @@ representing 35.)
 .Pp
 If
 .Fa endptr
-is non nil,
+is non-null,
 .Fn strtol
 stores the address of the first invalid character in
 .Fa *endptr .
@@ -132,22 +146,87 @@ is
 on return, the entire string was valid.)
 .Sh RETURN VALUES
 The
-.Fn strtol
+.Fn strtol ,
-function
+.Fn strtoll ,
-returns the result of the conversion,
+.Fn strtoimax ,
+and
+.Fn strtoq
+functions returns the result of the conversion,
 unless the value would underflow or overflow.
-If an underflow occurs,
+If overflow or underflow occurs,
-.Fn strtol
-returns
-.Dv LONG_MIN .
-If an overflow occurs,
-.Fn strtol
-returns
-.Dv LONG_MAX .
-In both cases,
 .Va errno
 is set to
-.Er ERANGE .
+.Er ERANGE
+and the function return value is as follows:
+.Bl -column -offset indent "strtoimax" "overflow" "underflow"
+.It Sy Function Ta Sy overflow Ta Sy underflow
+.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 EXAMPLES
+Ensuring that a string is a valid number (i.e., in range and containing no
+trailing characters) requires clearing
+.Va errno
+beforehand explicitly since
+.Va errno
+is not changed on a successful call to
+.Fn strtol ,
+and the return value of
+.Fn strtol
+cannot be used unambiguously to signal an error:
+.Bd -literal -offset indent
+char *ep;
+long lval;
+\&...
+errno = 0;
+lval = strtol(buf, &ep, 10);
+if (buf[0] == '\e0' || *ep != '\e0')
+        goto not_a_number;
+if (errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN))
+        goto out_of_range;
+.Ed
+.Pp
+This example will accept
+.Dq 12
+but not
+.Dq 12foo
+or
+.Dq 12\en .
+If trailing whitespace is acceptable, further checks must be done on
+.Va *ep ;
+alternately, use
+.Xr sscanf 3 .
+.Pp
+If
+.Fn strtol
+is being used instead of
+.Xr atoi 3 ,
+error checking is further complicated because the desired return value is an
+.Li int
+rather than a
+.Li long ;
+however, on some architectures integers and long integers are the same size.
+Thus the following is necessary:
+.Bd -literal -offset indent
+char *ep;
+int ival;
+long lval;
+\&...
+errno = 0;
+lval = strtol(buf, &ep, 10);
+if (buf[0] == '\e0' || *ep != '\e0')
+     goto not_a_number;
+if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
+    (lval > INT_MAX || lval < INT_MIN))
+     goto out_of_range;
+ival = lval;
+.Ed
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er ERANGE
@@ -157,13 +236,23 @@ The given string was out of range; the value converted has been clamped.
 .Xr atof 3 ,
 .Xr atoi 3 ,
 .Xr atol 3 ,
+.Xr atoll 3 ,
+.Xr sscanf 3 ,
 .Xr strtod 3 ,
+.Xr strtonum 3 ,
 .Xr strtoul 3
 .Sh STANDARDS
 The
-.Fn strtol
+.Fn strtol ,
-function
+.Fn strtoll ,
-conforms to
+and
-.St -ansiC .
+.Fn strtoimax
+functions conform to
+.St -ansiC-99 .
+The
+.Fn strtoq
+function is a
+.Bx
+extension and is provided for backwards compatibility with legacy programs.
 .Sh BUGS
 Ignores the current locale.
diff --git a/src/lib/libc/stdlib/strtol.c b/src/lib/libc/stdlib/strtol.c
index 6f374abd5f..5a244766db 100644
--- a/src/lib/libc/stdlib/strtol.c
+++ b/src/lib/libc/stdlib/strtol.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: strtol.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
 /*-
 * Copyright (c) 1990 The Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,14 +28,9 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)strtol.c     5.4 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: strtol.c,v 1.1.1.1 1995/10/18 08:42:20 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <limits.h>
 #include <ctype.h>
 #include <errno.h>
+#include <limits.h>
 #include <stdlib.h>
@@ -49,30 +41,30 @@ static char *rcsid = "$Id: strtol.c,v 1.1.1.1 1995/10/18 08:42:20 deraadt Exp $"
 * alphabets and digits are each contiguous.
 */
 long
-strtol(nptr, endptr, base)
+strtol(const char *nptr, char **endptr, int base)
-        const char *nptr;
-        char **endptr;
-        register int base;
 {
-        register const char *s = nptr;
+        const char *s;
-        register unsigned long acc;
+        long acc, cutoff;
-        register int c;
+        int c;
-        register unsigned long cutoff;
+        int neg, any, cutlim;
-        register int neg = 0, any, cutlim;
        /*
         * Skip white space and pick up leading +/- sign if any.
         * If base is 0, allow 0x for hex and 0 for octal, else
         * assume decimal; if base is already 16, allow 0x.
         */
+        s = nptr;
        do {
-                c = *s++;
+                c = (unsigned char) *s++;
        } while (isspace(c));
        if (c == '-') {
                neg = 1;
                c = *s++;
-        } else if (c == '+')
+        } else {
-                c = *s++;
+                neg = 0;
+                if (c == '+')
+                        c = *s++;
+        }
        if ((base == 0 || base == 16) &&
            c == '0' && (*s == 'x' || *s == 'X')) {
                c = s[1];
@@ -99,10 +91,17 @@ strtol(nptr, endptr, base)
         * Set any if any `digits' consumed; make it negative to indicate
         * overflow.
         */
-        cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX;
+        cutoff = neg ? LONG_MIN : LONG_MAX;
-        cutlim = cutoff % (unsigned long)base;
+        cutlim = cutoff % base;
-        cutoff /= (unsigned long)base;
+        cutoff /= base;
-        for (acc = 0, any = 0;; c = *s++) {
+        if (neg) {
+                if (cutlim > 0) {
+                        cutlim -= base;
+                        cutoff += 1;
+                }
+                cutlim = -cutlim;
+        }
+        for (acc = 0, any = 0;; c = (unsigned char) *s++) {
                if (isdigit(c))
                        c -= '0';
                else if (isalpha(c))
@@ -111,19 +110,30 @@ strtol(nptr, endptr, base)
                        break;
                if (c >= base)
                        break;
-                if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+                if (any < 0)
-                        any = -1;
+                        continue;
-                else {
+                if (neg) {
-                        any = 1;
+                        if (acc < cutoff || acc == cutoff && c > cutlim) {
-                        acc *= base;
+                                any = -1;
-                        acc += c;
+                                acc = LONG_MIN;
+                                errno = ERANGE;
+                        } else {
+                                any = 1;
+                                acc *= base;
+                                acc -= c;
+                        }
+                } else {
+                        if (acc > cutoff || acc == cutoff && c > cutlim) {
+                                any = -1;
+                                acc = LONG_MAX;
+                                errno = ERANGE;
+                        } else {
+                                any = 1;
+                                acc *= base;
+                                acc += c;
+                        }
                }
        }
-        if (any < 0) {
-                acc = neg ? LONG_MIN : LONG_MAX;
-                errno = ERANGE;
-        } else if (neg)
-                acc = -acc;
        if (endptr != 0)
                *endptr = (char *) (any ? s - 1 : nptr);
        return (acc);
diff --git a/src/lib/libc/stdlib/strtoq.c b/src/lib/libc/stdlib/strtoll.c
index fc559e9d7f..37379252e3 100644
--- a/src/lib/libc/stdlib/strtoq.c
+++ b/src/lib/libc/stdlib/strtoll.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: strtoll.c,v 1.6 2005/11/10 10:00:17 espie Exp $ */
 /*-
 * Copyright (c) 1992 The Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,34 +28,26 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtoq.c    5.1 (Berkeley) 6/26/92";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/types.h>
-#include <limits.h>
-#include <errno.h>
 #include <ctype.h>
+#include <errno.h>
+#include <limits.h>
 #include <stdlib.h>
 /*
- * Convert a string to a quad integer.
+ * Convert a string to a long long.
 *
 * Ignores `locale' stuff.  Assumes that the upper and lower case
 * alphabets and digits are each contiguous.
 */
-quad_t
+long long
-strtoq(nptr, endptr, base)
+strtoll(const char *nptr, char **endptr, int base)
-        const char *nptr;
-        char **endptr;
-        register int base;
 {
-        register const char *s;
+        const char *s;
-        register u_quad_t acc;
+        long long acc, cutoff;
-        register int c;
+        int c;
-        register u_quad_t qbase, cutoff;
+        int neg, any, cutlim;
-        register int neg, any, cutlim;
        /*
         * Skip white space and pick up leading +/- sign if any.
@@ -67,7 +56,7 @@ strtoq(nptr, endptr, base)
         */
        s = nptr;
        do {
-                c = *s++;
+                c = (unsigned char) *s++;
        } while (isspace(c));
        if (c == '-') {
                neg = 1;
@@ -93,7 +82,7 @@ strtoq(nptr, endptr, base)
         * followed by a legal input character, is too big.  One that
         * is equal to this value may be valid or not; the limit
         * between valid and invalid numbers is then based on the last
-         * digit.  For instance, if the range for quads is
+         * digit.  For instance, if the range for long longs is
         * [-9223372036854775808..9223372036854775807] and the input base
         * is 10, cutoff will be set to 922337203685477580 and cutlim to
         * either 7 (neg==0) or 8 (neg==1), meaning that if we have
@@ -104,11 +93,17 @@ strtoq(nptr, endptr, base)
         * Set any if any `digits' consumed; make it negative to indicate
         * overflow.
         */
-        qbase = (unsigned)base;
+        cutoff = neg ? LLONG_MIN : LLONG_MAX;
-        cutoff = neg ? -(u_quad_t)QUAD_MIN : QUAD_MAX;
+        cutlim = cutoff % base;
-        cutlim = cutoff % qbase;
+        cutoff /= base;
-        cutoff /= qbase;
+        if (neg) {
-        for (acc = 0, any = 0;; c = *s++) {
+                if (cutlim > 0) {
+                        cutlim -= base;
+                        cutoff += 1;
+                }
+                cutlim = -cutlim;
+        }
+        for (acc = 0, any = 0;; c = (unsigned char) *s++) {
                if (isdigit(c))
                        c -= '0';
                else if (isalpha(c))
@@ -117,20 +112,42 @@ strtoq(nptr, endptr, base)
                        break;
                if (c >= base)
                        break;
-                if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+                if (any < 0)
-                        any = -1;
+                        continue;
-                else {
+                if (neg) {
-                        any = 1;
+                        if (acc < cutoff || (acc == cutoff && c > cutlim)) {
-                        acc *= qbase;
+                                any = -1;
-                        acc += c;
+                                acc = LLONG_MIN;
+                                errno = ERANGE;
+                        } else {
+                                any = 1;
+                                acc *= base;
+                                acc -= c;
+                        }
+                } else {
+                        if (acc > cutoff || (acc == cutoff && c > cutlim)) {
+                                any = -1;
+                                acc = LLONG_MAX;
+                                errno = ERANGE;
+                        } else {
+                                any = 1;
+                                acc *= base;
+                                acc += c;
+                        }
                }
        }
-        if (any < 0) {
-                acc = neg ? QUAD_MIN : QUAD_MAX;
-                errno = ERANGE;
-        } else if (neg)
-                acc = -acc;
        if (endptr != 0)
                *endptr = (char *) (any ? s - 1 : nptr);
        return (acc);
 }
+#ifdef __weak_alias
+__weak_alias(strtoq, strtoll);
+#else
+quad_t
+strtoq(const char *nptr, char **endptr, int base)
+{
+        return ((quad_t)strtoll(nptr, endptr, base));
+}
+#endif
diff --git a/src/lib/libc/stdlib/strtonum.3 b/src/lib/libc/stdlib/strtonum.3
new file mode 100644
index 0000000000..6b3c9031d6
--- /dev/null
+++ b/src/lib/libc/stdlib/strtonum.3
@@ -0,0 +1,152 @@
+.\" $OpenBSD: strtonum.3,v 1.13 2006/04/25 05:15:42 tedu Exp $
+.\"
+.\" Copyright (c) 2004 Ted Unangst
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd April 29, 2004
+.Dt STRTONUM 3
+.Os
+.Sh NAME
+.Nm strtonum
+.Nd "reliably convert string value to an integer"
+.Sh SYNOPSIS
+.Fd #include <stdlib.h>
+.Ft long long
+.Fo strtonum
+.Fa "const char *nptr"
+.Fa "long long minval"
+.Fa "long long maxval"
+.Fa "const char **errstr"
+.Fc
+.Sh DESCRIPTION
+The
+.Fn strtonum
+function converts the string in
+.Fa nptr
+to a
+.Li long long
+value.
+The
+.Fn strtonum
+function was designed to facilitate safe, robust programming
+and overcome the shortcomings of the
+.Xr atoi 3
+and
+.Xr strtol 3
+family of interfaces.
+.Pp
+The string may begin with an arbitrary amount of whitespace
+(as determined by
+.Xr isspace 3 )
+followed by a single optional
+.Ql +
+or
+.Ql -
+sign.
+.Pp
+The remainder of the string is converted to a
+.Li long long
+value according to base 10.
+.Pp
+The value obtained is then checked against the provided
+.Fa minval
+and
+.Fa maxval
+bounds.
+If
+.Fa errstr
+is non-null,
+.Fn strtonum
+stores an error string in
+.Fa *errstr
+indicating the failure.
+.Sh RETURN VALUES
+The
+.Fn strtonum
+function returns the result of the conversion,
+unless the value would exceed the provided bounds or is invalid.
+On error, 0 is returned,
+.Va errno
+is set, and
+.Fa errstr
+will point to an error message.
+.Fa *errstr
+will be set to
+.Dv NULL
+on success;
+this fact can be used to differentiate
+a successful return of 0 from an error.
+.Sh EXAMPLES
+Using
+.Fn strtonum
+correctly is meant to be simpler than the alternative functions.
+.Bd -literal -offset indent
+int iterations;
+const char *errstr;
+iterations = strtonum(optarg, 1, 64, &errstr);
+if (errstr)
+        errx(1, "number of iterations is %s: %s", errstr, optarg);
+.Ed
+.Pp
+The above example will guarantee that the value of iterations is between
+1 and 64 (inclusive).
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er ERANGE
+The given string was out of range.
+.It Bq Er EINVAL
+The given string did not consist solely of digit characters.
+.It Bq Er EINVAL
+.Ar minval
+was larger than
+.Ar maxval .
+.El
+.Pp
+If an error occurs,
+.Fa errstr
+will be set to one of the following strings:
+.Pp
+.Bl -tag -width "too largeXX" -compact
+.It too large
+The result was larger than the provided maximum value.
+.It too small
+The result was smaller than the provided minimum value.
+.It invalid
+The string did not consist solely of digit characters.
+.El
+.Sh SEE ALSO
+.Xr atof 3 ,
+.Xr atoi 3 ,
+.Xr atol 3 ,
+.Xr atoll 3 ,
+.Xr sscanf 3 ,
+.Xr strtod 3 ,
+.Xr strtol 3 ,
+.Xr strtoul 3
+.Sh STANDARDS
+.Fn strtonum
+is an
+.Ox
+extension.
+The existing alternatives, such as
+.Xr atoi 3
+and
+.Xr strtol 3 ,
+are either impossible or difficult to use safely.
+.Sh HISTORY
+The
+.Fn strtonum
+function first appeared in
+.Ox 3.6 .
diff --git a/src/lib/libc/stdlib/strtonum.c b/src/lib/libc/stdlib/strtonum.c
new file mode 100644
index 0000000000..e426388ed0
--- /dev/null
+++ b/src/lib/libc/stdlib/strtonum.c
@@ -0,0 +1,65 @@
+/*      $OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $    */
+/*
+ * Copyright (c) 2004 Ted Unangst and Todd Miller
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+#define INVALID         1
+#define TOOSMALL        2
+#define TOOLARGE        3
+long long
+strtonum(const char *numstr, long long minval, long long maxval,
+    const char **errstrp)
+{
+        long long ll = 0;
+        char *ep;
+        int error = 0;
+        struct errval {
+                const char *errstr;
+                int err;
+        } ev[4] = {
+                { NULL,         0 },
+                { "invalid",    EINVAL },
+                { "too small",  ERANGE },
+                { "too large",  ERANGE },
+        };
+        ev[0].err = errno;
+        errno = 0;
+        if (minval > maxval)
+                error = INVALID;
+        else {
+                ll = strtoll(numstr, &ep, 10);
+                if (numstr == ep || *ep != '\0')
+                        error = INVALID;
+                else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
+                        error = TOOSMALL;
+                else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
+                        error = TOOLARGE;
+        }
+        if (errstrp != NULL)
+                *errstrp = ev[error].errstr;
+        errno = ev[error].err;
+        if (error)
+                ll = 0;
+        return (ll);
+}
diff --git a/src/lib/libc/stdlib/strtoul.3 b/src/lib/libc/stdlib/strtoul.3
index db551b0141..2ea5e83297 100644
--- a/src/lib/libc/stdlib/strtoul.3
+++ b/src/lib/libc/stdlib/strtoul.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,21 +29,30 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)strtoul.3     5.4 (Berkeley) 6/25/92
+.\"     $OpenBSD: strtoul.3,v 1.16 2006/01/13 17:58:09 millert Exp $
-.\"     $Id: strtoul.3,v 1.1.1.1 1995/10/18 08:42:20 deraadt Exp $
 .\"
-.Dd June 25, 1992
+.Dd January 3, 2006
 .Dt STRTOUL 3
 .Os
 .Sh NAME
-.Nm strtoul, strtouq
+.Nm strtoul ,
-.Nd convert a string to an unsigned long or uquad_t integer
+.Nm strtoull ,
+.Nm strtoumax ,
+.Nm strtouq
+.Nd "convert a string to an unsigned long, unsigned long long or uintmax_t integer"
 .Sh SYNOPSIS
 .Fd #include <stdlib.h>
 .Fd #include <limits.h>
 .Ft unsigned long
 .Fn strtoul "const char *nptr" "char **endptr" "int base"
+.Pp
+.Ft unsigned long long
+.Fn strtoull "const char *nptr" "char **endptr" "int base"
+.Pp
+.Fd #include <inttypes.h>
+.Ft uintmax_t
+.Fn strtoumax "const char *nptr" "char **endptr" "int base"
+.Pp
 .Fd #include <sys/types.h>
 .Fd #include <stdlib.h>
 .Fd #include <limits.h>
@@ -56,26 +61,41 @@
 .Sh DESCRIPTION
 The
 .Fn strtoul
-function
+function converts the string in
-converts the string in
 .Fa nptr
 to an
-.Em unsigned long
+.Li unsigned long
 value.
 The
-.Fn strtouq
+.Fn strtoull
-function
+function converts the string in
-converts the string in
+.Fa nptr
+to an
+.Li unsigned long long
+value.
+The
+.Fn strtoumax
+function converts the string in
 .Fa nptr
 to a
-.Em u_quad_t
+.Li umaxint_t
 value.
+The
+.Fn strtouq
+function is a deprecated equivalent of
+.Fn strtoull
+and is provided for backwards compatibility with legacy programs.
 The conversion is done according to the given
 .Fa base ,
-which must be between 2 and 36 inclusive,
+which must be a number between 2 and 36 inclusive
-or be the special value 0.
+or the special value 0.
+If the string in
+.Fa nptr
+represents a negative number, it will be converted to its unsigned equivalent.
+This behavior is consistent with what happens when a signed integer type is
+cast to its unsigned counterpart.
 .Pp
-The string may begin with an arbitrary amount of white space
+The string may begin with an arbitrary amount of whitespace
 (as determined by
 .Xr isspace 3 )
 followed by a single optional
@@ -85,26 +105,22 @@ or
 sign.
 If
 .Fa base
-is zero or 16,
+is zero or 16, the string may then include a
-the string may then include a
 .Ql 0x
-prefix,
+prefix, and the number will be read in base 16; otherwise, a zero
-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
-.Em unsigned long
+.Li unsigned long
-value in the obvious manner,
+value in the obvious manner, stopping at the end of the string
-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
+in either upper or lower case represents 10,
-represents 10,
 .Ql B
 represents 11, and so forth, with
 .Ql Z
@@ -112,7 +128,7 @@ representing 35.)
 .Pp
 If
 .Fa endptr
-is non nil,
+is non-null,
 .Fn strtoul
 stores the address of the first invalid character in
 .Fa *endptr .
@@ -133,32 +149,94 @@ is
 on return, the entire string was valid.)
 .Sh RETURN VALUES
 The
-.Fn strtoul
+.Fn strtoul ,
-function
+.Fn strtoull ,
-returns either the result of the conversion
+.Fn strtoumax
-or, if there was a leading minus sign,
+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;
+unless the original (non-negated) value would overflow.
-in the latter case,
+If overflow occurs,
 .Fn strtoul
 returns
-.Dv ULONG_MAX
+.Dv ULONG_MAX ,
-and sets the global variable
+.Fn strtoull
+returns
+.Dv ULLONG_MAX ,
+.Fn strtoumax
+returns
+.Dv UINTMAX_MAX ,
+.Fn strtouq
+returns
+.Dv ULLONG_MAX
+and the global variable
 .Va errno
-to
+is set to
 .Er ERANGE .
+.Pp
+There is no way to determine if
+.Fn strtoul
+has processed a negative number (and returned an unsigned value) short of
+examining the string in
+.Fa nptr
+directly.
+.Sh EXAMPLES
+Ensuring that a string is a valid number (i.e., in range and containing no
+trailing characters) requires clearing
+.Va errno
+beforehand explicitly since
+.Va errno
+is not changed on a successful call to
+.Fn strtoul ,
+and the return value of
+.Fn strtoul
+cannot be used unambiguously to signal an error:
+.Bd -literal -offset indent
+char *ep;
+unsigned long ulval;
+\&...
+errno = 0;
+ulval = strtoul(buf, &ep, 10);
+if (buf[0] == '\e0' || *ep != '\e0')
+        goto not_a_number;
+if (errno == ERANGE && ulval == ULONG_MAX)
+        goto out_of_range;
+.Ed
+.Pp
+This example will accept
+.Dq 12
+but not
+.Dq 12foo
+or
+.Dq 12\en .
+If trailing whitespace is acceptable, further checks must be done on
+.Va *ep ;
+alternately, use
+.Xr sscanf 3 .
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er ERANGE
 The given string was out of range; the value converted has been clamped.
 .El
 .Sh SEE ALSO
+.Xr sscanf 3 ,
 .Xr strtol 3
 .Sh STANDARDS
 The
-.Fn strtoul
+.Fn strtoul ,
-function
+.Fn strtoull ,
-conforms to
+and
-.St -ansiC .
+.Fn strtoumax
+functions conform to
+.St -ansiC-99 .
+The
+.Fn strtouq
+function is a
+.Bx
+extension and is provided for backwards compatibility with legacy programs.
 .Sh BUGS
 Ignores the current locale.
diff --git a/src/lib/libc/stdlib/strtoul.c b/src/lib/libc/stdlib/strtoul.c
index 00f7210fa1..d7dddab778 100644
--- a/src/lib/libc/stdlib/strtoul.c
+++ b/src/lib/libc/stdlib/strtoul.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: strtoul.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
 /*
 * Copyright (c) 1990 Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,14 +28,9 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)strtoul.c    5.3 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: strtoul.c,v 1.1.1.1 1995/10/18 08:42:20 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <limits.h>
 #include <ctype.h>
 #include <errno.h>
+#include <limits.h>
 #include <stdlib.h>
 /*
@@ -48,28 +40,28 @@ static char *rcsid = "$Id: strtoul.c,v 1.1.1.1 1995/10/18 08:42:20 deraadt Exp $
 * alphabets and digits are each contiguous.
 */
 unsigned long
-strtoul(nptr, endptr, base)
+strtoul(const char *nptr, char **endptr, int base)
-        const char *nptr;
-        char **endptr;
-        register int base;
 {
-        register const char *s = nptr;
+        const char *s;
-        register unsigned long acc;
+        unsigned long acc, cutoff;
-        register int c;
+        int c;
-        register unsigned long cutoff;
+        int neg, any, cutlim;
-        register int neg = 0, any, cutlim;
        /*
         * See strtol for comments as to the logic used.
         */
+        s = nptr;
        do {
-                c = *s++;
+                c = (unsigned char) *s++;
        } while (isspace(c));
        if (c == '-') {
                neg = 1;
                c = *s++;
-        } else if (c == '+')
+        } else {
-                c = *s++;
+                neg = 0;
+                if (c == '+')
+                        c = *s++;
+        }
        if ((base == 0 || base == 16) &&
            c == '0' && (*s == 'x' || *s == 'X')) {
                c = s[1];
@@ -78,9 +70,10 @@ strtoul(nptr, endptr, base)
        }
        if (base == 0)
                base = c == '0' ? 8 : 10;
-        cutoff = (unsigned long)ULONG_MAX / (unsigned long)base;
-        cutlim = (unsigned long)ULONG_MAX % (unsigned long)base;
+        cutoff = ULONG_MAX / (unsigned long)base;
-        for (acc = 0, any = 0;; c = *s++) {
+        cutlim = ULONG_MAX % (unsigned long)base;
+        for (acc = 0, any = 0;; c = (unsigned char) *s++) {
                if (isdigit(c))
                        c -= '0';
                else if (isalpha(c))
@@ -89,18 +82,19 @@ strtoul(nptr, endptr, base)
                        break;
                if (c >= base)
                        break;
-                if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+                if (any < 0)
+                        continue;
+                if (acc > cutoff || acc == cutoff && c > cutlim) {
                        any = -1;
-                else {
+                        acc = ULONG_MAX;
+                        errno = ERANGE;
+                } else {
                        any = 1;
-                        acc *= base;
+                        acc *= (unsigned long)base;
                        acc += c;
                }
        }
-        if (any < 0) {
+        if (neg && any > 0)
-                acc = ULONG_MAX;
-                errno = ERANGE;
-        } else if (neg)
                acc = -acc;
        if (endptr != 0)
                *endptr = (char *) (any ? s - 1 : nptr);
diff --git a/src/lib/libc/stdlib/strtouq.c b/src/lib/libc/stdlib/strtoull.c
index cc647d8d28..37859776f9 100644
--- a/src/lib/libc/stdlib/strtouq.c
+++ b/src/lib/libc/stdlib/strtoull.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: strtoull.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
 /*-
 * Copyright (c) 1992 The Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,41 +28,33 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtouq.c   5.1 (Berkeley) 6/26/92";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/types.h>
-#include <limits.h>
-#include <errno.h>
 #include <ctype.h>
+#include <errno.h>
+#include <limits.h>
 #include <stdlib.h>
 /*
- * Convert a string to an unsigned quad integer.
+ * Convert a string to an unsigned long long.
 *
 * Ignores `locale' stuff.  Assumes that the upper and lower case
 * alphabets and digits are each contiguous.
 */
-u_quad_t
+unsigned long long
-strtouq(nptr, endptr, base)
+strtoull(const char *nptr, char **endptr, int base)
-        const char *nptr;
-        char **endptr;
-        register int base;
 {
-        register const char *s = nptr;
+        const char *s;
-        register u_quad_t acc;
+        unsigned long long acc, cutoff;
-        register int c;
+        int c;
-        register u_quad_t qbase, cutoff;
+        int neg, any, cutlim;
-        register int neg, any, cutlim;
        /*
         * See strtoq for comments as to the logic used.
         */
        s = nptr;
        do {
-                c = *s++;
+                c = (unsigned char) *s++;
        } while (isspace(c));
        if (c == '-') {
                neg = 1;
@@ -83,10 +72,10 @@ strtouq(nptr, endptr, base)
        }
        if (base == 0)
                base = c == '0' ? 8 : 10;
-        qbase = (unsigned)base;
-        cutoff = (u_quad_t)UQUAD_MAX / qbase;
+        cutoff = ULLONG_MAX / (unsigned long long)base;
-        cutlim = (u_quad_t)UQUAD_MAX % qbase;
+        cutlim = ULLONG_MAX % (unsigned long long)base;
-        for (acc = 0, any = 0;; c = *s++) {
+        for (acc = 0, any = 0;; c = (unsigned char) *s++) {
                if (isdigit(c))
                        c -= '0';
                else if (isalpha(c))
@@ -95,20 +84,32 @@ strtouq(nptr, endptr, base)
                        break;
                if (c >= base)
                        break;
-                if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+                if (any < 0)
+                        continue;
+                if (acc > cutoff || (acc == cutoff && c > cutlim)) {
                        any = -1;
-                else {
+                        acc = ULLONG_MAX;
+                        errno = ERANGE;
+                } else {
                        any = 1;
-                        acc *= qbase;
+                        acc *= (unsigned long long)base;
                        acc += c;
                }
        }
-        if (any < 0) {
+        if (neg && any > 0)
-                acc = UQUAD_MAX;
-                errno = ERANGE;
-        } else if (neg)
                acc = -acc;
        if (endptr != 0)
                *endptr = (char *) (any ? s - 1 : nptr);
        return (acc);
 }
+#ifdef __weak_alias
+__weak_alias(strtouq, strtoull);
+#else
+u_quad_t
+strtouq(const char *nptr, char **endptr, int base)
+{
+        return ((u_quad_t)strtoull(nptr, endptr, base));
+}
+#endif
diff --git a/src/lib/libc/stdlib/strtoumax.c b/src/lib/libc/stdlib/strtoumax.c
new file mode 100644
index 0000000000..ce6e2c00f1
--- /dev/null
+++ b/src/lib/libc/stdlib/strtoumax.c
@@ -0,0 +1,102 @@
+/*      $OpenBSD: strtoumax.c,v 1.1 2006/01/13 17:58:09 millert Exp $   */
+/*-
+ * Copyright (c) 1992 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.
+ */
+#include <ctype.h>
+#include <errno.h>
+#include <inttypes.h>
+/*
+ * Convert a string to a uintmax_t.
+ *
+ * Ignores `locale' stuff.  Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+uintmax_t
+strtoumax(const char *nptr, char **endptr, int base)
+{
+        const char *s;
+        uintmax_t acc, cutoff;
+        int c;
+        int neg, any, cutlim;
+        /*
+         * See strtoq for comments as to the logic used.
+         */
+        s = nptr;
+        do {
+                c = (unsigned char) *s++;
+        } while (isspace(c));
+        if (c == '-') {
+                neg = 1;
+                c = *s++;
+        } else { 
+                neg = 0;
+                if (c == '+')
+                        c = *s++;
+        }
+        if ((base == 0 || base == 16) &&
+            c == '0' && (*s == 'x' || *s == 'X')) {
+                c = s[1];
+                s += 2;
+                base = 16;
+        }
+        if (base == 0)
+                base = c == '0' ? 8 : 10;
+        cutoff = UINTMAX_MAX / (uintmax_t)base;
+        cutlim = UINTMAX_MAX % (uintmax_t)base;
+        for (acc = 0, any = 0;; c = (unsigned char) *s++) {
+                if (isdigit(c))
+                        c -= '0';
+                else if (isalpha(c))
+                        c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+                else
+                        break;
+                if (c >= base)
+                        break;
+                if (any < 0)
+                        continue;
+                if (acc > cutoff || (acc == cutoff && c > cutlim)) {
+                        any = -1;
+                        acc = UINTMAX_MAX;
+                        errno = ERANGE;
+                } else {
+                        any = 1;
+                        acc *= (uintmax_t)base;
+                        acc += c;
+                }
+        }
+        if (neg && any > 0)
+                acc = -acc;
+        if (endptr != 0)
+                *endptr = (char *) (any ? s - 1 : nptr);
+        return (acc);
+}
diff --git a/src/lib/libc/stdlib/system.3 b/src/lib/libc/stdlib/system.3
index 520f51db0a..1034b01066 100644
--- a/src/lib/libc/stdlib/system.3
+++ b/src/lib/libc/stdlib/system.3
@@ -13,11 +13,7 @@
 .\" 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. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. 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.
 .\"
@@ -33,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)system.3      6.5 (Berkeley) 6/29/91
+.\"     $OpenBSD: system.3,v 1.9 2003/06/02 20:18:38 millert Exp $
-.\"     $Id: system.3,v 1.1.1.1 1995/10/18 08:42:20 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt SYSTEM 3
@@ -49,8 +44,7 @@
 .Sh DESCRIPTION
 The
 .Fn system
-function
+function hands the argument
-hands the argument
 .Fa string
 to the command interpreter
 .Xr sh 1 .
@@ -64,36 +58,42 @@ and blocking
 .Pp
 If
 .Fa string
-is a
+is
-.Dv NULL
+.Dv NULL ,
-pointer,
 .Fn system
 will return non-zero.
 Otherwise,
 .Fn system
-returns the termination status of the shell in the format specified by 
+returns the termination status of the shell in the format specified by
-.Xr waitpid 3 .
+.Xr waitpid 2 .
-.Sh RETURN VALUES 
+.Sh RETURN VALUES
 If a child process cannot be created, or the termination status of
-the shell cannot be obtained, 
+the shell cannot be obtained,
 .Fn system
-returns -1 and sets
+returns \-1 and sets
 .Va errno
 to indicate the error.
-If execution of the shell fails, 
+If execution of the shell fails,
 .Fn system
-returns the termination status for a program that terminates with a call of 
+returns the termination status for a program that terminates with a call of
 .Fn exit 127 .
 .Sh SEE ALSO
 .Xr sh 1 ,
 .Xr execve 2 ,
-.Xr popen 3 ,
+.Xr waitpid 2 ,
-.Xr waitpid 3 ,
+.Xr popen 3
 .Sh STANDARDS
 The
 .Fn system
-function
+function conforms to
-conforms to
+.St -ansiC
-.St -ansiC 
 and
-.St -1003.2-92 .
+.St -p1003.2-92 .
+.Sh CAVEATS
+Never supply the
+.Fn system
+function with a command containing any part of an unsanitized user-supplied
+string.
+Shell meta-characters present will be honored by the
+.Xr sh 1
+command interpreter.
diff --git a/src/lib/libc/stdlib/system.c b/src/lib/libc/stdlib/system.c
index c2f39325f6..14ddcae8d3 100644
--- a/src/lib/libc/stdlib/system.c
+++ b/src/lib/libc/stdlib/system.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: system.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
 /*
 * Copyright (c) 1988 The Regents of the University of California.
 * All rights reserved.
@@ -10,11 +11,7 @@
 * 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. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the University nor the names of its contributors
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. 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.
 *
@@ -31,11 +28,6 @@
 * SUCH DAMAGE.
 */
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)system.c     5.10 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: system.c,v 1.1.1.1 1995/10/18 08:42:20 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
@@ -46,25 +38,28 @@ static char *rcsid = "$Id: system.c,v 1.1.1.1 1995/10/18 08:42:20 deraadt Exp $"
 extern char **environ;
 int
-system(command)
+system(const char *command)
-        const char *command;
 {
        pid_t pid;
        sig_t intsave, quitsave;
-        int omask;
+        sigset_t mask, omask;
        int pstat;
-        char *argp[] = {"sh", "-c", (char *) command, NULL};
+        char *argp[] = {"sh", "-c", NULL, NULL};
        if (!command)           /* just checking... */
                return(1);
-        omask = sigblock(sigmask(SIGCHLD));
+        argp[2] = (char *)command;
-        switch(pid = vfork()) {
+        sigemptyset(&mask);
+        sigaddset(&mask, SIGCHLD);
+        sigprocmask(SIG_BLOCK, &mask, &omask);
+        switch (pid = vfork()) {
        case -1:                        /* error */
-                (void)sigsetmask(omask);
+                sigprocmask(SIG_SETMASK, &omask, NULL);
                return(-1);
        case 0:                         /* child */
-                (void)sigsetmask(omask);
+                sigprocmask(SIG_SETMASK, &omask, NULL);
                execve(_PATH_BSHELL, argp, environ);
                _exit(127);
        }
@@ -72,8 +67,8 @@ system(command)
        intsave = signal(SIGINT, SIG_IGN);
        quitsave = signal(SIGQUIT, SIG_IGN);
        pid = waitpid(pid, (int *)&pstat, 0);
-        (void)sigsetmask(omask);
+        sigprocmask(SIG_SETMASK, &omask, NULL);
        (void)signal(SIGINT, intsave);
        (void)signal(SIGQUIT, quitsave);
-        return(pid == -1 ? -1 : pstat);
+        return (pid == -1 ? -1 : pstat);
 }
diff --git a/src/lib/libc/stdlib/tfind.c b/src/lib/libc/stdlib/tfind.c
new file mode 100644
index 0000000000..ff6bcd742d
--- /dev/null
+++ b/src/lib/libc/stdlib/tfind.c
@@ -0,0 +1,41 @@
+/*      $OpenBSD: tfind.c,v 1.5 2005/03/30 18:51:49 pat Exp $   */
+/*
+ * Tree search generalized from Knuth (6.2.2) Algorithm T just like
+ * the AT&T man page says.
+ *
+ * The node_t structure is for internal use only, lint doesn't grok it.
+ *
+ * Written by reading the System V Interface Definition, not the code.
+ *
+ * Totally public domain.
+ */
+/*LINTLIBRARY*/
+#include <search.h>
+typedef struct node_t
+{
+    char          *key;
+    struct node_t *llink, *rlink;
+} node;
+/* find a node, or return 0 */
+void *
+tfind(const void *vkey, void * const *vrootp,
+    int (*compar)(const void *, const void *))
+{
+    char *key = (char *)vkey;
+    node **rootp = (node **)vrootp;
+    if (rootp == (struct node_t **)0)
+        return ((struct node_t *)0);
+    while (*rootp != (struct node_t *)0) {      /* T1: */
+        int r;
+        if ((r = (*compar)(key, (*rootp)->key)) == 0)   /* T2: */
+            return (*rootp);            /* key found */
+        rootp = (r < 0) ?
+            &(*rootp)->llink :          /* T3: follow left branch */
+            &(*rootp)->rlink;           /* T4: follow right branch */
+    }
+    return (node *)0;
+}
diff --git a/src/lib/libc/stdlib/tsearch.3 b/src/lib/libc/stdlib/tsearch.3
new file mode 100644
index 0000000000..0dc5c0c374
--- /dev/null
+++ b/src/lib/libc/stdlib/tsearch.3
@@ -0,0 +1,127 @@
+.\" $OpenBSD: tsearch.3,v 1.15 2006/04/04 19:07:23 otto Exp $
+.\"
+.\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd June 15, 1997
+.Dt TSEARCH 3
+.Os
+.Sh NAME
+.Nm tsearch ,
+.Nm tfind ,
+.Nm tdelete ,
+.Nm twalk
+.Nd manipulate binary search trees
+.Sh SYNOPSIS
+.Fd #include <search.h>
+.Ft void *
+.Fn tdelete "const void *key" "void **rootp" "int (*compar) (const void *, const void *)"
+.Ft void *
+.Fn tfind "const void *key" "void * const *rootp" "int (*compar) (const void *, const void *)"
+.Ft void *
+.Fn tsearch "const void *key" "void **rootp" "int (*compar) (const void *, const void *)"
+.Ft void
+.Fn twalk "const void *root" "void (*action) (const void *, VISIT, int)"
+.Sh DESCRIPTION
+The
+.Fn tdelete ,
+.Fn tfind ,
+.Fn tsearch ,
+and
+.Fn twalk
+functions manage binary search trees based on algorithms T and D
+from Knuth (6.2.2).
+The comparison function passed in by
+the user has the same style of return values as
+.Xr strcmp 3 .
+.Pp
+.Fn tfind
+searches for the datum matched by the argument
+.Fa key
+in the binary tree rooted at
+.Fa rootp ,
+returning a pointer to the datum if it is found and
+.Dv NULL
+if it is not.
+.Pp
+.Fn tsearch
+is identical to
+.Fn tfind
+except that if no match is found,
+.Fa key
+is inserted into the tree and a pointer to it is returned.
+If
+.Fa rootp
+points to a null value a new binary search tree is created.
+.Pp
+.Fn tdelete
+deletes a node from the specified binary search tree and returns
+a pointer to the parent of the node to be deleted.
+It takes the same arguments as
+.Fn tfind
+and
+.Fn tsearch .
+If the node to be deleted is the root of the binary search tree,
+.Fa rootp
+will be adjusted and a pointer to the new root will be returned.
+.Pp
+.Fn twalk
+walks the binary search tree rooted in
+.Fa root
+and calls the function
+.Fa action
+on each node.
+.Fa action
+is called with three arguments: a pointer to the current node,
+a value from the enum
+.Sy "typedef enum { preorder, postorder, endorder, leaf } VISIT;"
+specifying the traversal type, and a node level (where level
+zero is the root of the tree).
+.Sh RETURN VALUES
+The
+.Fn tsearch
+function returns
+.Dv NULL
+if allocation of a new node fails (usually
+due to a lack of free memory).
+.Pp
+.Fn tfind ,
+.Fn tsearch ,
+and
+.Fn tdelete
+return
+.Dv NULL
+if
+.Fa rootp
+is
+.Dv NULL
+or the datum cannot be found.
+.Pp
+The
+.Fn twalk
+function returns no value.
+.Sh SEE ALSO
+.Xr bsearch 3 ,
+.Xr lsearch 3
+.Sh STANDARDS
+These functions conform to
+.St -p1003.1-2004 .
+.Sh CAVEATS
+The
+.St -p1003.1-2004
+standard does not specify what value should be returned when deleting the
+root node.
+Since implementations vary, the user of the
+.Fn tdelete
+function should not rely on a specific behaviour.
diff --git a/src/lib/libc/stdlib/tsearch.c b/src/lib/libc/stdlib/tsearch.c
new file mode 100644
index 0000000000..667c57731b
--- /dev/null
+++ b/src/lib/libc/stdlib/tsearch.c
@@ -0,0 +1,121 @@
+/*      $OpenBSD: tsearch.c,v 1.6 2006/04/04 11:21:50 moritz Exp $      */
+/*
+ * Tree search generalized from Knuth (6.2.2) Algorithm T just like
+ * the AT&T man page says.
+ *
+ * The node_t structure is for internal use only, lint doesn't grok it.
+ *
+ * Written by reading the System V Interface Definition, not the code.
+ *
+ * Totally public domain.
+ */
+/*LINTLIBRARY*/
+#include <search.h>
+#include <stdlib.h>
+typedef struct node_t {
+    char          *key;
+    struct node_t *left, *right;
+} node;
+/* find or insert datum into search tree */
+void *
+tsearch(const void *vkey, void **vrootp,
+    int (*compar)(const void *, const void *))
+{
+    node *q;
+    char *key = (char *)vkey;
+    node **rootp = (node **)vrootp;
+    if (rootp == (struct node_t **)0)
+        return ((void *)0);
+    while (*rootp != (struct node_t *)0) {      /* Knuth's T1: */
+        int r;
+        if ((r = (*compar)(key, (*rootp)->key)) == 0)   /* T2: */
+            return ((void *)*rootp);            /* we found it! */
+        rootp = (r < 0) ?
+            &(*rootp)->left :           /* T3: follow left branch */
+            &(*rootp)->right;           /* T4: follow right branch */
+    }
+    q = (node *) malloc(sizeof(node));  /* T5: key not found */
+    if (q != (struct node_t *)0) {      /* make new node */
+        *rootp = q;                     /* link new node to old */
+        q->key = key;                   /* initialize new node */
+        q->left = q->right = (struct node_t *)0;
+    }
+    return ((void *)q);
+}
+/* delete node with given key */
+void *
+tdelete(const void *vkey, void **vrootp,
+    int (*compar)(const void *, const void *))
+{
+    node **rootp = (node **)vrootp;
+    char *key = (char *)vkey;
+    node *p;
+    node *q;
+    node *r;
+    int cmp;
+    if (rootp == (struct node_t **)0 || (p = *rootp) == (struct node_t *)0)
+        return ((struct node_t *)0);
+    while ((cmp = (*compar)(key, (*rootp)->key)) != 0) {
+        p = *rootp;
+        rootp = (cmp < 0) ?
+            &(*rootp)->left :           /* follow left branch */
+            &(*rootp)->right;           /* follow right branch */
+        if (*rootp == (struct node_t *)0)
+            return ((void *)0);         /* key not found */
+    }
+    r = (*rootp)->right;                        /* D1: */
+    if ((q = (*rootp)->left) == (struct node_t *)0)     /* Left (struct node_t *)0? */
+        q = r;
+    else if (r != (struct node_t *)0) {         /* Right link is null? */
+        if (r->left == (struct node_t *)0) {    /* D2: Find successor */
+            r->left = q;
+            q = r;
+        } else {                        /* D3: Find (struct node_t *)0 link */
+            for (q = r->left; q->left != (struct node_t *)0; q = r->left)
+                r = q;
+            r->left = q->right;
+            q->left = (*rootp)->left;
+            q->right = (*rootp)->right;
+        }
+    }
+    if (p == *rootp)
+        p = q;
+    free((struct node_t *) *rootp);     /* D4: Free node */
+    *rootp = q;                         /* link parent to new node */
+    return(p);
+}
+/* Walk the nodes of a tree */
+static void
+trecurse(node *root, void (*action)(const void *, VISIT, int), int level)
+{
+    if (root->left == (struct node_t *)0 && root->right == (struct node_t *)0)
+        (*action)(root, leaf, level);
+    else {
+        (*action)(root, preorder, level);
+        if (root->left != (struct node_t *)0)
+            trecurse(root->left, action, level + 1);
+        (*action)(root, postorder, level);
+        if (root->right != (struct node_t *)0)
+            trecurse(root->right, action, level + 1);
+        (*action)(root, endorder, level);
+    }
+}
+/* Walk the nodes of a tree */
+void
+twalk(const void *vroot, void (*action)(const void *, VISIT, int))
+{
+    node *root = (node *)vroot;
+    if (root != (node *)0 && action != (void (*)(const void *, VISIT, int))0)
+        trecurse(root, action, 0);
+}