This commit was manufactured by cvs2git to create tag 'tb_20210818'.tb_20210818

335 files changed, 0 insertions, 39782 deletions

diff --git a/src/lib/libc/crypt/Makefile.inc b/src/lib/libc/crypt/Makefile.inc
deleted file mode 100644
index e9263b09fe..0000000000
--- a/src/lib/libc/crypt/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#       $OpenBSD: Makefile.inc,v 1.27 2016/03/30 06:38:41 jmc Exp $
-
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/crypt ${LIBCSRCDIR}/crypt
-
-SRCS+=  crypt.c cryptutil.c arc4random.c arc4random_uniform.c \
-        blowfish.c bcrypt.c
-
-MAN+=   crypt.3 crypt_checkpass.3 blowfish.3 arc4random.3
diff --git a/src/lib/libc/crypt/arc4random.3 b/src/lib/libc/crypt/arc4random.3
deleted file mode 100644
index 411860c28f..0000000000
--- a/src/lib/libc/crypt/arc4random.3
+++ /dev/null
@@ -1,116 +0,0 @@
-.\" $OpenBSD: arc4random.3,v 1.37 2019/09/29 16:30:35 jmc Exp $
-.\"
-.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
-.\" 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 Niels Provos.
-.\" 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.
-.\"
-.\" Manual page, using -mandoc macros
-.\"
-.Dd $Mdocdate: September 29 2019 $
-.Dt ARC4RANDOM 3
-.Os
-.Sh NAME
-.Nm arc4random ,
-.Nm arc4random_buf ,
-.Nm arc4random_uniform
-.Nd random number generator
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft uint32_t
-.Fn arc4random "void"
-.Ft void
-.Fn arc4random_buf "void *buf" "size_t nbytes"
-.Ft uint32_t
-.Fn arc4random_uniform "uint32_t upper_bound"
-.Sh DESCRIPTION
-This family of functions provides higher quality data than those
-described in
-.Xr rand 3 ,
-.Xr random 3 ,
-and
-.Xr rand48 3 .
-.Pp
-Use of these functions is encouraged for almost all random number
-consumption because the other interfaces are deficient in either
-quality, portability, standardization, or availability.
-These functions can be called in almost all coding environments,
-including
-.Xr pthreads 3
-and
-.Xr chroot 2 .
-.Pp
-High quality 32-bit pseudo-random numbers are generated very quickly.
-On each call, a cryptographic pseudo-random number generator is used
-to generate a new result.
-One data pool is used for all consumers in a process, so that consumption
-under program flow can act as additional stirring.
-The subsystem is re-seeded from the kernel
-.Xr random 4
-subsystem using
-.Xr getentropy 2
-on a regular basis, and also upon
-.Xr fork 2 .
-.Pp
-The
-.Fn arc4random
-function returns a single 32-bit value.
-.Pp
-.Fn arc4random_buf
-fills the region
-.Fa buf
-of length
-.Fa nbytes
-with random data.
-.Pp
-.Fn arc4random_uniform
-will return a single 32-bit value, uniformly distributed but less than
-.Fa upper_bound .
-This is recommended over constructions like
-.Dq Li arc4random() % upper_bound
-as it avoids "modulo bias" when the upper bound is not a power of two.
-In the worst case, this function may consume multiple iterations
-to ensure uniformity; see the source code to understand the problem
-and solution.
-.Sh RETURN VALUES
-These functions are always successful, and no return value is
-reserved to indicate an error.
-.Sh SEE ALSO
-.Xr rand 3 ,
-.Xr rand48 3 ,
-.Xr random 3
-.Sh HISTORY
-These functions first appeared in
-.Ox 2.1 .
-.Pp
-The original version of this random number generator used the
-RC4 (also known as ARC4) algorithm.
-In
-.Ox 5.5
-it was replaced with the ChaCha20 cipher, and it may be replaced
-again in the future as cryptographic techniques advance.
-A good mnemonic is
-.Dq A Replacement Call for Random .
diff --git a/src/lib/libc/crypt/arc4random.c b/src/lib/libc/crypt/arc4random.c
deleted file mode 100644
index 1a16bd3940..0000000000
--- a/src/lib/libc/crypt/arc4random.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*      $OpenBSD: arc4random.c,v 1.55 2019/03/24 17:56:54 deraadt Exp $ */
-
-/*
- * Copyright (c) 1996, David Mazieres <dm@uun.org>
- * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
- * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
- * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
- *
- * 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.
- */
-
-/*
- * ChaCha based random number generator for OpenBSD.
- */
-
-#include <fcntl.h>
-#include <limits.h>
-#include <signal.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#define KEYSTREAM_ONLY
-#include "chacha_private.h"
-
-#define minimum(a, b) ((a) < (b) ? (a) : (b))
-
-#if defined(__GNUC__) || defined(_MSC_VER)
-#define inline __inline
-#else                           /* __GNUC__ || _MSC_VER */
-#define inline
-#endif                          /* !__GNUC__ && !_MSC_VER */
-
-#define KEYSZ   32
-#define IVSZ    8
-#define BLOCKSZ 64
-#define RSBUFSZ (16*BLOCKSZ)
-
-/* Marked MAP_INHERIT_ZERO, so zero'd out in fork children. */
-static struct _rs {
-        size_t          rs_have;        /* valid bytes at end of rs_buf */
-        size_t          rs_count;       /* bytes till reseed */
-} *rs;
-
-/* Maybe be preserved in fork children, if _rs_allocate() decides. */
-static struct _rsx {
-        chacha_ctx      rs_chacha;      /* chacha context for random keystream */
-        u_char          rs_buf[RSBUFSZ];        /* keystream blocks */
-} *rsx;
-
-static inline int _rs_allocate(struct _rs **, struct _rsx **);
-static inline void _rs_forkdetect(void);
-#include "arc4random.h"
-
-static inline void _rs_rekey(u_char *dat, size_t datlen);
-
-static inline void
-_rs_init(u_char *buf, size_t n)
-{
-        if (n < KEYSZ + IVSZ)
-                return;
-
-        if (rs == NULL) {
-                if (_rs_allocate(&rs, &rsx) == -1)
-                        _exit(1);
-        }
-
-        chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8, 0);
-        chacha_ivsetup(&rsx->rs_chacha, buf + KEYSZ);
-}
-
-static void
-_rs_stir(void)
-{
-        u_char rnd[KEYSZ + IVSZ];
-
-        if (getentropy(rnd, sizeof rnd) == -1)
-                _getentropy_fail();
-
-        if (!rs)
-                _rs_init(rnd, sizeof(rnd));
-        else
-                _rs_rekey(rnd, sizeof(rnd));
-        explicit_bzero(rnd, sizeof(rnd));       /* discard source seed */
-
-        /* invalidate rs_buf */
-        rs->rs_have = 0;
-        memset(rsx->rs_buf, 0, sizeof(rsx->rs_buf));
-
-        rs->rs_count = 1600000;
-}
-
-static inline void
-_rs_stir_if_needed(size_t len)
-{
-        _rs_forkdetect();
-        if (!rs || rs->rs_count <= len)
-                _rs_stir();
-        if (rs->rs_count <= len)
-                rs->rs_count = 0;
-        else
-                rs->rs_count -= len;
-}
-
-static inline void
-_rs_rekey(u_char *dat, size_t datlen)
-{
-#ifndef KEYSTREAM_ONLY
-        memset(rsx->rs_buf, 0, sizeof(rsx->rs_buf));
-#endif
-        /* fill rs_buf with the keystream */
-        chacha_encrypt_bytes(&rsx->rs_chacha, rsx->rs_buf,
-            rsx->rs_buf, sizeof(rsx->rs_buf));
-        /* mix in optional user provided data */
-        if (dat) {
-                size_t i, m;
-
-                m = minimum(datlen, KEYSZ + IVSZ);
-                for (i = 0; i < m; i++)
-                        rsx->rs_buf[i] ^= dat[i];
-        }
-        /* immediately reinit for backtracking resistance */
-        _rs_init(rsx->rs_buf, KEYSZ + IVSZ);
-        memset(rsx->rs_buf, 0, KEYSZ + IVSZ);
-        rs->rs_have = sizeof(rsx->rs_buf) - KEYSZ - IVSZ;
-}
-
-static inline void
-_rs_random_buf(void *_buf, size_t n)
-{
-        u_char *buf = (u_char *)_buf;
-        u_char *keystream;
-        size_t m;
-
-        _rs_stir_if_needed(n);
-        while (n > 0) {
-                if (rs->rs_have > 0) {
-                        m = minimum(n, rs->rs_have);
-                        keystream = rsx->rs_buf + sizeof(rsx->rs_buf)
-                            - rs->rs_have;
-                        memcpy(buf, keystream, m);
-                        memset(keystream, 0, m);
-                        buf += m;
-                        n -= m;
-                        rs->rs_have -= m;
-                }
-                if (rs->rs_have == 0)
-                        _rs_rekey(NULL, 0);
-        }
-}
-
-static inline void
-_rs_random_u32(uint32_t *val)
-{
-        u_char *keystream;
-
-        _rs_stir_if_needed(sizeof(*val));
-        if (rs->rs_have < sizeof(*val))
-                _rs_rekey(NULL, 0);
-        keystream = rsx->rs_buf + sizeof(rsx->rs_buf) - rs->rs_have;
-        memcpy(val, keystream, sizeof(*val));
-        memset(keystream, 0, sizeof(*val));
-        rs->rs_have -= sizeof(*val);
-}
-
-uint32_t
-arc4random(void)
-{
-        uint32_t val;
-
-        _ARC4_LOCK();
-        _rs_random_u32(&val);
-        _ARC4_UNLOCK();
-        return val;
-}
-DEF_WEAK(arc4random);
-
-void
-arc4random_buf(void *buf, size_t n)
-{
-        _ARC4_LOCK();
-        _rs_random_buf(buf, n);
-        _ARC4_UNLOCK();
-}
-DEF_WEAK(arc4random_buf);
diff --git a/src/lib/libc/crypt/arc4random.h b/src/lib/libc/crypt/arc4random.h
deleted file mode 100644
index 4abd15321a..0000000000
--- a/src/lib/libc/crypt/arc4random.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*      $OpenBSD: arc4random.h,v 1.4 2015/01/15 06:57:18 deraadt Exp $  */
-
-/*
- * Copyright (c) 1996, David Mazieres <dm@uun.org>
- * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
- * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
- * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
- *
- * 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.
- */
-
-/*
- * Stub functions for portability.
- */
-#include <sys/mman.h>
-
-#include <signal.h>
-
-#include "thread_private.h"
-
-static inline void
-_getentropy_fail(void)
-{
-        raise(SIGKILL);
-}
-
-static inline int
-_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
-{
-        struct {
-                struct _rs rs;
-                struct _rsx rsx;
-        } *p;
-
-        if ((p = mmap(NULL, sizeof(*p), PROT_READ|PROT_WRITE,
-            MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
-                return (-1);
-        if (minherit(p, sizeof(*p), MAP_INHERIT_ZERO) == -1) {
-                munmap(p, sizeof(*p));
-                return (-1);
-        }
-
-        *rsp = &p->rs;
-        *rsxp = &p->rsx;
-        return (0);
-}
-
-static inline void
-_rs_forkdetect(void)
-{
-}
diff --git a/src/lib/libc/crypt/arc4random_uniform.c b/src/lib/libc/crypt/arc4random_uniform.c
deleted file mode 100644
index a18b5b1238..0000000000
--- a/src/lib/libc/crypt/arc4random_uniform.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*      $OpenBSD: arc4random_uniform.c,v 1.3 2019/01/20 02:59:07 bcook Exp $    */
-
-/*
- * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
- *
- * 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 <stdint.h>
-#include <stdlib.h>
-
-/*
- * Calculate a uniformly distributed random number less than upper_bound
- * avoiding "modulo bias".
- *
- * Uniformity is achieved by generating new random numbers until the one
- * returned is outside the range [0, 2**32 % upper_bound).  This
- * guarantees the selected random number will be inside
- * [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound)
- * after reduction modulo upper_bound.
- */
-uint32_t
-arc4random_uniform(uint32_t upper_bound)
-{
-        uint32_t r, min;
-
-        if (upper_bound < 2)
-                return 0;
-
-        /* 2**32 % x == (2**32 - x) % x */
-        min = -upper_bound % upper_bound;
-
-        /*
-         * This could theoretically loop forever but each retry has
-         * p > 0.5 (worst case, usually far better) of selecting a
-         * number inside the range we need, so it should rarely need
-         * to re-roll.
-         */
-        for (;;) {
-                r = arc4random();
-                if (r >= min)
-                        break;
-        }
-
-        return r % upper_bound;
-}
-DEF_WEAK(arc4random_uniform);
diff --git a/src/lib/libc/crypt/bcrypt.c b/src/lib/libc/crypt/bcrypt.c
deleted file mode 100644
index ba45b104ed..0000000000
--- a/src/lib/libc/crypt/bcrypt.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/*      $OpenBSD: bcrypt.c,v 1.58 2020/07/06 13:33:05 pirofti Exp $     */
-
-/*
- * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
- * Copyright (c) 1997 Niels Provos <provos@umich.edu>
- *
- * 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.
- */
-/* This password hashing algorithm was designed by David Mazieres
- * <dm@lcs.mit.edu> and works as follows:
- *
- * 1. state := InitState ()
- * 2. state := ExpandKey (state, salt, password)
- * 3. REPEAT rounds:
- *      state := ExpandKey (state, 0, password)
- *      state := ExpandKey (state, 0, salt)
- * 4. ctext := "OrpheanBeholderScryDoubt"
- * 5. REPEAT 64:
- *      ctext := Encrypt_ECB (state, ctext);
- * 6. RETURN Concatenate (salt, ctext);
- *
- */
-
-#include <sys/types.h>
-#include <blf.h>
-#include <ctype.h>
-#include <errno.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-/* This implementation is adaptable to current computing power.
- * You can have up to 2^31 rounds which should be enough for some
- * time to come.
- */
-
-#define BCRYPT_VERSION '2'
-#define BCRYPT_MAXSALT 16       /* Precomputation is just so nice */
-#define BCRYPT_WORDS 6          /* Ciphertext words */
-#define BCRYPT_MINLOGROUNDS 4   /* we have log2(rounds) in salt */
-
-#define BCRYPT_SALTSPACE        (7 + (BCRYPT_MAXSALT * 4 + 2) / 3 + 1)
-#define BCRYPT_HASHSPACE        61
-
-char   *bcrypt_gensalt(u_int8_t);
-
-static int encode_base64(char *, const u_int8_t *, size_t);
-static int decode_base64(u_int8_t *, size_t, const char *);
-
-/*
- * Generates a salt for this version of crypt.
- */
-static int
-bcrypt_initsalt(int log_rounds, uint8_t *salt, size_t saltbuflen)
-{
-        uint8_t csalt[BCRYPT_MAXSALT];
-
-        if (saltbuflen < BCRYPT_SALTSPACE) {
-                errno = EINVAL;
-                return -1;
-        }
-
-        arc4random_buf(csalt, sizeof(csalt));
-
-        if (log_rounds < 4)
-                log_rounds = 4;
-        else if (log_rounds > 31)
-                log_rounds = 31;
-
-        snprintf(salt, saltbuflen, "$2b$%2.2u$", log_rounds);
-        encode_base64(salt + 7, csalt, sizeof(csalt));
-
-        return 0;
-}
-
-/*
- * the core bcrypt function
- */
-static int
-bcrypt_hashpass(const char *key, const char *salt, char *encrypted,
-    size_t encryptedlen)
-{
-        blf_ctx state;
-        u_int32_t rounds, i, k;
-        u_int16_t j;
-        size_t key_len;
-        u_int8_t salt_len, logr, minor;
-        u_int8_t ciphertext[4 * BCRYPT_WORDS] = "OrpheanBeholderScryDoubt";
-        u_int8_t csalt[BCRYPT_MAXSALT];
-        u_int32_t cdata[BCRYPT_WORDS];
-
-        if (encryptedlen < BCRYPT_HASHSPACE)
-                goto inval;
-
-        /* Check and discard "$" identifier */
-        if (salt[0] != '$')
-                goto inval;
-        salt += 1;
-
-        if (salt[0] != BCRYPT_VERSION)
-                goto inval;
-
-        /* Check for minor versions */
-        switch ((minor = salt[1])) {
-        case 'a':
-                key_len = (u_int8_t)(strlen(key) + 1);
-                break;
-        case 'b':
-                /* strlen() returns a size_t, but the function calls
-                 * below result in implicit casts to a narrower integer
-                 * type, so cap key_len at the actual maximum supported
-                 * length here to avoid integer wraparound */
-                key_len = strlen(key);
-                if (key_len > 72)
-                        key_len = 72;
-                key_len++; /* include the NUL */
-                break;
-        default:
-                 goto inval;
-        }
-        if (salt[2] != '$')
-                goto inval;
-        /* Discard version + "$" identifier */
-        salt += 3;
-
-        /* Check and parse num rounds */
-        if (!isdigit((unsigned char)salt[0]) ||
-            !isdigit((unsigned char)salt[1]) || salt[2] != '$')
-                goto inval;
-        logr = (salt[1] - '0') + ((salt[0] - '0') * 10);
-        if (logr < BCRYPT_MINLOGROUNDS || logr > 31)
-                goto inval;
-        /* Computer power doesn't increase linearly, 2^x should be fine */
-        rounds = 1U << logr;
-
-        /* Discard num rounds + "$" identifier */
-        salt += 3;
-
-        if (strlen(salt) * 3 / 4 < BCRYPT_MAXSALT)
-                goto inval;
-
-        /* We dont want the base64 salt but the raw data */
-        if (decode_base64(csalt, BCRYPT_MAXSALT, salt))
-                goto inval;
-        salt_len = BCRYPT_MAXSALT;
-
-        /* Setting up S-Boxes and Subkeys */
-        Blowfish_initstate(&state);
-        Blowfish_expandstate(&state, csalt, salt_len,
-            (u_int8_t *) key, key_len);
-        for (k = 0; k < rounds; k++) {
-                Blowfish_expand0state(&state, (u_int8_t *) key, key_len);
-                Blowfish_expand0state(&state, csalt, salt_len);
-        }
-
-        /* This can be precomputed later */
-        j = 0;
-        for (i = 0; i < BCRYPT_WORDS; i++)
-                cdata[i] = Blowfish_stream2word(ciphertext, 4 * BCRYPT_WORDS, &j);
-
-        /* Now do the encryption */
-        for (k = 0; k < 64; k++)
-                blf_enc(&state, cdata, BCRYPT_WORDS / 2);
-
-        for (i = 0; i < BCRYPT_WORDS; i++) {
-                ciphertext[4 * i + 3] = cdata[i] & 0xff;
-                cdata[i] = cdata[i] >> 8;
-                ciphertext[4 * i + 2] = cdata[i] & 0xff;
-                cdata[i] = cdata[i] >> 8;
-                ciphertext[4 * i + 1] = cdata[i] & 0xff;
-                cdata[i] = cdata[i] >> 8;
-                ciphertext[4 * i + 0] = cdata[i] & 0xff;
-        }
-
-
-        snprintf(encrypted, 8, "$2%c$%2.2u$", minor, logr);
-        encode_base64(encrypted + 7, csalt, BCRYPT_MAXSALT);
-        encode_base64(encrypted + 7 + 22, ciphertext, 4 * BCRYPT_WORDS - 1);
-        explicit_bzero(&state, sizeof(state));
-        explicit_bzero(ciphertext, sizeof(ciphertext));
-        explicit_bzero(csalt, sizeof(csalt));
-        explicit_bzero(cdata, sizeof(cdata));
-        return 0;
-
-inval:
-        errno = EINVAL;
-        return -1;
-}
-
-/*
- * user friendly functions
- */
-int
-bcrypt_newhash(const char *pass, int log_rounds, char *hash, size_t hashlen)
-{
-        char salt[BCRYPT_SALTSPACE];
-
-        if (bcrypt_initsalt(log_rounds, salt, sizeof(salt)) != 0)
-                return -1;
-
-        if (bcrypt_hashpass(pass, salt, hash, hashlen) != 0)
-                return -1;
-
-        explicit_bzero(salt, sizeof(salt));
-        return 0;
-}
-DEF_WEAK(bcrypt_newhash);
-
-int
-bcrypt_checkpass(const char *pass, const char *goodhash)
-{
-        char hash[BCRYPT_HASHSPACE];
-
-        if (bcrypt_hashpass(pass, goodhash, hash, sizeof(hash)) != 0)
-                return -1;
-        if (strlen(hash) != strlen(goodhash) ||
-            timingsafe_bcmp(hash, goodhash, strlen(goodhash)) != 0) {
-                errno = EACCES;
-                return -1;
-        }
-
-        explicit_bzero(hash, sizeof(hash));
-        return 0;
-}
-DEF_WEAK(bcrypt_checkpass);
-
-/*
- * Measure this system's performance by measuring the time for 8 rounds.
- * We are aiming for something that takes around 0.1s, but not too much over.
- */
-int
-_bcrypt_autorounds(void)
-{
-        struct timespec before, after;
-        int r = 8;
-        char buf[_PASSWORD_LEN];
-        int duration;
-
-        WRAP(clock_gettime)(CLOCK_THREAD_CPUTIME_ID, &before);
-        bcrypt_newhash("testpassword", r, buf, sizeof(buf));
-        WRAP(clock_gettime)(CLOCK_THREAD_CPUTIME_ID, &after);
-
-        duration = after.tv_sec - before.tv_sec;
-        duration *= 1000000;
-        duration += (after.tv_nsec - before.tv_nsec) / 1000;
-
-        /* too quick? slow it down. */
-        while (r < 16 && duration <= 60000) {
-                r += 1;
-                duration *= 2;
-        }
-        /* too slow? speed it up. */
-        while (r > 6 && duration > 120000) {
-                r -= 1;
-                duration /= 2;
-        }
-
-        return r;
-}
-
-/*
- * internal utilities
- */
-static const u_int8_t Base64Code[] =
-"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-static const u_int8_t index_64[128] = {
-        255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-        255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-        255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-        255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
-        255, 255, 255, 255, 255, 255, 0, 1, 54, 55,
-        56, 57, 58, 59, 60, 61, 62, 63, 255, 255,
-        255, 255, 255, 255, 255, 2, 3, 4, 5, 6,
-        7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-        17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-        255, 255, 255, 255, 255, 255, 28, 29, 30,
-        31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-        51, 52, 53, 255, 255, 255, 255, 255
-};
-#define CHAR64(c)  ( (c) > 127 ? 255 : index_64[(c)])
-
-/*
- * read buflen (after decoding) bytes of data from b64data
- */
-static int
-decode_base64(u_int8_t *buffer, size_t len, const char *b64data)
-{
-        u_int8_t *bp = buffer;
-        const u_int8_t *p = b64data;
-        u_int8_t c1, c2, c3, c4;
-
-        while (bp < buffer + len) {
-                c1 = CHAR64(*p);
-                /* Invalid data */
-                if (c1 == 255)
-                        return -1;
-
-                c2 = CHAR64(*(p + 1));
-                if (c2 == 255)
-                        return -1;
-
-                *bp++ = (c1 << 2) | ((c2 & 0x30) >> 4);
-                if (bp >= buffer + len)
-                        break;
-
-                c3 = CHAR64(*(p + 2));
-                if (c3 == 255)
-                        return -1;
-
-                *bp++ = ((c2 & 0x0f) << 4) | ((c3 & 0x3c) >> 2);
-                if (bp >= buffer + len)
-                        break;
-
-                c4 = CHAR64(*(p + 3));
-                if (c4 == 255)
-                        return -1;
-                *bp++ = ((c3 & 0x03) << 6) | c4;
-
-                p += 4;
-        }
-        return 0;
-}
-
-/*
- * Turn len bytes of data into base64 encoded data.
- * This works without = padding.
- */
-static int
-encode_base64(char *b64buffer, const u_int8_t *data, size_t len)
-{
-        u_int8_t *bp = b64buffer;
-        const u_int8_t *p = data;
-        u_int8_t c1, c2;
-
-        while (p < data + len) {
-                c1 = *p++;
-                *bp++ = Base64Code[(c1 >> 2)];
-                c1 = (c1 & 0x03) << 4;
-                if (p >= data + len) {
-                        *bp++ = Base64Code[c1];
-                        break;
-                }
-                c2 = *p++;
-                c1 |= (c2 >> 4) & 0x0f;
-                *bp++ = Base64Code[c1];
-                c1 = (c2 & 0x0f) << 2;
-                if (p >= data + len) {
-                        *bp++ = Base64Code[c1];
-                        break;
-                }
-                c2 = *p++;
-                c1 |= (c2 >> 6) & 0x03;
-                *bp++ = Base64Code[c1];
-                *bp++ = Base64Code[c2 & 0x3f];
-        }
-        *bp = '\0';
-        return 0;
-}
-
-/*
- * classic interface
- */
-char *
-bcrypt_gensalt(u_int8_t log_rounds)
-{
-        static char    gsalt[BCRYPT_SALTSPACE];
-
-        bcrypt_initsalt(log_rounds, gsalt, sizeof(gsalt));
-
-        return gsalt;
-}
-
-char *
-bcrypt(const char *pass, const char *salt)
-{
-        static char    gencrypted[BCRYPT_HASHSPACE];
-
-        if (bcrypt_hashpass(pass, salt, gencrypted, sizeof(gencrypted)) != 0)
-                return NULL;
-
-        return gencrypted;
-}
-DEF_WEAK(bcrypt);
diff --git a/src/lib/libc/crypt/blowfish.3 b/src/lib/libc/crypt/blowfish.3
deleted file mode 100644
index 88a62336cf..0000000000
--- a/src/lib/libc/crypt/blowfish.3
+++ /dev/null
@@ -1,106 +0,0 @@
-.\" $OpenBSD: blowfish.3,v 1.23 2015/11/10 23:48:17 jmc Exp $
-.\"
-.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
-.\" 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 Niels Provos.
-.\" 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.
-.\"
-.\" Manual page, using -mandoc macros
-.\"
-.Dd $Mdocdate: November 10 2015 $
-.Dt BLF_KEY 3
-.Os
-.Sh NAME
-.Nm blf_key ,
-.Nm blf_enc ,
-.Nm blf_dec ,
-.Nm blf_ecb_encrypt ,
-.Nm blf_ecb_decrypt ,
-.Nm blf_cbc_encrypt ,
-.Nm blf_cbc_decrypt
-.Nd Blowfish encryption
-.Sh SYNOPSIS
-.In blf.h
-.Ft void
-.Fn blf_key "blf_ctx *state" "const u_int8_t *key" "u_int16_t keylen"
-.Ft void
-.Fn blf_enc "blf_ctx *state" "u_int32_t *data" "u_int16_t blocks"
-.Ft void
-.Fn blf_dec "blf_ctx *state" "u_int32_t *data" "u_int16_t blocks"
-.Ft void
-.Fn blf_ecb_encrypt "blf_ctx *state" "u_int8_t *data" "u_int32_t datalen"
-.Ft void
-.Fn blf_ecb_decrypt "blf_ctx *state" "u_int8_t *data" "u_int32_t datalen"
-.Ft void
-.Fn blf_cbc_encrypt "blf_ctx *state" "u_int8_t *iv" "u_int8_t *data" "u_int32_t datalen"
-.Ft void
-.Fn blf_cbc_decrypt "blf_ctx *state" "u_int8_t *iv" "u_int8_t *data" "u_int32_t datalen"
-.Sh DESCRIPTION
-.Em Blowfish
-is a fast unpatented block cipher designed by Bruce Schneier.
-It basically consists of a 16-round Feistel network.
-The block size is 64 bits and the maximum key size is 448 bits.
-.Pp
-The
-.Fn blf_key
-function initializes the 4 8-bit S-boxes and the 18 Subkeys with
-the hexadecimal digits of Pi.
-The key is used for further randomization.
-The first argument to
-.Fn blf_enc
-is the initialized state derived from
-.Fn blf_key .
-The stream of 32-bit words is encrypted in Electronic Codebook
-Mode (ECB) and
-.Fa blocks
-is the number of 64-bit blocks in the stream.
-.Fn blf_dec
-is used for decrypting Blowfish encrypted blocks.
-.Pp
-The functions
-.Fn blf_ecb_encrypt
-and
-.Fn blf_ecb_decrypt
-are used for encrypting and decrypting octet streams in ECB mode.
-The functions
-.Fn blf_cbc_encrypt
-and
-.Fn blf_cbc_decrypt
-are used for encrypting and decrypting octet streams in
-Cipherblock Chaining Mode (CBC).
-For these functions
-.Fa datalen
-specifies the number of octets of data to encrypt or decrypt.
-It must be a multiple of 8 (64-bit block).
-The initialisation vector
-.Fa iv
-points to an 8-byte buffer.
-.Sh SEE ALSO
-.Xr passwd 1 ,
-.Xr crypt 3 ,
-.Xr passwd 5
-.Sh AUTHORS
-.An Niels Provos Aq Mt provos@physnet.uni-hamburg.de
diff --git a/src/lib/libc/crypt/blowfish.c b/src/lib/libc/crypt/blowfish.c
deleted file mode 100644
index a658e602d2..0000000000
--- a/src/lib/libc/crypt/blowfish.c
+++ /dev/null
@@ -1,698 +0,0 @@
-/* $OpenBSD: blowfish.c,v 1.19 2015/09/11 09:18:27 guenther Exp $ */
-/*
- * Blowfish block cipher for OpenBSD
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * All rights reserved.
- *
- * Implementation advice by David Mazieres <dm@lcs.mit.edu>.
- *
- * 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 Niels Provos.
- * 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.
- */
-
-/*
- * This code is derived from section 14.3 and the given source
- * in section V of Applied Cryptography, second edition.
- * Blowfish is an unpatented fast block cipher designed by
- * Bruce Schneier.
- */
-
-#if 0
-#include <stdio.h>              /* used for debugging */
-#include <string.h>
-#endif
-
-#include <sys/types.h>
-#include <blf.h>
-
-#undef inline
-#ifdef __GNUC__
-#define inline __inline
-#else                           /* !__GNUC__ */
-#define inline
-#endif                          /* !__GNUC__ */
-
-/* Function for Feistel Networks */
-
-#define F(s, x) ((((s)[        (((x)>>24)&0xFF)]  \
-                 + (s)[0x100 + (((x)>>16)&0xFF)]) \
-                 ^ (s)[0x200 + (((x)>> 8)&0xFF)]) \
-                 + (s)[0x300 + ( (x)     &0xFF)])
-
-#define BLFRND(s,p,i,j,n) (i ^= F(s,j) ^ (p)[n])
-
-void
-Blowfish_encipher(blf_ctx *c, u_int32_t *xl, u_int32_t *xr)
-{
-        u_int32_t Xl;
-        u_int32_t Xr;
-        u_int32_t *s = c->S[0];
-        u_int32_t *p = c->P;
-
-        Xl = *xl;
-        Xr = *xr;
-
-        Xl ^= p[0];
-        BLFRND(s, p, Xr, Xl, 1); BLFRND(s, p, Xl, Xr, 2);
-        BLFRND(s, p, Xr, Xl, 3); BLFRND(s, p, Xl, Xr, 4);
-        BLFRND(s, p, Xr, Xl, 5); BLFRND(s, p, Xl, Xr, 6);
-        BLFRND(s, p, Xr, Xl, 7); BLFRND(s, p, Xl, Xr, 8);
-        BLFRND(s, p, Xr, Xl, 9); BLFRND(s, p, Xl, Xr, 10);
-        BLFRND(s, p, Xr, Xl, 11); BLFRND(s, p, Xl, Xr, 12);
-        BLFRND(s, p, Xr, Xl, 13); BLFRND(s, p, Xl, Xr, 14);
-        BLFRND(s, p, Xr, Xl, 15); BLFRND(s, p, Xl, Xr, 16);
-
-        *xl = Xr ^ p[17];
-        *xr = Xl;
-}
-DEF_WEAK(Blowfish_encipher);
-
-void
-Blowfish_decipher(blf_ctx *c, u_int32_t *xl, u_int32_t *xr)
-{
-        u_int32_t Xl;
-        u_int32_t Xr;
-        u_int32_t *s = c->S[0];
-        u_int32_t *p = c->P;
-
-        Xl = *xl;
-        Xr = *xr;
-
-        Xl ^= p[17];
-        BLFRND(s, p, Xr, Xl, 16); BLFRND(s, p, Xl, Xr, 15);
-        BLFRND(s, p, Xr, Xl, 14); BLFRND(s, p, Xl, Xr, 13);
-        BLFRND(s, p, Xr, Xl, 12); BLFRND(s, p, Xl, Xr, 11);
-        BLFRND(s, p, Xr, Xl, 10); BLFRND(s, p, Xl, Xr, 9);
-        BLFRND(s, p, Xr, Xl, 8); BLFRND(s, p, Xl, Xr, 7);
-        BLFRND(s, p, Xr, Xl, 6); BLFRND(s, p, Xl, Xr, 5);
-        BLFRND(s, p, Xr, Xl, 4); BLFRND(s, p, Xl, Xr, 3);
-        BLFRND(s, p, Xr, Xl, 2); BLFRND(s, p, Xl, Xr, 1);
-
-        *xl = Xr ^ p[0];
-        *xr = Xl;
-}
-DEF_WEAK(Blowfish_decipher);
-
-void
-Blowfish_initstate(blf_ctx *c)
-{
-        /* P-box and S-box tables initialized with digits of Pi */
-
-        static const blf_ctx initstate =
-        { {
-                {
-                        0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-                        0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-                        0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-                        0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-                        0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-                        0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-                        0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-                        0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-                        0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-                        0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-                        0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-                        0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-                        0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-                        0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-                        0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-                        0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-                        0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-                        0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-                        0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-                        0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-                        0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-                        0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-                        0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-                        0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-                        0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-                        0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-                        0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-                        0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-                        0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-                        0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-                        0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-                        0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-                        0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-                        0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-                        0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-                        0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-                        0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-                        0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-                        0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-                        0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-                        0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-                        0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-                        0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-                        0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-                        0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-                        0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-                        0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-                        0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-                        0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-                        0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-                        0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-                        0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-                        0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-                        0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-                        0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-                        0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-                        0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-                        0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-                        0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-                        0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-                        0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-                        0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-                        0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-                0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a},
-                {
-                        0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-                        0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-                        0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-                        0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-                        0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-                        0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-                        0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-                        0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-                        0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-                        0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-                        0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-                        0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-                        0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-                        0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-                        0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-                        0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-                        0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-                        0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-                        0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-                        0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-                        0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-                        0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-                        0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-                        0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-                        0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-                        0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-                        0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-                        0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-                        0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-                        0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-                        0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-                        0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-                        0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-                        0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-                        0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-                        0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-                        0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-                        0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-                        0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-                        0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-                        0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-                        0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-                        0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-                        0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-                        0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-                        0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-                        0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-                        0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-                        0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-                        0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-                        0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-                        0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-                        0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-                        0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-                        0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-                        0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-                        0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-                        0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-                        0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-                        0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-                        0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-                        0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-                        0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-                0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7},
-                {
-                        0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-                        0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-                        0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-                        0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-                        0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-                        0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-                        0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-                        0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-                        0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-                        0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-                        0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-                        0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-                        0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-                        0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-                        0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-                        0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-                        0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-                        0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-                        0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-                        0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-                        0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-                        0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-                        0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-                        0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-                        0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-                        0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-                        0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-                        0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-                        0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-                        0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-                        0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-                        0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-                        0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-                        0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-                        0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-                        0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-                        0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-                        0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-                        0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-                        0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-                        0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-                        0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-                        0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-                        0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-                        0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-                        0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-                        0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-                        0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-                        0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-                        0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-                        0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-                        0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-                        0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-                        0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-                        0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-                        0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-                        0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-                        0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-                        0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-                        0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-                        0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-                        0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-                        0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-                0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0},
-                {
-                        0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-                        0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-                        0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-                        0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-                        0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-                        0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-                        0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-                        0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-                        0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-                        0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-                        0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-                        0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-                        0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-                        0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-                        0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-                        0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-                        0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-                        0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-                        0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-                        0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-                        0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-                        0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-                        0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-                        0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-                        0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-                        0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-                        0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-                        0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-                        0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-                        0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-                        0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-                        0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-                        0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-                        0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-                        0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-                        0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-                        0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-                        0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-                        0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-                        0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-                        0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-                        0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-                        0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-                        0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-                        0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-                        0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-                        0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-                        0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-                        0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-                        0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-                        0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-                        0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-                        0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-                        0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-                        0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-                        0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-                        0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-                        0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-                        0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-                        0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-                        0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-                        0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-                        0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-                0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6}
-        },
-        {
-                0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-                0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-                0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-                0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-                0x9216d5d9, 0x8979fb1b
-        } };
-
-        *c = initstate;
-}
-DEF_WEAK(Blowfish_initstate);
-
-u_int32_t
-Blowfish_stream2word(const u_int8_t *data, u_int16_t databytes,
-    u_int16_t *current)
-{
-        u_int8_t i;
-        u_int16_t j;
-        u_int32_t temp;
-
-        temp = 0x00000000;
-        j = *current;
-
-        for (i = 0; i < 4; i++, j++) {
-                if (j >= databytes)
-                        j = 0;
-                temp = (temp << 8) | data[j];
-        }
-
-        *current = j;
-        return temp;
-}
-DEF_WEAK(Blowfish_stream2word);
-
-void
-Blowfish_expand0state(blf_ctx *c, const u_int8_t *key, u_int16_t keybytes)
-{
-        u_int16_t i;
-        u_int16_t j;
-        u_int16_t k;
-        u_int32_t temp;
-        u_int32_t datal;
-        u_int32_t datar;
-
-        j = 0;
-        for (i = 0; i < BLF_N + 2; i++) {
-                /* Extract 4 int8 to 1 int32 from keystream */
-                temp = Blowfish_stream2word(key, keybytes, &j);
-                c->P[i] = c->P[i] ^ temp;
-        }
-
-        j = 0;
-        datal = 0x00000000;
-        datar = 0x00000000;
-        for (i = 0; i < BLF_N + 2; i += 2) {
-                Blowfish_encipher(c, &datal, &datar);
-
-                c->P[i] = datal;
-                c->P[i + 1] = datar;
-        }
-
-        for (i = 0; i < 4; i++) {
-                for (k = 0; k < 256; k += 2) {
-                        Blowfish_encipher(c, &datal, &datar);
-
-                        c->S[i][k] = datal;
-                        c->S[i][k + 1] = datar;
-                }
-        }
-}
-DEF_WEAK(Blowfish_expand0state);
-
-
-void
-Blowfish_expandstate(blf_ctx *c, const u_int8_t *data, u_int16_t databytes,
-    const u_int8_t *key, u_int16_t keybytes)
-{
-        u_int16_t i;
-        u_int16_t j;
-        u_int16_t k;
-        u_int32_t temp;
-        u_int32_t datal;
-        u_int32_t datar;
-
-        j = 0;
-        for (i = 0; i < BLF_N + 2; i++) {
-                /* Extract 4 int8 to 1 int32 from keystream */
-                temp = Blowfish_stream2word(key, keybytes, &j);
-                c->P[i] = c->P[i] ^ temp;
-        }
-
-        j = 0;
-        datal = 0x00000000;
-        datar = 0x00000000;
-        for (i = 0; i < BLF_N + 2; i += 2) {
-                datal ^= Blowfish_stream2word(data, databytes, &j);
-                datar ^= Blowfish_stream2word(data, databytes, &j);
-                Blowfish_encipher(c, &datal, &datar);
-
-                c->P[i] = datal;
-                c->P[i + 1] = datar;
-        }
-
-        for (i = 0; i < 4; i++) {
-                for (k = 0; k < 256; k += 2) {
-                        datal ^= Blowfish_stream2word(data, databytes, &j);
-                        datar ^= Blowfish_stream2word(data, databytes, &j);
-                        Blowfish_encipher(c, &datal, &datar);
-
-                        c->S[i][k] = datal;
-                        c->S[i][k + 1] = datar;
-                }
-        }
-
-}
-DEF_WEAK(Blowfish_expandstate);
-
-void
-blf_key(blf_ctx *c, const u_int8_t *k, u_int16_t len)
-{
-        /* Initialize S-boxes and subkeys with Pi */
-        Blowfish_initstate(c);
-
-        /* Transform S-boxes and subkeys with key */
-        Blowfish_expand0state(c, k, len);
-}
-DEF_WEAK(blf_key);
-
-void
-blf_enc(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
-{
-        u_int32_t *d;
-        u_int16_t i;
-
-        d = data;
-        for (i = 0; i < blocks; i++) {
-                Blowfish_encipher(c, d, d + 1);
-                d += 2;
-        }
-}
-DEF_WEAK(blf_enc);
-
-void
-blf_dec(blf_ctx *c, u_int32_t *data, u_int16_t blocks)
-{
-        u_int32_t *d;
-        u_int16_t i;
-
-        d = data;
-        for (i = 0; i < blocks; i++) {
-                Blowfish_decipher(c, d, d + 1);
-                d += 2;
-        }
-}
-DEF_WEAK(blf_dec);
-
-void
-blf_ecb_encrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
-{
-        u_int32_t l, r;
-        u_int32_t i;
-
-        for (i = 0; i < len; i += 8) {
-                l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-                r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-                Blowfish_encipher(c, &l, &r);
-                data[0] = l >> 24 & 0xff;
-                data[1] = l >> 16 & 0xff;
-                data[2] = l >> 8 & 0xff;
-                data[3] = l & 0xff;
-                data[4] = r >> 24 & 0xff;
-                data[5] = r >> 16 & 0xff;
-                data[6] = r >> 8 & 0xff;
-                data[7] = r & 0xff;
-                data += 8;
-        }
-}
-DEF_WEAK(blf_ecb_encrypt);
-
-void
-blf_ecb_decrypt(blf_ctx *c, u_int8_t *data, u_int32_t len)
-{
-        u_int32_t l, r;
-        u_int32_t i;
-
-        for (i = 0; i < len; i += 8) {
-                l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-                r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-                Blowfish_decipher(c, &l, &r);
-                data[0] = l >> 24 & 0xff;
-                data[1] = l >> 16 & 0xff;
-                data[2] = l >> 8 & 0xff;
-                data[3] = l & 0xff;
-                data[4] = r >> 24 & 0xff;
-                data[5] = r >> 16 & 0xff;
-                data[6] = r >> 8 & 0xff;
-                data[7] = r & 0xff;
-                data += 8;
-        }
-}
-DEF_WEAK(blf_ecb_decrypt);
-
-void
-blf_cbc_encrypt(blf_ctx *c, u_int8_t *iv, u_int8_t *data, u_int32_t len)
-{
-        u_int32_t l, r;
-        u_int32_t i, j;
-
-        for (i = 0; i < len; i += 8) {
-                for (j = 0; j < 8; j++)
-                        data[j] ^= iv[j];
-                l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-                r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-                Blowfish_encipher(c, &l, &r);
-                data[0] = l >> 24 & 0xff;
-                data[1] = l >> 16 & 0xff;
-                data[2] = l >> 8 & 0xff;
-                data[3] = l & 0xff;
-                data[4] = r >> 24 & 0xff;
-                data[5] = r >> 16 & 0xff;
-                data[6] = r >> 8 & 0xff;
-                data[7] = r & 0xff;
-                iv = data;
-                data += 8;
-        }
-}
-DEF_WEAK(blf_cbc_encrypt);
-
-void
-blf_cbc_decrypt(blf_ctx *c, u_int8_t *iva, u_int8_t *data, u_int32_t len)
-{
-        u_int32_t l, r;
-        u_int8_t *iv;
-        u_int32_t i, j;
-
-        iv = data + len - 16;
-        data = data + len - 8;
-        for (i = len - 8; i >= 8; i -= 8) {
-                l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-                r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-                Blowfish_decipher(c, &l, &r);
-                data[0] = l >> 24 & 0xff;
-                data[1] = l >> 16 & 0xff;
-                data[2] = l >> 8 & 0xff;
-                data[3] = l & 0xff;
-                data[4] = r >> 24 & 0xff;
-                data[5] = r >> 16 & 0xff;
-                data[6] = r >> 8 & 0xff;
-                data[7] = r & 0xff;
-                for (j = 0; j < 8; j++)
-                        data[j] ^= iv[j];
-                iv -= 8;
-                data -= 8;
-        }
-        l = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
-        r = data[4] << 24 | data[5] << 16 | data[6] << 8 | data[7];
-        Blowfish_decipher(c, &l, &r);
-        data[0] = l >> 24 & 0xff;
-        data[1] = l >> 16 & 0xff;
-        data[2] = l >> 8 & 0xff;
-        data[3] = l & 0xff;
-        data[4] = r >> 24 & 0xff;
-        data[5] = r >> 16 & 0xff;
-        data[6] = r >> 8 & 0xff;
-        data[7] = r & 0xff;
-        for (j = 0; j < 8; j++)
-                data[j] ^= iva[j];
-}
-DEF_WEAK(blf_cbc_decrypt);
-
-#if 0
-void
-report(u_int32_t data[], u_int16_t len)
-{
-        u_int16_t i;
-        for (i = 0; i < len; i += 2)
-                printf("Block %0hd: %08lx %08lx.\n",
-                    i / 2, data[i], data[i + 1]);
-}
-void
-main(void)
-{
-
-        blf_ctx c;
-        char    key[] = "AAAAA";
-        char    key2[] = "abcdefghijklmnopqrstuvwxyz";
-
-        u_int32_t data[10];
-        u_int32_t data2[] =
-        {0x424c4f57l, 0x46495348l};
-
-        u_int16_t i;
-
-        /* First test */
-        for (i = 0; i < 10; i++)
-                data[i] = i;
-
-        blf_key(&c, (u_int8_t *) key, 5);
-        blf_enc(&c, data, 5);
-        blf_dec(&c, data, 1);
-        blf_dec(&c, data + 2, 4);
-        printf("Should read as 0 - 9.\n");
-        report(data, 10);
-
-        /* Second test */
-        blf_key(&c, (u_int8_t *) key2, strlen(key2));
-        blf_enc(&c, data2, 1);
-        printf("\nShould read as: 0x324ed0fe 0xf413a203.\n");
-        report(data2, 2);
-        blf_dec(&c, data2, 1);
-        report(data2, 2);
-}
-#endif
diff --git a/src/lib/libc/crypt/chacha_private.h b/src/lib/libc/crypt/chacha_private.h
deleted file mode 100644
index 7c3680fa6d..0000000000
--- a/src/lib/libc/crypt/chacha_private.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-chacha-merged.c version 20080118
-D. J. Bernstein
-Public domain.
-*/
-
-/* $OpenBSD: chacha_private.h,v 1.2 2013/10/04 07:02:27 djm Exp $ */
-
-typedef unsigned char u8;
-typedef unsigned int u32;
-
-typedef struct
-{
-  u32 input[16]; /* could be compressed */
-} chacha_ctx;
-
-#define U8C(v) (v##U)
-#define U32C(v) (v##U)
-
-#define U8V(v) ((u8)(v) & U8C(0xFF))
-#define U32V(v) ((u32)(v) & U32C(0xFFFFFFFF))
-
-#define ROTL32(v, n) \
-  (U32V((v) << (n)) | ((v) >> (32 - (n))))
-
-#define U8TO32_LITTLE(p) \
-  (((u32)((p)[0])      ) | \
-   ((u32)((p)[1]) <<  8) | \
-   ((u32)((p)[2]) << 16) | \
-   ((u32)((p)[3]) << 24))
-
-#define U32TO8_LITTLE(p, v) \
-  do { \
-    (p)[0] = U8V((v)      ); \
-    (p)[1] = U8V((v) >>  8); \
-    (p)[2] = U8V((v) >> 16); \
-    (p)[3] = U8V((v) >> 24); \
-  } while (0)
-
-#define ROTATE(v,c) (ROTL32(v,c))
-#define XOR(v,w) ((v) ^ (w))
-#define PLUS(v,w) (U32V((v) + (w)))
-#define PLUSONE(v) (PLUS((v),1))
-
-#define QUARTERROUND(a,b,c,d) \
-  a = PLUS(a,b); d = ROTATE(XOR(d,a),16); \
-  c = PLUS(c,d); b = ROTATE(XOR(b,c),12); \
-  a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \
-  c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
-
-static const char sigma[16] = "expand 32-byte k";
-static const char tau[16] = "expand 16-byte k";
-
-static void
-chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits,u32 ivbits)
-{
-  const char *constants;
-
-  x->input[4] = U8TO32_LITTLE(k + 0);
-  x->input[5] = U8TO32_LITTLE(k + 4);
-  x->input[6] = U8TO32_LITTLE(k + 8);
-  x->input[7] = U8TO32_LITTLE(k + 12);
-  if (kbits == 256) { /* recommended */
-    k += 16;
-    constants = sigma;
-  } else { /* kbits == 128 */
-    constants = tau;
-  }
-  x->input[8] = U8TO32_LITTLE(k + 0);
-  x->input[9] = U8TO32_LITTLE(k + 4);
-  x->input[10] = U8TO32_LITTLE(k + 8);
-  x->input[11] = U8TO32_LITTLE(k + 12);
-  x->input[0] = U8TO32_LITTLE(constants + 0);
-  x->input[1] = U8TO32_LITTLE(constants + 4);
-  x->input[2] = U8TO32_LITTLE(constants + 8);
-  x->input[3] = U8TO32_LITTLE(constants + 12);
-}
-
-static void
-chacha_ivsetup(chacha_ctx *x,const u8 *iv)
-{
-  x->input[12] = 0;
-  x->input[13] = 0;
-  x->input[14] = U8TO32_LITTLE(iv + 0);
-  x->input[15] = U8TO32_LITTLE(iv + 4);
-}
-
-static void
-chacha_encrypt_bytes(chacha_ctx *x,const u8 *m,u8 *c,u32 bytes)
-{
-  u32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15;
-  u32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
-  u8 *ctarget = NULL;
-  u8 tmp[64];
-  u_int i;
-
-  if (!bytes) return;
-
-  j0 = x->input[0];
-  j1 = x->input[1];
-  j2 = x->input[2];
-  j3 = x->input[3];
-  j4 = x->input[4];
-  j5 = x->input[5];
-  j6 = x->input[6];
-  j7 = x->input[7];
-  j8 = x->input[8];
-  j9 = x->input[9];
-  j10 = x->input[10];
-  j11 = x->input[11];
-  j12 = x->input[12];
-  j13 = x->input[13];
-  j14 = x->input[14];
-  j15 = x->input[15];
-
-  for (;;) {
-    if (bytes < 64) {
-      for (i = 0;i < bytes;++i) tmp[i] = m[i];
-      m = tmp;
-      ctarget = c;
-      c = tmp;
-    }
-    x0 = j0;
-    x1 = j1;
-    x2 = j2;
-    x3 = j3;
-    x4 = j4;
-    x5 = j5;
-    x6 = j6;
-    x7 = j7;
-    x8 = j8;
-    x9 = j9;
-    x10 = j10;
-    x11 = j11;
-    x12 = j12;
-    x13 = j13;
-    x14 = j14;
-    x15 = j15;
-    for (i = 20;i > 0;i -= 2) {
-      QUARTERROUND( x0, x4, x8,x12)
-      QUARTERROUND( x1, x5, x9,x13)
-      QUARTERROUND( x2, x6,x10,x14)
-      QUARTERROUND( x3, x7,x11,x15)
-      QUARTERROUND( x0, x5,x10,x15)
-      QUARTERROUND( x1, x6,x11,x12)
-      QUARTERROUND( x2, x7, x8,x13)
-      QUARTERROUND( x3, x4, x9,x14)
-    }
-    x0 = PLUS(x0,j0);
-    x1 = PLUS(x1,j1);
-    x2 = PLUS(x2,j2);
-    x3 = PLUS(x3,j3);
-    x4 = PLUS(x4,j4);
-    x5 = PLUS(x5,j5);
-    x6 = PLUS(x6,j6);
-    x7 = PLUS(x7,j7);
-    x8 = PLUS(x8,j8);
-    x9 = PLUS(x9,j9);
-    x10 = PLUS(x10,j10);
-    x11 = PLUS(x11,j11);
-    x12 = PLUS(x12,j12);
-    x13 = PLUS(x13,j13);
-    x14 = PLUS(x14,j14);
-    x15 = PLUS(x15,j15);
-
-#ifndef KEYSTREAM_ONLY
-    x0 = XOR(x0,U8TO32_LITTLE(m + 0));
-    x1 = XOR(x1,U8TO32_LITTLE(m + 4));
-    x2 = XOR(x2,U8TO32_LITTLE(m + 8));
-    x3 = XOR(x3,U8TO32_LITTLE(m + 12));
-    x4 = XOR(x4,U8TO32_LITTLE(m + 16));
-    x5 = XOR(x5,U8TO32_LITTLE(m + 20));
-    x6 = XOR(x6,U8TO32_LITTLE(m + 24));
-    x7 = XOR(x7,U8TO32_LITTLE(m + 28));
-    x8 = XOR(x8,U8TO32_LITTLE(m + 32));
-    x9 = XOR(x9,U8TO32_LITTLE(m + 36));
-    x10 = XOR(x10,U8TO32_LITTLE(m + 40));
-    x11 = XOR(x11,U8TO32_LITTLE(m + 44));
-    x12 = XOR(x12,U8TO32_LITTLE(m + 48));
-    x13 = XOR(x13,U8TO32_LITTLE(m + 52));
-    x14 = XOR(x14,U8TO32_LITTLE(m + 56));
-    x15 = XOR(x15,U8TO32_LITTLE(m + 60));
-#endif
-
-    j12 = PLUSONE(j12);
-    if (!j12) {
-      j13 = PLUSONE(j13);
-      /* stopping at 2^70 bytes per nonce is user's responsibility */
-    }
-
-    U32TO8_LITTLE(c + 0,x0);
-    U32TO8_LITTLE(c + 4,x1);
-    U32TO8_LITTLE(c + 8,x2);
-    U32TO8_LITTLE(c + 12,x3);
-    U32TO8_LITTLE(c + 16,x4);
-    U32TO8_LITTLE(c + 20,x5);
-    U32TO8_LITTLE(c + 24,x6);
-    U32TO8_LITTLE(c + 28,x7);
-    U32TO8_LITTLE(c + 32,x8);
-    U32TO8_LITTLE(c + 36,x9);
-    U32TO8_LITTLE(c + 40,x10);
-    U32TO8_LITTLE(c + 44,x11);
-    U32TO8_LITTLE(c + 48,x12);
-    U32TO8_LITTLE(c + 52,x13);
-    U32TO8_LITTLE(c + 56,x14);
-    U32TO8_LITTLE(c + 60,x15);
-
-    if (bytes <= 64) {
-      if (bytes < 64) {
-        for (i = 0;i < bytes;++i) ctarget[i] = c[i];
-      }
-      x->input[12] = j12;
-      x->input[13] = j13;
-      return;
-    }
-    bytes -= 64;
-    c += 64;
-#ifndef KEYSTREAM_ONLY
-    m += 64;
-#endif
-  }
-}
diff --git a/src/lib/libc/crypt/crypt.3 b/src/lib/libc/crypt/crypt.3
deleted file mode 100644
index c8ebf9861d..0000000000
--- a/src/lib/libc/crypt/crypt.3
+++ /dev/null
@@ -1,144 +0,0 @@
-.\" $OpenBSD: crypt.3,v 1.45 2015/04/06 20:49:41 tedu Exp $
-.\"
-.\" FreeSec: libcrypt
-.\"
-.\" Copyright (c) 1994 David Burren
-.\" 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.
-.\" 4. Neither the name of the author nor the names of other contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" 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 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)
-.\" 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.
-.\"
-.\" Manual page, using -mandoc macros
-.\"
-.Dd $Mdocdate: April 6 2015 $
-.Dt CRYPT 3
-.Os
-.Sh NAME
-.Nm crypt ,
-.Nm bcrypt_gensalt ,
-.Nm bcrypt
-.Nd password hashing
-.Sh SYNOPSIS
-.In stdlib.h
-.Pp
-.In unistd.h
-.Ft char *
-.Fn crypt "const char *key" "const char *setting"
-.In pwd.h
-.Ft char *
-.Fn bcrypt_gensalt "u_int8_t log_rounds"
-.Ft char *
-.Fn bcrypt "const char *key" "const char *salt"
-.Sh DESCRIPTION
-These functions are deprecated in favor of
-.Xr crypt_checkpass 3
-and
-.Xr crypt_newhash 3 .
-.Pp
-The
-.Fn crypt
-function performs password hashing.
-Additional code has been added to deter key search attempts and to use
-stronger hashing algorithms.
-.Pp
-The first argument to
-.Fn crypt
-is a NUL-terminated
-string
-.Fa key ,
-typically a user's typed password.
-The second,
-.Fa setting ,
-currently supports a single form.
-If it begins
-with a string character
-.Pq Ql $
-and a number then a different algorithm is used depending on the number.
-At the moment
-.Ql $2
-chooses Blowfish hashing; see below for more information.
-.Ss Blowfish crypt
-The Blowfish version of crypt has 128 bits of
-.Fa salt
-in order to make building dictionaries of common passwords space consuming.
-The initial state of the
-Blowfish cipher is expanded using the
-.Fa salt
-and the
-.Fa password
-repeating the process a variable number of rounds, which is encoded in
-the password string.
-The maximum password length is 72.
-The final Blowfish password entry is created by encrypting the string
-.Pp
-.Dq OrpheanBeholderScryDoubt
-.Pp
-with the Blowfish state 64 times.
-.Pp
-The version number, the logarithm of the number of rounds and
-the concatenation of salt and hashed password are separated by the
-.Ql $
-character.
-An encoded
-.Sq 8
-would specify 256 rounds.
-A valid Blowfish password looks like this:
-.Pp
-.Dq $2b$12$FPWWO2RJ3CK4FINTw0Hi8OiPKJcX653gzSS.jqltHFMxyDmmQ0Hqq .
-.Pp
-The whole Blowfish password string is passed as
-.Fa setting
-for interpretation.
-.Sh RETURN VALUES
-The function
-.Fn crypt
-returns a pointer to the encrypted value on success, and
-.Dv NULL
-on failure.
-.Sh SEE ALSO
-.Xr encrypt 1 ,
-.Xr login 1 ,
-.Xr passwd 1 ,
-.Xr blowfish 3 ,
-.Xr crypt_checkpass 3 ,
-.Xr getpass 3 ,
-.Xr passwd 5
-.Sh HISTORY
-A rotor-based
-.Fn crypt
-function appeared in
-.At v3 .
-A DES-based
-.Fn crypt
-first appeared in
-.At v7 .
-.Fn bcrypt
-first appeared in
-.Ox 2.1 .
-.Sh BUGS
-The
-.Fn crypt
-function returns a pointer to static data, and subsequent calls to
-.Fn crypt
-will modify the same object.
diff --git a/src/lib/libc/crypt/crypt.c b/src/lib/libc/crypt/crypt.c
deleted file mode 100644
index 40d5503544..0000000000
--- a/src/lib/libc/crypt/crypt.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*      $OpenBSD: crypt.c,v 1.31 2015/09/12 14:56:50 guenther Exp $     */
-
-#include <errno.h>
-#include <pwd.h>
-#include <unistd.h>
-
-char *
-crypt(const char *key, const char *setting)
-{
-        if (setting[0] == '$') {
-                switch (setting[1]) {
-                case '2':
-                        return bcrypt(key, setting);
-                default:
-                        errno = EINVAL;
-                        return (NULL);
-                }
-        }
-        errno = EINVAL;
-        return (NULL);
-}
-DEF_WEAK(crypt);
diff --git a/src/lib/libc/crypt/crypt_checkpass.3 b/src/lib/libc/crypt/crypt_checkpass.3
deleted file mode 100644
index 9e0561130a..0000000000
--- a/src/lib/libc/crypt/crypt_checkpass.3
+++ /dev/null
@@ -1,112 +0,0 @@
-.\" $OpenBSD: crypt_checkpass.3,v 1.12 2019/07/29 23:14:06 deraadt Exp $
-.\"
-.\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
-.\"
-.\" 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 $Mdocdate: July 29 2019 $
-.Dt CRYPT_CHECKPASS 3
-.Os
-.Sh NAME
-.Nm crypt_checkpass ,
-.Nm crypt_newhash
-.Nd password hashing
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn crypt_checkpass "const char *password" "const char *hash"
-.Ft int
-.Fn crypt_newhash "const char *password" "const char *pref" "char *hash" "size_t hashsize"
-.Sh DESCRIPTION
-The
-.Fn crypt_checkpass
-function simplifies checking a user's password.
-If both the
-.Fa hash
-and the
-.Fa password
-are the empty string, authentication
-is a success.
-Otherwise, the
-.Fa password
-is hashed and compared to the provided
-.Fa hash .
-If the
-.Fa hash
-is
-.Dv NULL ,
-authentication will always fail, but a default
-amount of work is performed to simulate the hashing operation.
-A successful match will return 0.
-A failure will return \-1 and set
-.Xr errno 2 .
-.Pp
-The
-.Fn crypt_newhash
-function simplifies the creation of new password hashes.
-The provided
-.Fa password
-is randomly salted and hashed and stored in
-.Fa hash .
-The size of the available space is specified by
-.Fa hashsize ,
-which should be
-.Dv _PASSWORD_LEN .
-The
-.Fa pref
-argument identifies the preferred hashing algorithm and parameters.
-Possible values are:
-.Bl -tag -width Ds
-.It Dq bcrypt,<rounds>
-The bcrypt algorithm, where the value of rounds can be between 4 and 31 and
-specifies the base 2 logarithm of the number of rounds.
-If rounds is omitted or the special value
-.Sq a ,
-an appropriate number of rounds is automatically selected based on system
-performance.
-.El
-.Sh RETURN VALUES
-.Rv -std crypt_checkpass crypt_newhash
-.Sh ERRORS
-The
-.Fn crypt_checkpass
-function sets
-.Va errno
-to
-.Er EACCES
-when authentication fails.
-.Pp
-The
-.Fn crypt_newhash
-function sets
-.Va errno
-to
-.Er EINVAL
-if
-.Fa pref
-is unsupported or insufficient space is provided.
-.Sh SEE ALSO
-.Xr crypt 3 ,
-.Xr login.conf 5 ,
-.Xr passwd 5
-.Sh HISTORY
-The function
-.Fn crypt_checkpass
-first appeared in
-.Ox 5.6 ,
-and
-.Fn crypt_newhash
-in
-.Ox 5.7 .
-.Sh AUTHORS
-.An Ted Unangst Aq Mt tedu@openbsd.org
diff --git a/src/lib/libc/crypt/cryptutil.c b/src/lib/libc/crypt/cryptutil.c
deleted file mode 100644
index f48ba1af2c..0000000000
--- a/src/lib/libc/crypt/cryptutil.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $OpenBSD: cryptutil.c,v 1.12 2015/09/13 15:33:48 guenther Exp $ */
-/*
- * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
- *
- * 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 <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <pwd.h>
-#include <login_cap.h>
-#include <errno.h>
-
-int
-crypt_checkpass(const char *pass, const char *goodhash)
-{
-        char dummy[_PASSWORD_LEN];
-
-        if (goodhash == NULL) {
-                /* fake it */
-                goto fake;
-        }
-
-        /* empty password */
-        if (strlen(goodhash) == 0 && strlen(pass) == 0)
-                return 0;
-
-        if (goodhash[0] == '$' && goodhash[1] == '2') {
-                if (bcrypt_checkpass(pass, goodhash))
-                        goto fail;
-                return 0;
-        }
-
-        /* unsupported. fake it. */
-fake:
-        bcrypt_newhash(pass, 8, dummy, sizeof(dummy));
-fail:
-        errno = EACCES;
-        return -1;
-}
-DEF_WEAK(crypt_checkpass);
-
-int
-crypt_newhash(const char *pass, const char *pref, char *hash, size_t hashlen)
-{
-        int rv = -1;
-        const char *defaultpref = "blowfish,8";
-        const char *errstr;
-        const char *choices[] = { "blowfish", "bcrypt" };
-        size_t maxchoice = sizeof(choices) / sizeof(choices[0]);
-        int i;
-        int rounds;
-
-        if (pref == NULL)
-                pref = defaultpref;
-
-        for (i = 0; i < maxchoice; i++) {
-                const char *choice = choices[i];
-                size_t len = strlen(choice);
-                if (strcmp(pref, choice) == 0) {
-                        rounds = _bcrypt_autorounds();
-                        break;
-                } else if (strncmp(pref, choice, len) == 0 &&
-                    pref[len] == ',') {
-                        if (strcmp(pref + len + 1, "a") == 0) {
-                                rounds = _bcrypt_autorounds();
-                        } else {
-                                rounds = strtonum(pref + len + 1, 4, 31, &errstr);
-                                if (errstr) {
-                                        errno = EINVAL;
-                                        goto err;
-                                }
-                        }
-                        break;
-                }
-        }
-        if (i == maxchoice) {
-                errno = EINVAL;
-                goto err;
-        }
-
-        rv = bcrypt_newhash(pass, rounds, hash, hashlen);
-
-err:
-        return rv;
-}
-DEF_WEAK(crypt_newhash);
diff --git a/src/lib/libc/include/DETAILS b/src/lib/libc/include/DETAILS
deleted file mode 100644
index 6382cc1c0d..0000000000
--- a/src/lib/libc/include/DETAILS
+++ /dev/null
@@ -1,133 +0,0 @@
-The goal: calls from inside libc to other libc functions should
- * not be overridable (except for the malloc family), and
- * not have pointless inefficiencies.
-
-To achieve this, we arrange that all these internal call be via
-identifiers that are of hidden visibility and--to avoid confusion
-and work correctly in static executables--are in the reserved
-namespace.
-
-This document describes the details of the naming scheme and how
-it is implemented.
-
-I've chosen a prefix of underbar-libc-underbar ("_libc_") for this.
-These are not declared directly; instead, the gcc "asm labels"
-extension is used to rename the function.
-
-We need many of the symbols to be weak in *static* builds, but they
-can be strong in the dynamic library, as there's a natural precedence
-from the search order there.  When the descriptions below say a
-name is "weak", that is only necessary for the static library and
-not for the shared library.  Note: use defined(PIC) to recognize
-when compiling the shared objects: some archs define __PIC__ *all*
-the time.
-
----------
-
-For syscalls which are not cancellation points, such as getpid(),
-the identifiers are just:
-        _libc_getpid            hidden alias, for use internal to libc only
-        _thread_sys_getpid      global name, for use outside libc only
-        getpid                  weak alias, for use outside libc only
-
-For syscalls which are cancellation points, such as wait4(), there
-are identifiers that do not provide cancellation:
-        _libc_wait4             hidden alias, for use internal to libc only
-        _thread_sys_wait4       global name, for use outside libc only
-...and identifiers that do provide cancellation:
-        wait4                   weak alias, for general use
-        _libc_wait4_cancel      hidden name, for use internal to libc only
-Inside libc, the bare name ("wait4") binds to the version *with*
-cancellation.  If it's necessary to use the syscall without doing
-cancellation it can be obtained by calling HIDDEN(x) instead of
-just x.
-
-Some other calls need to be wrapped for reasons other than cancellation,
-such as to provide functionality beyond the underlying syscall (e.g.,
-ptrace).  For these, there are identifiers for the raw call, without
-the wrapping:
-        _libc_ptrace            hidden alias, for use internal to libc only
-        _thread_sys_ptrace      global name, for use outside libc only
-...and identifiers that do provide the libc wrapping:
-        ptrace                  weak alias, for general use
-        _libc_ptrace_wrap       hidden name, for use internal to libc only
-Inside libc, the bare name ("ptrace") binds to the wrapper; if
-the raw version is necessary it can be obtained by calling HIDDEN(x)
-instead of just x.
-
-For syscalls implemented in ASM, the aliases of the raw syscall stub
-are provided by the ASM macros.  Of the macros used by sys/Makefile.inc:
-RSYSCALL(), PSEUDO(), and PSEUDO_NOERROR() generate all three names
-(ala getpid() above), while RSYSCALL_HIDDEN() generates just the
-_thread_sys_x and _libc_x names.
-
-
-
-By using gcc's "asm label" extension, we can usually avoid having
-to type those prefixes in the .h and .c files.  However, for those
-cases where a non-default binding is necessary we can use these macros
-to get the desired identifier:
-
-  CANCEL(x)
-        This expands to the internal, hidden name of a cancellation
-        wrapper: _libc_x_cancel.  ex: CANCEL(fsync)(fd)
-
-  WRAP(x)
-        This expands to the internal, hidden name of a non-cancellation
-        wrapper: _libc_x_wrap.  ex: WRAP(sigprocmask)(set)
-
-
-In order to actually set up the desired asm labels, we use these in
-the internal .h files:
-  PROTO_NORMAL(x)               Symbols used both internally and externally
-        This makes gcc convert use of x to use _libc_x instead
-        ex: PROTO_NORMAL(getpid)
-
-  PROTO_STD_DEPRECATED(x)       Standard C symbols that we don't want to use
-        This just marks the symbol as deprecated, with no renaming.
-        ex: PROTO_STD_DEPRECATED(strcpy)
-
-  PROTO_DEPRECATED(x)   Symbols not in ISO C that we don't want to use
-        This marks the symbol as both weak and deprecated, with no renaming
-        ex: PROTO_DEPRECATED(creat)
-
-  PROTO_CANCEL(x)               Functions that have cancellation wrappers
-        Like PROTO_NORMAL(x), but also declares _libc_x_cancel
-        ex: PROTO_CANCEL(wait4)
-
-  PROTO_WRAP(x)         Functions that have wrappers for other reasons
-        Like PROTO_NORMAL(x), but also declares _libc_x_wrap.  Internal
-        calls that want the wrapper's processing should invoke WRAP(x)(...)
-        ex: PROTO_WRAP(sigaction)
-
-
-Finally, to create the expected aliases, we use these in the .c files
-where the definitions are:
-  DEF_STRONG(x)         Symbols reserved to or specified by ISO C
-        This defines x as a strong alias for _libc_x; this must only
-        be used for symbols that are reserved by the C standard
-        (or reserved in the external identifier namespace).
-        Matches with PROTO_NORMAL()
-        ex: DEF_STRONG(fopen)
-
-  DEF_WEAK(x)           Symbols used internally and not in ISO C
-        This defines x as a weak alias for _libc_x
-        Matches with PROTO_NORMAL()
-        ex: DEF_WEAK(lseek)
-
-  DEF_CANCEL(x)         Symbols that have a cancellation wrapper
-        This defines x as a weak alias for _libc_x_cancel.
-        Matches with PROTO_CANCEL()
-        ex: DEF_CANCEL(read)
-
-  DEF_WRAP(x)
-        This defines x as a weak alias for _libc_x_wrap.
-        Matches with PROTO_WRAP()
-        ex: DEF_WRAP(ptrace)
-
-  MAKE_CLONE(dst, src)  Symbols that are exact clones of other symbols
-        This declares _libc_dst as being the same type as dst, and makes
-        _libc_dst a strong, hidden alias for _libc_src.  You still need to
-        DEF_STRONG(dst) or DEF_WEAK(dst) to alias dst itself
-        ex: MAKE_CLONE(SHA224Pad, SHA256Pad)
-
diff --git a/src/lib/libc/include/README b/src/lib/libc/include/README
deleted file mode 100644
index 6410072c96..0000000000
--- a/src/lib/libc/include/README
+++ /dev/null
@@ -1,97 +0,0 @@
-So you want to add an interface to libc...
-
-CASE I: internal symbols
-
-  A) used in a single file
-     Duh: use whatever name you want and make it static
-
-  B) used in multiple files
-     Give it a name in the implementation namespace (leading underbar)
-     and declare it in a __{BEGIN,END}_HIDDEN_DECLS block in a .h
-     file inside libc.  If it's used in just a single subdir of
-     libc *and* that subdir has an appropriate .h file in it, then
-     declare it there.
-     Example: stdio/local.h.
-     Otherwise, declare it in one of the hidden/* files.
-     Example: _mktemp() in hidden/stdio.h
-
-CASE II: external symbols
-
-  First of all, add your symbol to Symbols.list.  MD symbols go in
-  arch/*/Symbols.list (shock, I know)
-
-  Declare your function in the appropriate header.  It almost certainly
-  should be in a public header installed under /usr/include/.  Exceptions
-  are symbols that are just shared between libc and libpthread/csu/ld.so
-  which are only declared in libc/include/* or just in each .c file.
-
-  A) objects (variables)
-     That's it, you're done.
-
-  B) plain C functions (not syscalls)
-     1) functions that are *not* called from inside libc
-
-        If this function is specified in the ISO C standard or its
-        name begins with an underbar, then in the hidden/* version
-        of the header where you declared the function, add this line:
-                PROTO_STD_DEPRECATED(your_function_name);
-
-        Otherwise, this is *not* a function specified in the ISO C
-        standard and its name begins with a letter.  In the hidden/*
-        version of the header where you declared the function, add
-        this line:
-                PROTO_DEPRECATED(your_function_name);
-
-     2) functions that are called from inside libc
-
-        In the hidden/* version of the header where you declared
-        the function, add this line:
-                PROTO_NORMAL(your_function_name);
-
-        Then, in the .c file(s) where the function is defined:
-         - if the function is specified in the ISO C standard or
-           its name begins with an underbar, add
-                DEF_STRONG(your_function_name);
-
-         - otherwise, add:
-                DEF_WEAK(your_function_name);
-
-  C) syscalls that require cancellation or other libpthread wrappers
-     You're done in libc, but go to libpthread and add the wrapper there.
-
-  D) syscalls that require libc wrappers for other reasons
-     First of all, make sure this really is the Right Thing.  Talk
-     with kettenis, deraadt, miod, and guenther.
-
-     1) If the actual syscall doesn't have the same calling convention
-        as the C interface, then maybe it shouldn't be exported at
-        all and you should just have an ASM stub, like SYS___tfork
-        --> __tfork_thread() or SYS_break --> brk() and sbrk().  If
-        it _could_ be called from C, then give the syscall a name
-        different from the C API.  Syscalls that fail this for
-        historical reasons (e.g., getlogin) are generated with
-        PSEUDO in libc/sys/Makefile.inc, so the ASM stub has a
-        leading underbar.  Go read gen/getlogin.c for an example
-        of how to do this.
-
-     2) Otherwise, you're sane and have a syscall like sigaction()
-        which requires a wrapper but whose syscall API is the same
-        as the C API.  Then:
-         - generate the ASM stub with HIDDEN in libc/sys/Makefile.inc
-         - in the proper hidden/*.h file add
-                PROTO_WRAP(your_function_name)
-         - the wrapper function should be defined in
-                libc/sys/w_your_function_name.c
-           which should define WRAP(your_function_name) and
-           follow it with DEF_WRAP(your_function_name).  Look at
-           libc/sys/w_sigaction.c for an example.
-         - by default, libc code that calls your_function_name()
-           will get the real syscall and *not* the wrapper.  libc
-           calls that needd to go through the wrapper should invoke
-           WRAP(your_function_name)
-
-  E) syscalls that don't require any wrapping
-     In the hidden/* version of the header where you declared the
-     function, add this line:
-        PROTO_NORMAL(your_function_name);
-
diff --git a/src/lib/libc/include/atfork.h b/src/lib/libc/include/atfork.h
deleted file mode 100644
index f09de4892a..0000000000
--- a/src/lib/libc/include/atfork.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*      $OpenBSD: atfork.h,v 1.2 2015/08/27 04:37:09 guenther Exp $ */
-
-/*
- * Copyright (c) 2008 Kurt Miller <kurt@openbsd.org>
- * Copyright (c) 2008 Philip Guenther <guenther@openbsd.org>
- * Copyright (c) 2003 Daniel Eischen <deischen@freebsd.org>
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * 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 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)
- * 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.
- *
- * $FreeBSD: /repoman/r/ncvs/src/lib/libc_r/uthread/uthread_atfork.c,v 1.1 2004/12/10 03:36:45 grog Exp $
- */
-
-#include <sys/queue.h>
-
-struct atfork_fn {
-        TAILQ_ENTRY(atfork_fn) fn_next;
-        void    (*fn_prepare)(void);
-        void    (*fn_parent)(void);
-        void    (*fn_child)(void);
-        void    *fn_dso;
-};
-
-__BEGIN_HIDDEN_DECLS
-extern TAILQ_HEAD(atfork_listhead, atfork_fn) _atfork_list;
-__END_HIDDEN_DECLS
diff --git a/src/lib/libc/include/cancel.h b/src/lib/libc/include/cancel.h
deleted file mode 100644
index c452bf3d4c..0000000000
--- a/src/lib/libc/include/cancel.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*      $OpenBSD: cancel.h,v 1.5 2017/09/05 02:40:54 guenther Exp $ */
-/*
- * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
- *
- * 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.
- */
-
-#ifndef _CANCEL_H_
-#define _CANCEL_H_
-
-#include <tib.h>
-#include "thread_private.h"
-
-/* process a cancel request at a cancel point */
-__dead void     _thread_canceled(void);
-
-#ifdef __LIBC__
-PROTO_NORMAL(_thread_canceled);
-#endif
-
-#if defined(__LIBC__) && !defined(TCB_HAVE_MD_GET)
-/*
- * Override TIB_GET macro to use the caching callback
- */
-#undef TIB_GET
-#define TIB_GET()       TCB_TO_TIB(_thread_cb.tc_tcb())
-#endif
-
-#define PREP_CANCEL_POINT(tib)                                          \
-        int _cantcancel = (tib)->tib_cantcancel
-
-#define ENTER_CANCEL_POINT_INNER(tib, can_cancel, delay)                \
-        if (_cantcancel == 0) {                                         \
-                (tib)->tib_cancel_point = (delay) ?                     \
-                    CANCEL_POINT_DELAYED : CANCEL_POINT;                \
-                if (can_cancel) {                                       \
-                        __asm volatile("":::"memory");                  \
-                        if (__predict_false((tib)->tib_canceled))       \
-                                _thread_canceled();                     \
-                }                                                       \
-        }
-
-#define LEAVE_CANCEL_POINT_INNER(tib, can_cancel)                       \
-        if (_cantcancel == 0) {                                         \
-                (tib)->tib_cancel_point = 0;                            \
-                if (can_cancel) {                                       \
-                        __asm volatile("":::"memory");                  \
-                        if (__predict_false((tib)->tib_canceled))       \
-                                _thread_canceled();                     \
-                }                                                       \
-        }
-
-/*
- * Enter or leave a cancelation point, optionally processing pending
- * cancelation requests.  Note that ENTER_CANCEL_POINT opens a block
- * and LEAVE_CANCEL_POINT must close that same block.
- */
-#define ENTER_CANCEL_POINT(can_cancel)                                  \
-    {                                                                   \
-        struct tib *_tib = TIB_GET();                                   \
-        PREP_CANCEL_POINT(_tib);                                        \
-        ENTER_CANCEL_POINT_INNER(_tib, can_cancel, 0)
-
-#define LEAVE_CANCEL_POINT(can_cancel)                                  \
-        LEAVE_CANCEL_POINT_INNER(_tib, can_cancel);                     \
-    }
-
-#endif /* _CANCEL_H_ */
diff --git a/src/lib/libc/include/ctype_private.h b/src/lib/libc/include/ctype_private.h
deleted file mode 100644
index cbe1b20475..0000000000
--- a/src/lib/libc/include/ctype_private.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* $OpenBSD: ctype_private.h,v 1.2 2015/08/27 04:37:09 guenther Exp $ */
-/* Written by Marc Espie, public domain */
-#define CTYPE_NUM_CHARS       256
-
-__BEGIN_HIDDEN_DECLS
-extern const char _C_ctype_[];
-extern const short _C_toupper_[];
-extern const short _C_tolower_[];
-__END_HIDDEN_DECLS
diff --git a/src/lib/libc/include/localedef.h b/src/lib/libc/include/localedef.h
deleted file mode 100644
index 12dd47fffa..0000000000
--- a/src/lib/libc/include/localedef.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*      $OpenBSD: localedef.h,v 1.1 2016/05/23 00:05:15 guenther Exp $  */
-/*      $NetBSD: localedef.h,v 1.4 1996/04/09 20:55:31 cgd Exp $        */
-
-/*
- * Copyright (c) 1994 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 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.
- */
-
-#ifndef _LOCALEDEF_H_
-#define _LOCALEDEF_H_
-
-#include <sys/types.h>
-
-typedef struct
-{
-        char *yesexpr;
-        char *noexpr;
-        char *yesstr;
-        char *nostr;
-} _MessagesLocale;
-
-
-typedef struct
-{
-        char *int_curr_symbol;
-        char *currency_symbol;
-        char *mon_decimal_point;
-        char *mon_thousands_sep;
-        char *mon_grouping;
-        char *positive_sign;
-        char *negative_sign;
-        char int_frac_digits;
-        char frac_digits;
-        char p_cs_precedes;
-        char p_sep_by_space;
-        char n_cs_precedes;
-        char n_sep_by_space;
-        char p_sign_posn;
-        char n_sign_posn;
-        char int_p_cs_precedes;
-        char int_p_sep_by_space;
-        char int_n_cs_precedes;
-        char int_n_sep_by_space;
-        char int_p_sign_posn;
-        char int_n_sign_posn;
-} _MonetaryLocale;
-
-
-typedef struct
-{
-        const char *decimal_point;
-        const char *thousands_sep;
-        const char *grouping;
-} _NumericLocale;
-
-
-typedef struct {
-        const char *abday[7];
-        const char *day[7];
-        const char *abmon[12];
-        const char *mon[12];
-        const char *am_pm[2];
-        const char *d_t_fmt;
-        const char *d_fmt;
-        const char *t_fmt;
-        const char *t_fmt_ampm;
-} _TimeLocale;
-
-
-__BEGIN_HIDDEN_DECLS
-extern const _MessagesLocale *_CurrentMessagesLocale;
-extern const _MessagesLocale  _DefaultMessagesLocale;
-extern const _MonetaryLocale *_CurrentMonetaryLocale;
-extern const _MonetaryLocale  _DefaultMonetaryLocale;
-extern const _NumericLocale *_CurrentNumericLocale;
-extern const _NumericLocale  _DefaultNumericLocale;
-extern const _TimeLocale *_CurrentTimeLocale;
-extern const _TimeLocale  _DefaultTimeLocale;
-__END_HIDDEN_DECLS
-
-#endif /* !_LOCALEDEF_H_ */
diff --git a/src/lib/libc/include/mpool.h b/src/lib/libc/include/mpool.h
deleted file mode 100644
index 005b006d17..0000000000
--- a/src/lib/libc/include/mpool.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*      $OpenBSD: mpool.h,v 1.1 2015/09/09 15:35:24 guenther Exp $      */
-/*      $NetBSD: mpool.h,v 1.7 1996/05/03 21:13:41 cgd Exp $    */
-
-/*-
- * Copyright (c) 1991, 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. 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.
- *
- *      @(#)mpool.h     8.4 (Berkeley) 11/2/95
- */
-
-#ifndef _MPOOL_H_ 
-#define _MPOOL_H_
-
-#include <sys/queue.h>
-
-/*
- * The memory pool scheme is a simple one.  Each in-memory page is referenced
- * by a bucket which is threaded in up to two of three ways.  All active pages
- * are threaded on a hash chain (hashed by page number) and an lru chain.
- * Inactive pages are threaded on a free chain.  Each reference to a memory
- * pool is handed an opaque MPOOL cookie which stores all of this information.
- */
-#define HASHSIZE        128
-#define HASHKEY(pgno)   ((pgno - 1 + HASHSIZE) % HASHSIZE)
-
-/* The BKT structures are the elements of the queues. */
-typedef struct _bkt {
-        TAILQ_ENTRY(_bkt) hq;           /* hash queue */
-        TAILQ_ENTRY(_bkt) q;            /* lru queue */
-        void    *page;                  /* page */
-        pgno_t   pgno;                  /* page number */
-
-#define MPOOL_DIRTY     0x01            /* page needs to be written */
-#define MPOOL_PINNED    0x02            /* page is pinned into memory */
-#define MPOOL_INUSE     0x04            /* page address is valid */
-        u_int8_t flags;                 /* flags */
-} BKT;
-
-typedef struct MPOOL {
-        TAILQ_HEAD(_lqh, _bkt) lqh;     /* lru queue head */
-                                        /* hash queue array */
-        TAILQ_HEAD(_hqh, _bkt) hqh[HASHSIZE];
-        pgno_t  curcache;               /* current number of cached pages */
-        pgno_t  maxcache;               /* max number of cached pages */
-        pgno_t  npages;                 /* number of pages in the file */
-        unsigned long   pagesize;       /* file page size */
-        int     fd;                     /* file descriptor */
-                                        /* page in conversion routine */
-        void    (*pgin)(void *, pgno_t, void *);
-                                        /* page out conversion routine */
-        void    (*pgout)(void *, pgno_t, void *);
-        void    *pgcookie;              /* cookie for page in/out routines */
-#ifdef STATISTICS
-        unsigned long   cachehit;
-        unsigned long   cachemiss;
-        unsigned long   pagealloc;
-        unsigned long   pageflush;
-        unsigned long   pageget;
-        unsigned long   pagenew;
-        unsigned long   pageput;
-        unsigned long   pageread;
-        unsigned long   pagewrite;
-#endif
-} MPOOL;
-
-#define MPOOL_IGNOREPIN 0x01            /* Ignore if the page is pinned. */
-#define MPOOL_PAGE_REQUEST      0x01    /* Allocate a new page with a
-                                           specific page number. */
-#define MPOOL_PAGE_NEXT         0x02    /* Allocate a new page with the next
-                                          page number. */
-
-__BEGIN_HIDDEN_DECLS
-MPOOL   *mpool_open(void *, int, pgno_t, pgno_t);
-void     mpool_filter(MPOOL *, void (*)(void *, pgno_t, void *),
-            void (*)(void *, pgno_t, void *), void *);
-void    *mpool_new(MPOOL *, pgno_t *, unsigned int);
-void    *mpool_get(MPOOL *, pgno_t, unsigned int);
-int      mpool_delete(MPOOL *, void *);
-int      mpool_put(MPOOL *, void *, unsigned int);
-int      mpool_sync(MPOOL *);
-int      mpool_close(MPOOL *);
-
-PROTO_NORMAL(mpool_open);
-PROTO_NORMAL(mpool_filter);
-PROTO_NORMAL(mpool_new);
-PROTO_NORMAL(mpool_get);
-PROTO_NORMAL(mpool_delete);
-PROTO_NORMAL(mpool_put);
-PROTO_NORMAL(mpool_sync);
-PROTO_NORMAL(mpool_close);
-
-#ifdef STATISTICS
-void     mpool_stat(MPOOL *);
-PROTO_NORMAL(mpool_stat);
-#endif
-__END_HIDDEN_DECLS
-
-#endif
diff --git a/src/lib/libc/include/namespace.h b/src/lib/libc/include/namespace.h
deleted file mode 100644
index b42c00e4a1..0000000000
--- a/src/lib/libc/include/namespace.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*      $OpenBSD: namespace.h,v 1.15 2019/11/25 22:57:28 guenther Exp $ */
-
-#ifndef _LIBC_NAMESPACE_H_
-#define _LIBC_NAMESPACE_H_
-
-/*
- * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
- *
- * 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.
- */
-
-/*
- * For explanations of how to use these, see README
- * For explanations of why we use them and how they work, see DETAILS
- */
-
-#include <sys/cdefs.h>  /* for __dso_hidden and __{weak,strong}_alias */
-
-#define __dso_protected         __attribute__((__visibility__("protected")))
-
-#define HIDDEN(x)               _libc_##x
-#define CANCEL(x)               _libc_##x##_cancel
-#define WRAP(x)                 _libc_##x##_wrap
-#define HIDDEN_STRING(x)        "_libc_" __STRING(x)
-#define CANCEL_STRING(x)        "_libc_" __STRING(x) "_cancel"
-#define WRAP_STRING(x)          "_libc_" __STRING(x) "_wrap"
-
-#define PROTO_NORMAL(x)         __dso_hidden typeof(x) x asm(HIDDEN_STRING(x))
-#define PROTO_STD_DEPRECATED(x) typeof(x) x __attribute__((deprecated))
-#define PROTO_DEPRECATED(x)     typeof(x) x __attribute__((deprecated, weak))
-#define PROTO_CANCEL(x)         __dso_hidden typeof(x) HIDDEN(x), \
-                                        x asm(CANCEL_STRING(x))
-#define PROTO_WRAP(x)           PROTO_NORMAL(x), WRAP(x)
-#define PROTO_PROTECTED(x)      __dso_protected typeof(x) x
-
-#define DEF_STRONG(x)           __strong_alias(x, HIDDEN(x))
-#define DEF_WEAK(x)             __weak_alias(x, HIDDEN(x))
-#define DEF_CANCEL(x)           __weak_alias(x, CANCEL(x))
-#define DEF_WRAP(x)             __weak_alias(x, WRAP(x))
-#define DEF_SYS(x)              __strong_alias(_thread_sys_##x, HIDDEN(x))
-
-#if !defined(__clang__) && __GNUC__ != 3
-/* our gcc 4.2 handles redirecting builtins via PROTO_NORMAL()'s asm() label */
-#define DEF_BUILTIN(x)          DEF_STRONG(x)
-#define BUILTIN
-#else
-/*
- * clang and gcc can't redirect builtins via asm() labels, so mark
- * them protected instead.
- */
-#define DEF_BUILTIN(x)          __asm("")
-#define BUILTIN                 __dso_protected
-#endif
-
-#define MAKE_CLONE(dst, src)    __dso_hidden typeof(dst) HIDDEN(dst) \
-                                __attribute__((alias (HIDDEN_STRING(src))))
-
-#define __relro                 __attribute__((section(".data.rel.ro")))
-
-
-/*
- * gcc and clang will generate calls to the functions below.
- * Declare and redirect them here so we always go
- * directly to our hidden aliases.
- */
-#include <sys/_types.h>
-BUILTIN void    *memmove(void *, const void *, __size_t);
-BUILTIN void    *memcpy(void *__restrict, const void *__restrict, __size_t);
-BUILTIN void    *memset(void *, int, __size_t);
-BUILTIN void    __stack_smash_handler(const char [], int __unused);
-#if !defined(__clang__) && __GNUC__ != 3
-PROTO_NORMAL(memmove);
-PROTO_NORMAL(memcpy);
-PROTO_NORMAL(memset);
-PROTO_NORMAL(__stack_smash_handler);
-#endif
-#undef  BUILTIN
-
-#endif  /* _LIBC_NAMESPACE_H_ */
-
diff --git a/src/lib/libc/include/thread_private.h b/src/lib/libc/include/thread_private.h
deleted file mode 100644
index 237c3fbd03..0000000000
--- a/src/lib/libc/include/thread_private.h
+++ /dev/null
@@ -1,426 +0,0 @@
-/* $OpenBSD: thread_private.h,v 1.36 2021/01/06 19:54:17 otto Exp $ */
-
-/* PUBLIC DOMAIN: No Rights Reserved. Marco S Hyman <marc@snafu.org> */
-
-#ifndef _THREAD_PRIVATE_H_
-#define _THREAD_PRIVATE_H_
-
-#include <stdio.h>              /* for FILE and __isthreaded */
-
-#define _MALLOC_MUTEXES 32
-void _malloc_init(int);
-#ifdef __LIBC__
-PROTO_NORMAL(_malloc_init);
-#endif /* __LIBC__ */
-
-/*
- * The callbacks needed by libc to handle the threaded case.
- * NOTE: Bump the version when you change the struct contents!
- *
- * tc_canceled:
- *      If not NULL, what to do when canceled (otherwise _exit(0))
- *
- * tc_flockfile, tc_ftrylockfile, and tc_funlockfile:
- *      If not NULL, these implement the flockfile() family.
- *      XXX In theory, you should be able to lock a FILE before
- *      XXX loading libpthread and have that be a real lock on it,
- *      XXX but that doesn't work without the libc base version
- *      XXX tracking the recursion count.
- *
- * tc_malloc_lock and tc_malloc_unlock:
- * tc_atexit_lock and tc_atexit_unlock:
- * tc_atfork_lock and tc_atfork_unlock:
- * tc_arc4_lock and tc_arc4_unlock:
- *      The locks used by the malloc, atexit, atfork, and arc4 subsystems.
- *      These have to be ordered specially in the fork/vfork wrappers
- *      and may be implemented differently than the general mutexes
- *      in the callbacks below.
- *
- * tc_mutex_lock and tc_mutex_unlock:
- *      Lock and unlock the given mutex. If the given mutex is NULL
- *      a mutex is allocated and initialized automatically.
- *
- * tc_mutex_destroy:
- *      Destroy/deallocate the given mutex.
- *
- * tc_tag_lock and tc_tag_unlock:
- *      Lock and unlock the mutex associated with the given tag.
- *      If the given tag is NULL a tag is allocated and initialized
- *      automatically.
- *
- * tc_tag_storage:
- *      Returns a pointer to per-thread instance of data associated
- *      with the given tag.  If the given tag is NULL a tag is
- *      allocated and initialized automatically.
- *
- * tc_fork, tc_vfork:
- *      If not NULL, they are called instead of the syscall stub, so that
- *      the thread library can do necessary locking and reinitialization.
- *
- * tc_thread_release:
- *      Handles the release of a thread's TIB and struct pthread and the
- *      notification of other threads...when there are other threads.
- *
- * tc_thread_key_zero:
- *      For each thread, zero out the key data associated with the given key.
-
- * If <machine/tcb.h> doesn't define TCB_GET(), then locating the TCB in a
- * threaded process requires a syscall (__get_tcb(2)) which is too much
- * overhead for single-threaded processes.  For those archs, there are two
- * additional callbacks, though they are placed first in the struct for
- * convenience in ASM:
- *
- * tc_errnoptr:
- *      Returns the address of the thread's errno.
- *
- * tc_tcb:
- *      Returns the address of the thread's TCB.
- */
-
-struct pthread;
-struct thread_callbacks {
-        int     *(*tc_errnoptr)(void);          /* MUST BE FIRST */
-        void    *(*tc_tcb)(void);
-        __dead void     (*tc_canceled)(void);
-        void    (*tc_flockfile)(FILE *);
-        int     (*tc_ftrylockfile)(FILE *);
-        void    (*tc_funlockfile)(FILE *);
-        void    (*tc_malloc_lock)(int);
-        void    (*tc_malloc_unlock)(int);
-        void    (*tc_atexit_lock)(void);
-        void    (*tc_atexit_unlock)(void);
-        void    (*tc_atfork_lock)(void);
-        void    (*tc_atfork_unlock)(void);
-        void    (*tc_arc4_lock)(void);
-        void    (*tc_arc4_unlock)(void);
-        void    (*tc_mutex_lock)(void **);
-        void    (*tc_mutex_unlock)(void **);
-        void    (*tc_mutex_destroy)(void **);
-        void    (*tc_tag_lock)(void **);
-        void    (*tc_tag_unlock)(void **);
-        void    *(*tc_tag_storage)(void **, void *, size_t, void (*)(void *),
-           void *);
-        __pid_t (*tc_fork)(void);
-        __pid_t (*tc_vfork)(void);
-        void    (*tc_thread_release)(struct pthread *);
-        void    (*tc_thread_key_zero)(int);
-};
-
-__BEGIN_PUBLIC_DECLS
-/*
- *  Set the callbacks used by libc
- */
-void    _thread_set_callbacks(const struct thread_callbacks *_cb, size_t _len);
-__END_PUBLIC_DECLS
-
-#ifdef __LIBC__
-__BEGIN_HIDDEN_DECLS
-/* the current set */
-extern struct thread_callbacks _thread_cb;
-__END_HIDDEN_DECLS
-#endif /* __LIBC__ */
-
-/*
- * helper macro to make unique names in the thread namespace
- */
-#define __THREAD_NAME(name)     __CONCAT(_thread_tagname_,name)
-
-/*
- * Macros used in libc to access thread mutex, keys, and per thread storage.
- * _THREAD_PRIVATE_KEY and _THREAD_PRIVATE_MUTEX are different macros for
- * historical reasons.   They do the same thing, define a static variable
- * keyed by 'name' that identifies a mutex and a key to identify per thread
- * data.
- */
-#define _THREAD_PRIVATE_KEY(name)                                       \
-        static void *__THREAD_NAME(name)
-#define _THREAD_PRIVATE_MUTEX(name)                                     \
-        static void *__THREAD_NAME(name)
-
-
-#ifndef __LIBC__        /* building some sort of reach around */
-
-#define _THREAD_PRIVATE_MUTEX_LOCK(name)                do {} while (0)
-#define _THREAD_PRIVATE_MUTEX_UNLOCK(name)              do {} while (0)
-#define _THREAD_PRIVATE(keyname, storage, error)        &(storage)
-#define _THREAD_PRIVATE_DT(keyname, storage, dt, error) &(storage)
-#define _MUTEX_LOCK(mutex)                              do {} while (0)
-#define _MUTEX_UNLOCK(mutex)                            do {} while (0)
-#define _MUTEX_DESTROY(mutex)                           do {} while (0)
-#define _MALLOC_LOCK(n)                                 do {} while (0)
-#define _MALLOC_UNLOCK(n)                               do {} while (0)
-#define _ATEXIT_LOCK()                                  do {} while (0)
-#define _ATEXIT_UNLOCK()                                do {} while (0)
-#define _ATFORK_LOCK()                                  do {} while (0)
-#define _ATFORK_UNLOCK()                                do {} while (0)
-#define _ARC4_LOCK()                                    do {} while (0)
-#define _ARC4_UNLOCK()                                  do {} while (0)
-
-#else           /* building libc */
-#define _THREAD_PRIVATE_MUTEX_LOCK(name)                                \
-        do {                                                            \
-                if (_thread_cb.tc_tag_lock != NULL)                     \
-                        _thread_cb.tc_tag_lock(&(__THREAD_NAME(name))); \
-        } while (0)
-#define _THREAD_PRIVATE_MUTEX_UNLOCK(name)                              \
-        do {                                                            \
-                if (_thread_cb.tc_tag_unlock != NULL)                   \
-                        _thread_cb.tc_tag_unlock(&(__THREAD_NAME(name))); \
-        } while (0)
-#define _THREAD_PRIVATE(keyname, storage, error)                        \
-        (_thread_cb.tc_tag_storage == NULL ? &(storage) :               \
-            _thread_cb.tc_tag_storage(&(__THREAD_NAME(keyname)),        \
-                &(storage), sizeof(storage), NULL, (error)))
-
-#define _THREAD_PRIVATE_DT(keyname, storage, dt, error)                 \
-        (_thread_cb.tc_tag_storage == NULL ? &(storage) :               \
-            _thread_cb.tc_tag_storage(&(__THREAD_NAME(keyname)),        \
-                &(storage), sizeof(storage), (dt), (error)))
-
-/*
- * Macros used in libc to access mutexes.
- */
-#define _MUTEX_LOCK(mutex)                                              \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_mutex_lock(mutex);                \
-        } while (0)
-#define _MUTEX_UNLOCK(mutex)                                            \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_mutex_unlock(mutex);              \
-        } while (0)
-#define _MUTEX_DESTROY(mutex)                                           \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_mutex_destroy(mutex);             \
-        } while (0)
-
-/*
- * malloc lock/unlock prototypes and definitions
- */
-#define _MALLOC_LOCK(n)                                                 \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_malloc_lock(n);                   \
-        } while (0)
-#define _MALLOC_UNLOCK(n)                                               \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_malloc_unlock(n);                 \
-        } while (0)
-
-#define _ATEXIT_LOCK()                                                  \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_atexit_lock();                    \
-        } while (0)
-#define _ATEXIT_UNLOCK()                                                \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_atexit_unlock();                  \
-        } while (0)
-
-#define _ATFORK_LOCK()                                                  \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_atfork_lock();                    \
-        } while (0)
-#define _ATFORK_UNLOCK()                                                \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_atfork_unlock();                  \
-        } while (0)
-
-#define _ARC4_LOCK()                                                    \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_arc4_lock();                      \
-        } while (0)
-#define _ARC4_UNLOCK()                                                  \
-        do {                                                            \
-                if (__isthreaded)                                       \
-                        _thread_cb.tc_arc4_unlock();                    \
-        } while (0)
-#endif /* __LIBC__ */
-
-
-/*
- * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org>
- * 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.
- */
-/*
- * Private data structures that back up the typedefs in pthread.h.
- * Since only the thread library cares about their size or arrangement,
- * it should be possible to switch libraries without relinking.
- *
- * Do not reorder _atomic_lock_t and sem_t variables in the structs.
- * This is due to alignment requirements of certain arches like hppa.
- * The current requirement is 16 bytes.
- *
- * THE MACHINE DEPENDENT CERROR CODE HAS HARD CODED OFFSETS INTO PTHREAD_T!
- */
-
-#include <sys/queue.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <machine/spinlock.h>
-
-#define _SPINLOCK_UNLOCKED _ATOMIC_LOCK_UNLOCKED
-
-struct __sem {
-        _atomic_lock_t lock;
-        volatile int waitcount;
-        volatile int value;
-        int shared;
-};
-
-TAILQ_HEAD(pthread_queue, pthread);
-
-#ifdef FUTEX
-
-struct pthread_mutex {
-        volatile unsigned int lock;
-        int type;
-        pthread_t owner;
-        int count;
-        int prioceiling;
-};
-
-struct pthread_cond {
-        volatile unsigned int seq;
-        clockid_t clock;
-        struct pthread_mutex *mutex;
-};
-
-struct pthread_rwlock {
-        volatile unsigned int value;
-};
-
-#else
-
-struct pthread_mutex {
-        _atomic_lock_t lock;
-        struct pthread_queue lockers;
-        int type;
-        pthread_t owner;
-        int count;
-        int prioceiling;
-};
-
-struct pthread_cond {
-        _atomic_lock_t lock;
-        struct pthread_queue waiters;
-        struct pthread_mutex *mutex;
-        clockid_t clock;
-};
-
-struct pthread_rwlock {
-        _atomic_lock_t lock;
-        pthread_t owner;
-        struct pthread_queue writers;
-        int readers;
-};
-#endif /* FUTEX */
-
-struct pthread_mutex_attr {
-        int ma_type;
-        int ma_protocol;
-        int ma_prioceiling;
-};
-
-struct pthread_cond_attr {
-        clockid_t ca_clock;
-};
-
-struct pthread_attr {
-        void *stack_addr;
-        size_t stack_size;
-        size_t guard_size;
-        int detach_state;
-        int contention_scope;
-        int sched_policy;
-        struct sched_param sched_param;
-        int sched_inherit;
-};
-
-struct rthread_storage {
-        int keyid;
-        struct rthread_storage *next;
-        void *data;
-};
-
-struct rthread_cleanup_fn {
-        void (*fn)(void *);
-        void *arg;
-        struct rthread_cleanup_fn *next;
-};
-
-struct tib;
-struct stack;
-struct pthread {
-        struct __sem donesem;
-        unsigned int flags;
-        _atomic_lock_t flags_lock;
-        struct tib *tib;
-        void *retval;
-        void *(*fn)(void *);
-        void *arg;
-        char name[32];
-        struct stack *stack;
-        LIST_ENTRY(pthread) threads;
-        TAILQ_ENTRY(pthread) waiting;
-        pthread_cond_t blocking_cond;
-        struct pthread_attr attr;
-        struct rthread_storage *local_storage;
-        struct rthread_cleanup_fn *cleanup_fns;
-
-        /* cancel received in a delayed cancel block? */
-        int delayed_cancel;
-};
-/* flags in pthread->flags */
-#define THREAD_DONE             0x001
-#define THREAD_DETACHED         0x002
-
-/* flags in tib->tib_thread_flags */
-#define TIB_THREAD_ASYNC_CANCEL         0x001
-#define TIB_THREAD_INITIAL_STACK        0x002   /* has stack from exec */
-
-#define ENTER_DELAYED_CANCEL_POINT(tib, self)                           \
-        (self)->delayed_cancel = 0;                                     \
-        ENTER_CANCEL_POINT_INNER(tib, 1, 1)
-
-/*
- * Internal functions exported from libc's thread bits for use by libpthread
- */
-void    _spinlock(volatile _atomic_lock_t *);
-int     _spinlocktry(volatile _atomic_lock_t *);
-void    _spinunlock(volatile _atomic_lock_t *);
-
-void    _rthread_debug(int, const char *, ...)
-                __attribute__((__format__ (printf, 2, 3)));
-pid_t   _thread_dofork(pid_t (*_sys_fork)(void));
-void    _thread_finalize(void);
-
-/*
- * Threading syscalls not declared in system headers
- */
-__dead void     __threxit(pid_t *);
-int             __thrsleep(const volatile void *, clockid_t,
-                    const struct timespec *, volatile void *, const int *);
-int             __thrwakeup(const volatile void *, int n);
-int             __thrsigdivert(sigset_t, siginfo_t *, const struct timespec *);
-
-#endif /* _THREAD_PRIVATE_H_ */
diff --git a/src/lib/libc/net/Makefile.inc b/src/lib/libc/net/Makefile.inc
deleted file mode 100644
index 41a3164d6a..0000000000
--- a/src/lib/libc/net/Makefile.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-#       $OpenBSD: Makefile.inc,v 1.60 2019/08/30 18:33:17 deraadt Exp $
-
-# net sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/net ${LIBCSRCDIR}/net
-
-CFLAGS+=-DRESOLVSORT
-
-SRCS+=  base64.c ethers.c freeaddrinfo.c \
-        gai_strerror.c getaddrinfo.c gethostnamadr.c \
-        getifaddrs.c getnameinfo.c getnetent.c \
-        getnetnamadr.c getpeereid.c getproto.c getprotoent.c getprotoname.c \
-        getservbyname.c getservbyport.c getservent.c getrrsetbyname.c \
-        herror.c if_indextoname.c if_nameindex.c if_nametoindex.c inet_addr.c \
-        inet_lnaof.c inet_makeaddr.c inet_neta.c inet_netof.c inet_network.c \
-        inet_net_ntop.c inet_net_pton.c inet_ntoa.c inet_ntop.c inet_pton.c \
-        linkaddr.c rcmd.c rcmdsh.c ruserok.c \
-        rresvport.c recv.c res_comp.c res_data.c \
-        res_debug.c res_debug_syms.c res_init.c res_mkquery.c res_query.c \
-        res_random.c res_send.c \
-        send.c sethostent.c sockatmark.c
-
-# IPv6
-SRCS+=  ip6opt.c rthdr.c vars6.c
-
-# machine-dependent net sources
-# m-d Makefile.inc must include sources for:
-#       htonl() htons() ntohl() ntohs()
-
-.include "${LIBCSRCDIR}/arch/${MACHINE_CPU}/net/Makefile.inc"
-
-MAN+=   htobe64.3 ether_aton.3 gai_strerror.3 getaddrinfo.3 gethostbyname.3 \
-        getifaddrs.3 getnameinfo.3 getnetent.3 getpeereid.3 getprotoent.3 \
-        getrrsetbyname.3 getservent.3 htonl.3 if_indextoname.3 \
-        inet_addr.3 inet_lnaof.3 inet_net_ntop.3 inet_ntop.3 \
-        inet6_opt_init.3 inet6_rth_space.3 link_ntoa.3 \
-        rcmd.3 rcmdsh.3 res_init.3 sockatmark.3
diff --git a/src/lib/libc/net/base64.c b/src/lib/libc/net/base64.c
deleted file mode 100644
index e90696df67..0000000000
--- a/src/lib/libc/net/base64.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*      $OpenBSD: base64.c,v 1.8 2015/01/16 16:48:51 deraadt Exp $      */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-static const char Base64[] =
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC 1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-         -------------------------------------------------                       
-   following cases can arise:
-   
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-           output will be an integral multiple of 4 characters
-           with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-           characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-           characters followed by one "=" padding character.
-   */
-
-int
-b64_ntop(src, srclength, target, targsize)
-        u_char const *src;
-        size_t srclength;
-        char *target;
-        size_t targsize;
-{
-        size_t datalength = 0;
-        u_char input[3];
-        u_char output[4];
-        int i;
-
-        while (2 < srclength) {
-                input[0] = *src++;
-                input[1] = *src++;
-                input[2] = *src++;
-                srclength -= 3;
-
-                output[0] = input[0] >> 2;
-                output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-                output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-                output[3] = input[2] & 0x3f;
-
-                if (datalength + 4 > targsize)
-                        return (-1);
-                target[datalength++] = Base64[output[0]];
-                target[datalength++] = Base64[output[1]];
-                target[datalength++] = Base64[output[2]];
-                target[datalength++] = Base64[output[3]];
-        }
-    
-        /* Now we worry about padding. */
-        if (0 != srclength) {
-                /* Get what's left. */
-                input[0] = input[1] = input[2] = '\0';
-                for (i = 0; i < srclength; i++)
-                        input[i] = *src++;
-        
-                output[0] = input[0] >> 2;
-                output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-                output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-
-                if (datalength + 4 > targsize)
-                        return (-1);
-                target[datalength++] = Base64[output[0]];
-                target[datalength++] = Base64[output[1]];
-                if (srclength == 1)
-                        target[datalength++] = Pad64;
-                else
-                        target[datalength++] = Base64[output[2]];
-                target[datalength++] = Pad64;
-        }
-        if (datalength >= targsize)
-                return (-1);
-        target[datalength] = '\0';      /* Returned value doesn't count \0. */
-        return (datalength);
-}
-
-/* skips all whitespace anywhere.
-   converts characters, four at a time, starting at (or after)
-   src from base - 64 numbers into three 8 bit bytes in the target area.
-   it returns the number of data bytes stored at the target, or -1 on error.
- */
-
-int
-b64_pton(src, target, targsize)
-        char const *src;
-        u_char *target;
-        size_t targsize;
-{
-        int tarindex, state, ch;
-        u_char nextbyte;
-        char *pos;
-
-        state = 0;
-        tarindex = 0;
-
-        while ((ch = (unsigned char)*src++) != '\0') {
-                if (isspace(ch))        /* Skip whitespace anywhere. */
-                        continue;
-
-                if (ch == Pad64)
-                        break;
-
-                pos = strchr(Base64, ch);
-                if (pos == 0)           /* A non-base64 character. */
-                        return (-1);
-
-                switch (state) {
-                case 0:
-                        if (target) {
-                                if (tarindex >= targsize)
-                                        return (-1);
-                                target[tarindex] = (pos - Base64) << 2;
-                        }
-                        state = 1;
-                        break;
-                case 1:
-                        if (target) {
-                                if (tarindex >= targsize)
-                                        return (-1);
-                                target[tarindex]   |=  (pos - Base64) >> 4;
-                                nextbyte = ((pos - Base64) & 0x0f) << 4;
-                                if (tarindex + 1 < targsize)
-                                        target[tarindex+1] = nextbyte;
-                                else if (nextbyte)
-                                        return (-1);
-                        }
-                        tarindex++;
-                        state = 2;
-                        break;
-                case 2:
-                        if (target) {
-                                if (tarindex >= targsize)
-                                        return (-1);
-                                target[tarindex]   |=  (pos - Base64) >> 2;
-                                nextbyte = ((pos - Base64) & 0x03) << 6;
-                                if (tarindex + 1 < targsize)
-                                        target[tarindex+1] = nextbyte;
-                                else if (nextbyte)
-                                        return (-1);
-                        }
-                        tarindex++;
-                        state = 3;
-                        break;
-                case 3:
-                        if (target) {
-                                if (tarindex >= targsize)
-                                        return (-1);
-                                target[tarindex] |= (pos - Base64);
-                        }
-                        tarindex++;
-                        state = 0;
-                        break;
-                }
-        }
-
-        /*
-         * We are done decoding Base-64 chars.  Let's see if we ended
-         * on a byte boundary, and/or with erroneous trailing characters.
-         */
-
-        if (ch == Pad64) {                      /* We got a pad char. */
-                ch = (unsigned char)*src++;     /* Skip it, get next. */
-                switch (state) {
-                case 0:         /* Invalid = in first position */
-                case 1:         /* Invalid = in second position */
-                        return (-1);
-
-                case 2:         /* Valid, means one byte of info */
-                        /* Skip any number of spaces. */
-                        for (; ch != '\0'; ch = (unsigned char)*src++)
-                                if (!isspace(ch))
-                                        break;
-                        /* Make sure there is another trailing = sign. */
-                        if (ch != Pad64)
-                                return (-1);
-                        ch = (unsigned char)*src++;             /* Skip the = */
-                        /* Fall through to "single trailing =" case. */
-                        /* FALLTHROUGH */
-
-                case 3:         /* Valid, means two bytes of info */
-                        /*
-                         * We know this char is an =.  Is there anything but
-                         * whitespace after it?
-                         */
-                        for (; ch != '\0'; ch = (unsigned char)*src++)
-                                if (!isspace(ch))
-                                        return (-1);
-
-                        /*
-                         * Now make sure for cases 2 and 3 that the "extra"
-                         * bits that slopped past the last full byte were
-                         * zeros.  If we don't check them, they become a
-                         * subliminal channel.
-                         */
-                        if (target && tarindex < targsize &&
-                            target[tarindex] != 0)
-                                return (-1);
-                }
-        } else {
-                /*
-                 * We ended by seeing the end of the string.  Make sure we
-                 * have no partial bytes lying around.
-                 */
-                if (state != 0)
-                        return (-1);
-        }
-
-        return (tarindex);
-}
diff --git a/src/lib/libc/net/ether_aton.3 b/src/lib/libc/net/ether_aton.3
deleted file mode 100644
index 98beb5e492..0000000000
--- a/src/lib/libc/net/ether_aton.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"     $OpenBSD: ether_aton.3,v 1.1 2019/08/30 18:33:17 deraadt Exp $
-.\"
-.\" Written by roland@frob.com.  Public domain.
-.\"
-.Dd $Mdocdate: August 30 2019 $
-.Dt ETHER_ATON 3
-.Os
-.Sh NAME
-.Nm ether_aton ,
-.Nm ether_ntoa ,
-.Nm ether_ntohost ,
-.Nm ether_hostton ,
-.Nm ether_line
-.Nd get ethers entry
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/if.h
-.In netinet/in.h
-.In netinet/if_ether.h
-.Ft char *
-.Fn ether_ntoa "struct ether_addr *e"
-.Ft struct ether_addr *
-.Fn ether_aton "const char *s"
-.Ft int
-.Fn ether_ntohost "char *hostname" "struct ether_addr *e"
-.Ft int
-.Fn ether_hostton "const char *hostname" "struct ether_addr *e"
-.Ft int
-.Fn ether_line "const char *l" "struct ether_addr *e" "char *hostname"
-.Sh DESCRIPTION
-Ethernet addresses are represented by the
-following structure:
-.Bd -literal -offset indent
-struct ether_addr {
-        u_int8_t  ether_addr_octet[ETHER_ADDR_LEN];
-};
-.Ed
-.Pp
-The
-.Fn ether_ntoa
-function converts this structure into an
-.Tn ASCII
-string of the form
-.Dq xx:xx:xx:xx:xx:xx ,
-consisting of 6 hexadecimal numbers separated
-by colons.
-It returns a pointer to a static buffer that is reused for each call.
-The
-.Fn ether_aton
-converts an
-.Tn ASCII
-string of the same form and to a structure
-containing the 6 octets of the address.
-It returns a pointer to a static structure that is reused for each call.
-.Fn ether_aton
-will return NULL if the string does not represent a valid address.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions interrogate the database mapping host names to Ethernet
-addresses,
-.Pa /etc/ethers .
-The
-.Fn ether_ntohost
-function looks up the given Ethernet address and writes the associated
-host name into the character buffer passed.
-This buffer should be
-.Dv MAXHOSTNAMELEN
-characters in size.
-The
-.Fn ether_hostton
-function looks up the given host name and writes the associated
-Ethernet address into the structure passed.
-Both functions return
-zero if they find the requested host name or address, and \-1 if not.
-.Pp
-Each call reads
-.Pa /etc/ethers
-from the beginning.
-.Pp
-The
-.Fn ether_line
-function parses a line from the
-.Pa /etc/ethers
-file and fills in the passed
-.Li struct ether_addr
-and character buffer with the Ethernet address and host name on the line.
-It returns zero if the line was successfully parsed and \-1 if not.
-The character buffer should be
-.Dv MAXHOSTNAMELEN
-characters in size.
-.Sh FILES
-.Bl -tag -width /etc/ethers -compact
-.It Pa /etc/ethers
-.El
-.Sh SEE ALSO
-.Xr ethers 5
-.Sh HISTORY
-The
-.Fn ether_ntoa ,
-.Fn ether_aton ,
-.Fn ether_ntohost ,
-.Fn ether_hostton ,
-and
-.Fn ether_line
-functions were adopted from SunOS and appeared in
-.Nx 0.9b .
-.Sh BUGS
-The data space used by these functions is static; if future use
-requires the data, it should be copied before any subsequent calls to
-these functions overwrite it.
diff --git a/src/lib/libc/net/ethers.c b/src/lib/libc/net/ethers.c
deleted file mode 100644
index d62be1ca71..0000000000
--- a/src/lib/libc/net/ethers.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*      $OpenBSD: ethers.c,v 1.27 2019/01/25 00:19:25 millert Exp $     */
-
-/*
- * Copyright (c) 1998 Todd C. Miller <millert@openbsd.org>
- *
- * 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.
- */
-
-/* 
- * ethers(3) a la Sun.
- * Originally Written by Roland McGrath <roland@frob.com> 10/14/93.
- * Substantially modified by Todd C. Miller <millert@openbsd.org>
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <paths.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-
-#ifndef _PATH_ETHERS
-#define _PATH_ETHERS    "/etc/ethers"
-#endif
-
-static char * _ether_aton(const char *, struct ether_addr *);
-
-char *
-ether_ntoa(struct ether_addr *e)
-{
-        static char a[] = "xx:xx:xx:xx:xx:xx";
-
-        (void)snprintf(a, sizeof a, "%02x:%02x:%02x:%02x:%02x:%02x",
-            e->ether_addr_octet[0], e->ether_addr_octet[1],
-            e->ether_addr_octet[2], e->ether_addr_octet[3],
-            e->ether_addr_octet[4], e->ether_addr_octet[5]);
-
-        return (a);
-}
-
-static char *
-_ether_aton(const char *s, struct ether_addr *e)
-{
-        int i;
-        long l;
-        char *pp;
-
-        while (isspace((unsigned char)*s))
-                s++;
-
-        /* expect 6 hex octets separated by ':' or space/NUL if last octet */
-        for (i = 0; i < 6; i++) {
-                l = strtol(s, &pp, 16);
-                if (pp == s || l > 0xFF || l < 0)
-                        return (NULL);
-                if (!(*pp == ':' ||
-                    (i == 5 && (isspace((unsigned char)*pp) ||
-                    *pp == '\0'))))
-                        return (NULL);
-                e->ether_addr_octet[i] = (u_char)l;
-                s = pp + 1;
-        }
-
-        /* return character after the octets ala strtol(3) */
-        return (pp);
-}
-
-struct ether_addr *
-ether_aton(const char *s)
-{
-        static struct ether_addr n;
-
-        return (_ether_aton(s, &n) ? &n : NULL);
-}
-
-int
-ether_ntohost(char *hostname, struct ether_addr *e)
-{
-        FILE *f; 
-        char buf[BUFSIZ+1], *p;
-        size_t len;
-        struct ether_addr try;
-
-        f = fopen(_PATH_ETHERS, "re");
-        if (f == NULL)
-                return (-1);
-        while ((p = fgetln(f, &len)) != NULL) {
-                if (p[len-1] == '\n')
-                        len--;
-                if (len > sizeof(buf) - 2)
-                        continue;
-                (void)memcpy(buf, p, len);
-                buf[len] = '\n';        /* code assumes newlines later on */
-                buf[len+1] = '\0';
-                /* A + in the file meant try YP, ignore it. */
-                if (!strncmp(buf, "+\n", sizeof(buf)))
-                        continue;
-                if (ether_line(buf, &try, hostname) == 0 &&
-                    memcmp(&try, e, sizeof(try)) == 0) {
-                        (void)fclose(f);
-                        return (0);
-                }     
-        }
-        (void)fclose(f);
-        errno = ENOENT;
-        return (-1);
-}
-
-int
-ether_hostton(const char *hostname, struct ether_addr *e)
-{
-        FILE *f;
-        char buf[BUFSIZ+1], *p;
-        char try[HOST_NAME_MAX+1];
-        size_t len;
-
-        f = fopen(_PATH_ETHERS, "re");
-        if (f==NULL)
-                return (-1);
-
-        while ((p = fgetln(f, &len)) != NULL) {
-                if (p[len-1] == '\n')
-                        len--;
-                if (len > sizeof(buf) - 2)
-                        continue;
-                memcpy(buf, p, len);
-                buf[len] = '\n';        /* code assumes newlines later on */
-                buf[len+1] = '\0';
-                /* A + in the file meant try YP, ignore it. */
-                if (!strncmp(buf, "+\n", sizeof(buf)))
-                        continue;
-                if (ether_line(buf, e, try) == 0 && strcmp(hostname, try) == 0) {
-                        (void)fclose(f);
-                        return (0);
-                }
-        }
-        (void)fclose(f);
-        errno = ENOENT;
-        return (-1);
-}
-
-int
-ether_line(const char *line, struct ether_addr *e, char *hostname)
-{
-        char *p;
-        size_t n;
-
-        /* Parse "xx:xx:xx:xx:xx:xx" */
-        if ((p = _ether_aton(line, e)) == NULL || (*p != ' ' && *p != '\t'))
-                goto bad;
-
-        /* Now get the hostname */
-        while (isspace((unsigned char)*p))
-                p++;
-        if (*p == '\0')
-                goto bad;
-        n = strcspn(p, " \t\n");
-        if (n >= HOST_NAME_MAX+1)
-                goto bad;
-        strlcpy(hostname, p, n + 1);
-        return (0);
-
-bad:
-        errno = EINVAL;
-        return (-1);
-}
-DEF_WEAK(ether_line);
diff --git a/src/lib/libc/net/freeaddrinfo.c b/src/lib/libc/net/freeaddrinfo.c
deleted file mode 100644
index 154f70cd75..0000000000
--- a/src/lib/libc/net/freeaddrinfo.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*      $OpenBSD: freeaddrinfo.c,v 1.9 2016/09/21 04:38:56 guenther Exp $       */
-
-/*
- * Copyright (c) 1996, 1997, 1998, 1999, Craig Metz, 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 Craig Metz and
- *      by other contributors.
- * 4. Neither the name of the author nor the names of 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>
-#include <netdb.h>
-
-void
-freeaddrinfo(struct addrinfo *ai)
-{
-        struct addrinfo *p;
-
-        do {
-                p = ai;
-                ai = ai->ai_next;
-                free(p->ai_canonname);
-                free(p);
-        } while (ai);
-}
-DEF_WEAK(freeaddrinfo);
diff --git a/src/lib/libc/net/gai_strerror.3 b/src/lib/libc/net/gai_strerror.3
deleted file mode 100644
index d271f492c5..0000000000
--- a/src/lib/libc/net/gai_strerror.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"     $OpenBSD: gai_strerror.3,v 1.10 2017/05/03 01:58:33 deraadt Exp $
-.\"     $KAME: gai_strerror.3,v 1.1 2005/01/05 03:04:47 itojun Exp $
-.\"
-.\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001  Internet Software Consortium.
-.\"
-.\" 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 ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS.  IN NO EVENT SHALL ISC 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 $Mdocdate: May 3 2017 $
-.Dt GAI_STRERROR 3
-.Os
-.Sh NAME
-.Nm gai_strerror
-.Nd get error message string from EAI_xxx error code
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft "const char *"
-.Fn gai_strerror "int ecode"
-.Sh DESCRIPTION
-The
-.Fn gai_strerror
-function returns an error message string corresponding to the error code
-returned by
-.Xr getaddrinfo 3
-or
-.Xr getnameinfo 3 .
-.Pp
-The following error codes and their meaning are defined in
-.In netdb.h :
-.Pp
-.Bl -tag -width "EAI_ADDRFAMILYXX" -offset indent -compact
-.It Dv EAI_ADDRFAMILY
-address family for
-.Fa name
-not supported
-.It Dv EAI_AGAIN
-temporary failure in name resolution
-.It Dv EAI_BADFLAGS
-invalid value for
-.Fa ai_flags
-.It Dv EAI_BADHINTS
-invalid value for
-.Fa hints
-.It Dv EAI_FAIL
-non-recoverable failure in name resolution
-.It Dv EAI_FAMILY
-.Fa ai_family
-not supported
-.It Dv EAI_MEMORY
-memory allocation failure
-.It Dv EAI_NODATA
-no address associated with
-.Fa name
-.It Dv EAI_NONAME
-.Fa name
-or
-.Fa service
-not provided, or not known
-.It Dv EAI_OVERFLOW
-argument buffer overflow
-.It Dv EAI_PROTOCOL
-resolved protocol is unknown
-.It Dv EAI_SERVICE
-.Fa service
-not supported for
-.Fa ai_socktype
-.It Dv EAI_SOCKTYPE
-.Fa ai_socktype
-not supported
-.It Dv EAI_SYSTEM
-system error (returned in
-.Va errno )
-.El
-.Sh RETURN VALUES
-.Fn gai_strerror
-returns a pointer to the error message string corresponding to
-.Fa ecode .
-If
-.Fa ecode
-is out of range, an implementation-specific error message string is returned.
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr getnameinfo 3
diff --git a/src/lib/libc/net/gai_strerror.c b/src/lib/libc/net/gai_strerror.c
deleted file mode 100644
index 1e9b585029..0000000000
--- a/src/lib/libc/net/gai_strerror.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*      $OpenBSD: gai_strerror.c,v 1.8 2015/09/14 07:38:38 guenther Exp $       */
-
-/*
- * Copyright (c) 1997-1999, Craig Metz, 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 Craig Metz and
- *      by other contributors.
- * 4. Neither the name of the author nor the names of 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.
- */
-
-/* gai_strerror() v1.38 */
-
-#include <sys/types.h>
-#include <netdb.h>
-#include <errno.h>
-
-const char *
-gai_strerror(int errnum)
-{
-        switch (errnum) {
-        case 0:
-                return "no error";
-        case EAI_BADFLAGS:
-                return "invalid value for ai_flags";
-        case EAI_NONAME:
-                return "name or service is not known";
-        case EAI_AGAIN:
-                return "temporary failure in name resolution";
-        case EAI_FAIL:
-                return "non-recoverable failure in name resolution";
-        case EAI_NODATA:
-                return "no address associated with name";
-        case EAI_FAMILY:
-                return "ai_family not supported";
-        case EAI_SOCKTYPE:
-                return "ai_socktype not supported";
-        case EAI_SERVICE:
-                return "service not supported for ai_socktype";
-        case EAI_ADDRFAMILY:
-                return "address family for name not supported";
-        case EAI_MEMORY:
-                return "memory allocation failure";
-        case EAI_SYSTEM:
-                return "system error";
-        case EAI_BADHINTS:
-                return "invalid value for hints";
-        case EAI_PROTOCOL:
-                return "resolved protocol is unknown";
-        case EAI_OVERFLOW:
-                return "argument buffer overflow";
-        default:
-                return "unknown/invalid error";
-        }
-}
-DEF_WEAK(gai_strerror);
diff --git a/src/lib/libc/net/getaddrinfo.3 b/src/lib/libc/net/getaddrinfo.3
deleted file mode 100644
index de46e70182..0000000000
--- a/src/lib/libc/net/getaddrinfo.3
+++ /dev/null
@@ -1,477 +0,0 @@
-.\"     $OpenBSD: getaddrinfo.3,v 1.59 2019/08/30 20:20:50 jmc Exp $
-.\"     $KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
-.\"
-.\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001  Internet Software Consortium.
-.\"
-.\" 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 ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS.  IN NO EVENT SHALL ISC 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 $Mdocdate: August 30 2019 $
-.Dt GETADDRINFO 3
-.Os
-.Sh NAME
-.Nm getaddrinfo ,
-.Nm freeaddrinfo
-.Nd host and service name to socket address structure
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft int
-.Fn getaddrinfo "const char *hostname" "const char *servname" \
-    "const struct addrinfo *hints" "struct addrinfo **res"
-.Ft void
-.Fn freeaddrinfo "struct addrinfo *ai"
-.Sh DESCRIPTION
-The
-.Fn getaddrinfo
-function is used to get a list of
-.Tn IP
-addresses and port numbers for host
-.Fa hostname
-and service
-.Fa servname .
-It is a replacement for and provides more flexibility than the
-.Xr gethostbyname 3
-and
-.Xr getservbyname 3
-functions.
-.Pp
-The
-.Fa hostname
-and
-.Fa servname
-arguments are either pointers to NUL-terminated strings or the null pointer.
-An acceptable value for
-.Fa hostname
-is either a valid host name or a numeric host address string consisting
-of a dotted decimal IPv4 address or an IPv6 address.
-The
-.Fa servname
-is either a decimal port number or a service name listed in
-.Xr services 5 .
-At least one of
-.Fa hostname
-and
-.Fa servname
-must be non-null.
-.Pp
-.Fa hints
-is an optional pointer to a
-.Li struct addrinfo ,
-as defined by
-.In netdb.h :
-.Bd -literal
-struct addrinfo {
-        int ai_flags;           /* input flags */
-        int ai_family;          /* address family for socket */
-        int ai_socktype;        /* socket type */
-        int ai_protocol;        /* protocol for socket */
-        socklen_t ai_addrlen;   /* length of socket-address */
-        struct sockaddr *ai_addr; /* socket-address for socket */
-        char *ai_canonname;     /* canonical name for service location */
-        struct addrinfo *ai_next; /* pointer to next in list */
-};
-.Ed
-.Pp
-This structure can be used to provide hints concerning the type of socket
-that the caller supports or wishes to use.
-The caller can supply the following structure elements in
-.Fa hints :
-.Bl -tag -width "ai_socktypeXX"
-.It Fa ai_family
-The address family that should be used.
-When
-.Fa ai_family
-is set to
-.Dv AF_UNSPEC ,
-it means the caller will accept any address family supported by the
-operating system.
-.It Fa ai_socktype
-Denotes the type of socket that is wanted:
-.Dv SOCK_STREAM ,
-.Dv SOCK_DGRAM ,
-or
-.Dv SOCK_RAW .
-When
-.Fa ai_socktype
-is zero the caller will accept any socket type.
-.It Fa ai_protocol
-Indicates which transport protocol is desired,
-.Dv IPPROTO_UDP
-or
-.Dv IPPROTO_TCP .
-If
-.Fa ai_protocol
-is zero the caller will accept any protocol.
-.It Fa ai_flags
-.Fa ai_flags
-is formed by
-.Tn OR Ns 'ing
-the following values:
-.Bl -tag -width "AI_CANONNAMEXX"
-.It Dv AI_ADDRCONFIG
-If the
-.Dv AI_ADDRCONFIG
-bit is set, IPv4 addresses will be returned only if an IPv4 address is
-configured on an interface, and IPv6 addresses will be returned only if an IPv6
-address is configured on an interface.
-Addresses on a loopback interface and link-local IPv6 addresses are not
-considered valid as configured addresses.
-This bit is only considered when determining whether a DNS query should
-be performed or not.
-.It Dv AI_CANONNAME
-If the
-.Dv AI_CANONNAME
-bit is set, a successful call to
-.Fn getaddrinfo
-will return a NUL-terminated string containing the canonical name
-of the specified host name in the
-.Fa ai_canonname
-element of the first
-.Li addrinfo
-structure returned.
-.It Dv AI_FQDN
-If the
-.Dv AI_FQDN
-bit is set, a successful call to
-.Fn getaddrinfo
-will return a NUL-terminated string containing the fully qualified domain name
-of the specified host name in the
-.Fa ai_canonname
-element of the first
-.Li addrinfo
-structure returned.
-.Pp
-This is different from the
-.Dv AI_CANONNAME
-bit flag that returns the canonical name registered in DNS,
-which may be different from the fully qualified domain name
-that the host name resolved to.
-Only one of the
-.Dv AI_FQDN
-and
-.Dv AI_CANONNAME
-bits can be set.
-.It Dv AI_NUMERICHOST
-If the
-.Dv AI_NUMERICHOST
-bit is set, it indicates that
-.Fa hostname
-should be treated as a numeric string defining an IPv4 or IPv6 address
-and no name resolution should be attempted.
-.It Dv AI_NUMERICSERV
-If the
-.Dv AI_NUMERICSERV
-bit is set, it indicates that
-.Fa servname
-should be treated as a numeric port string
-and no service name resolution should be attempted.
-.It Dv AI_PASSIVE
-If the
-.Dv AI_PASSIVE
-bit is set it indicates that the returned socket address structure
-is intended for use in a call to
-.Xr bind 2 .
-In this case, if the
-.Fa hostname
-argument is the null pointer, then the IP address portion of the
-socket address structure will be set to
-.Dv INADDR_ANY
-for an IPv4 address or
-.Dv IN6ADDR_ANY_INIT
-for an IPv6 address.
-.Pp
-If the
-.Dv AI_PASSIVE
-bit is not set, the returned socket address structure will be ready
-for use in a call to
-.Xr connect 2
-for a connection-oriented protocol or
-.Xr connect 2 ,
-.Xr sendto 2 ,
-or
-.Xr sendmsg 2
-if a connectionless protocol was chosen.
-The
-.Tn IP
-address portion of the socket address structure will be set to the
-loopback address if
-.Fa hostname
-is the null pointer and
-.Dv AI_PASSIVE
-is not set.
-.El
-.El
-.Pp
-All other elements of the
-.Li addrinfo
-structure passed via
-.Fa hints
-must be zero or the null pointer.
-.Pp
-If
-.Fa hints
-is the null pointer,
-.Fn getaddrinfo
-behaves as if the caller provided a
-.Li struct addrinfo
-with
-.Fa ai_family
-set to
-.Dv AF_UNSPEC ,
-.Fa ai_flags
-set to
-.Dv AI_ADDRCONFIG ,
-and all other elements set to zero or
-.Dv NULL .
-.Pp
-After a successful call to
-.Fn getaddrinfo ,
-.Fa *res
-is a pointer to a linked list of one or more
-.Li addrinfo
-structures.
-The list can be traversed by following the
-.Fa ai_next
-pointer in each
-.Li addrinfo
-structure until a null pointer is encountered.
-The three members
-.Fa ai_family ,
-.Fa ai_socktype ,
-and
-.Fa ai_protocol
-in each returned
-.Li addrinfo
-structure are suitable for a call to
-.Xr socket 2 .
-For each
-.Li addrinfo
-structure in the list, the
-.Fa ai_addr
-member points to a filled-in socket address structure of length
-.Fa ai_addrlen .
-.Pp
-This implementation of
-.Fn getaddrinfo
-allows numeric IPv6 address notation with scope identifier,
-as documented in RFC 4007.
-By appending the percent character and scope identifier to addresses,
-one can fill the
-.Li sin6_scope_id
-field for addresses.
-This would make management of scoped addresses easier
-and allows cut-and-paste input of scoped addresses.
-.Pp
-At this moment the code supports only link-local addresses with the format.
-The scope identifier is hardcoded to the name of the hardware interface
-associated
-with the link
-.Po
-such as
-.Li ne0
-.Pc .
-An example is
-.Dq Li fe80::1%ne0 ,
-which means
-.Do
-.Li fe80::1
-on the link associated with the
-.Li ne0
-interface
-.Dc .
-.Pp
-The current implementation assumes a one-to-one relationship between
-the interface and link, which is not necessarily true from the specification.
-.Pp
-All of the information returned by
-.Fn getaddrinfo
-is dynamically allocated: the
-.Li addrinfo
-structures themselves as well as the socket address structures and
-the canonical host name strings included in the
-.Li addrinfo
-structures.
-.Pp
-Memory allocated for the dynamically allocated structures created by
-a successful call to
-.Fn getaddrinfo
-is released by the
-.Fn freeaddrinfo
-function.
-The
-.Fa ai
-pointer should be an
-.Li addrinfo
-structure created by a call to
-.Fn getaddrinfo .
-.Sh RETURN VALUES
-.Fn getaddrinfo
-returns zero on success or one of the error codes listed in
-.Xr gai_strerror 3
-if an error occurs.
-If an error occurs, no memory is allocated by
-.Fn getaddrinfo ,
-therefore it is not necessary to release the
-.Li addrinfo
-structure(s).
-.Sh EXAMPLES
-The following code tries to connect to
-.Dq Li www.kame.net
-service
-.Dq Li www
-via a stream socket.
-It loops through all the addresses available, regardless of address family.
-If the destination resolves to an IPv4 address, it will use an
-.Dv AF_INET
-socket.
-Similarly, if it resolves to IPv6, an
-.Dv AF_INET6
-socket is used.
-Observe that there is no hardcoded reference to a particular address family.
-The code works even if
-.Fn getaddrinfo
-returns addresses that are not IPv4/v6.
-.Bd -literal -offset indent
-struct addrinfo hints, *res, *res0;
-int error;
-int save_errno;
-int s;
-const char *cause = NULL;
-
-memset(&hints, 0, sizeof(hints));
-hints.ai_family = AF_UNSPEC;
-hints.ai_socktype = SOCK_STREAM;
-error = getaddrinfo("www.kame.net", "www", &hints, &res0);
-if (error)
-        errx(1, "%s", gai_strerror(error));
-s = -1;
-for (res = res0; res; res = res->ai_next) {
-        s = socket(res->ai_family, res->ai_socktype,
-            res->ai_protocol);
-        if (s == -1) {
-                cause = "socket";
-                continue;
-        }
-
-        if (connect(s, res->ai_addr, res->ai_addrlen) == -1) {
-                cause = "connect";
-                save_errno = errno;
-                close(s);
-                errno = save_errno;
-                s = -1;
-                continue;
-        }
-
-        break;  /* okay we got one */
-}
-if (s == -1)
-        err(1, "%s", cause);
-freeaddrinfo(res0);
-.Ed
-.Pp
-The following example tries to open a wildcard listening socket onto service
-.Dq Li www ,
-for all the address families available.
-.Bd -literal -offset indent
-struct addrinfo hints, *res, *res0;
-int error;
-int save_errno;
-int s[MAXSOCK];
-int nsock;
-const char *cause = NULL;
-
-memset(&hints, 0, sizeof(hints));
-hints.ai_family = AF_UNSPEC;
-hints.ai_socktype = SOCK_STREAM;
-hints.ai_flags = AI_PASSIVE;
-error = getaddrinfo(NULL, "www", &hints, &res0);
-if (error)
-        errx(1, "%s", gai_strerror(error));
-nsock = 0;
-for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) {
-        s[nsock] = socket(res->ai_family, res->ai_socktype,
-            res->ai_protocol);
-        if (s[nsock] == -1) {
-                cause = "socket";
-                continue;
-        }
-
-        if (bind(s[nsock], res->ai_addr, res->ai_addrlen) == -1) {
-                cause = "bind";
-                save_errno = errno;
-                close(s[nsock]);
-                errno = save_errno;
-                continue;
-        }
-        (void) listen(s[nsock], 5);
-
-        nsock++;
-}
-if (nsock == 0)
-        err(1, "%s", cause);
-freeaddrinfo(res0);
-.Ed
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr connect 2 ,
-.Xr send 2 ,
-.Xr socket 2 ,
-.Xr gai_strerror 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnameinfo 3 ,
-.Xr getservbyname 3 ,
-.Xr res_init 3 ,
-.Xr hosts 5 ,
-.Xr resolv.conf 5 ,
-.Xr services 5 ,
-.Xr hostname 7
-.Rs
-.%A Craig Metz
-.%B Proceedings of the Freenix Track: 2000 USENIX Annual Technical Conference
-.%D June 2000
-.%T Protocol Independence Using the Sockets API
-.Re
-.Sh STANDARDS
-The
-.Fn getaddrinfo
-function is defined by the
-.St -p1003.1g-2000
-draft specification and documented in RFC 3493.
-.Pp
-The
-.Dv AI_FQDN
-flag bit first appeared in Windows 7.
-.Pp
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A J. McCann
-.%A W. Stevens
-.%D February 2003
-.%R RFC 3493
-.%T Basic Socket Interface Extensions for IPv6
-.Re
-.Pp
-.Rs
-.%A S. Deering
-.%A B. Haberman
-.%A T. Jinmei
-.%A E. Nordmark
-.%A B. Zill
-.%D March 2005
-.%R RFC 4007
-.%T IPv6 Scoped Address Architecture
-.Re
diff --git a/src/lib/libc/net/gethostbyname.3 b/src/lib/libc/net/gethostbyname.3
deleted file mode 100644
index 06170c3c1a..0000000000
--- a/src/lib/libc/net/gethostbyname.3
+++ /dev/null
@@ -1,271 +0,0 @@
-.\"     $OpenBSD: gethostbyname.3,v 1.34 2019/08/30 20:20:50 jmc Exp $
-.\"
-.\" Copyright (c) 1983, 1987, 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.
-.\"
-.Dd $Mdocdate: August 30 2019 $
-.Dt GETHOSTBYNAME 3
-.Os
-.Sh NAME
-.Nm gethostbyname ,
-.Nm gethostbyname2 ,
-.Nm gethostbyaddr ,
-.Nm gethostent ,
-.Nm sethostent ,
-.Nm endhostent ,
-.Nm hstrerror ,
-.Nm herror
-.Nd get network host entry
-.Sh SYNOPSIS
-.In netdb.h
-.Vt extern int h_errno ;
-.Ft struct hostent *
-.Fn gethostbyname "const char *name"
-.Ft struct hostent *
-.Fn gethostent void
-.Ft void
-.Fn sethostent "int stayopen"
-.Ft void
-.Fn endhostent void
-.Ft void
-.Fn herror "const char *string"
-.Ft const char *
-.Fn hstrerror "int err"
-.In sys/socket.h
-.In netdb.h
-.Ft struct hostent *
-.Fn gethostbyname2 "const char *name" "int af"
-.Ft struct hostent *
-.Fn gethostbyaddr "const void *addr" "socklen_t len" "int af"
-.Sh DESCRIPTION
-The
-.Fn gethostbyname ,
-.Fn gethostbyname2 ,
-and
-.Fn gethostbyaddr
-functions each return a pointer to an object with the following structure
-describing an Internet host referenced by
-.Fa name
-or
-.Fa addr ,
-respectively.
-This structure contains either information obtained from a name server,
-broken-out fields from a line in
-.Pa /etc/hosts ,
-or database entries supplied by the
-.Xr yp 8
-system.
-.Xr resolv.conf 5
-describes how the particular database is chosen.
-.Bd -literal -offset indent
-struct  hostent {
-        char    *h_name;        /* official name of host */
-        char    **h_aliases;    /* alias list */
-        int     h_addrtype;     /* host address type */
-        int     h_length;       /* length of address */
-        char    **h_addr_list;  /* list of returned addresses */
-};
-#define h_addr  h_addr_list[0]  /* address, for backward compat */
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width h_addr_list
-.It Fa h_name
-Official name of the host.
-.It Fa h_aliases
-A
-.Dv NULL Ns -terminated
-array of alternate names for the host.
-.It Fa h_addrtype
-The type of address being returned.
-.It Fa h_length
-The length, in bytes, of the address.
-.It Fa h_addr_list
-A
-.Dv NULL Ns -terminated
-array of network addresses for the host.
-Host addresses are returned in network byte order.
-.It Fa h_addr
-The first address in
-.Fa h_addr_list ;
-this is for backward compatibility.
-.El
-.Pp
-The function
-.Fn gethostbyname
-will search for the named host in the current domain and its parents
-using the search lookup semantics detailed in
-.Xr resolv.conf 5
-and
-.Xr hostname 7 .
-.Pp
-.Fn gethostbyname2
-is similar to
-.Fn gethostbyname
-except that it supports an
-.Fa af
-of
-.Dv AF_INET6
-in addition to
-.Dv AF_INET .
-.Pp
-The
-.Fn gethostbyaddr
-function will search for the specified address of length
-.Fa len
-in the address family
-.Fa af .
-The only address family supported is
-.Dv AF_INET .
-.Pp
-The
-.Fn sethostent ,
-.Fn gethostent ,
-and
-.Fn endhostent
-functions are deprecated and no longer have any effect.
-They could be used in the past for queries over a persistent TCP
-connection or to iterate entries in the
-.Xr hosts 5
-file.
-.Pp
-The
-.Fn herror
-function prints an error message describing the failure.
-If its argument
-.Fa string
-is not
-.Dv NULL ,
-it is prepended to the message string and separated from it by a colon
-.Pq Ql \&:
-and a space.
-The error message is printed with a trailing newline.
-The contents of the error message is the same as that returned by
-.Fn hstrerror
-with argument
-.Va h_errno .
-.Sh ENVIRONMENT
-.Bl -tag -width RES_OPTIONS
-.It Ev RES_OPTIONS
-A list of options to override the resolver's internal defaults.
-See
-.Xr resolv.conf 5
-for more information.
-.El
-.Sh FILES
-.Bl -tag -width /etc/resolv.conf -compact
-.It Pa /etc/hosts
-.It Pa /etc/resolv.conf
-.El
-.Sh DIAGNOSTICS
-Error return status from
-.Fn gethostbyname ,
-.Fn gethostbyname2 ,
-and
-.Fn gethostbyaddr
-is indicated by return of a
-.Dv NULL
-pointer.
-The external integer
-.Va h_errno
-may then be checked to see whether this is a temporary failure
-or an invalid or unknown host.
-.Pp
-The variable
-.Va h_errno
-can have the following values:
-.Bl -tag -width HOST_NOT_FOUND
-.It Dv HOST_NOT_FOUND
-No such host is known.
-.It Dv TRY_AGAIN
-This is usually a temporary error
-and means that the local server did not receive
-a response from an authoritative server.
-A retry at some later time may succeed.
-.It Dv NO_RECOVERY
-Some unexpected server failure was encountered.
-This is a non-recoverable error.
-.It Dv NO_DATA
-The requested name is valid but does not have an IP address;
-this is not a temporary error.
-This means that the name is known to the name server but there is no address
-associated with this name.
-Another type of request to the name server using this domain name
-will result in an answer;
-for example, a mail-forwarder may be registered for this domain.
-.It Dv NETDB_INTERNAL
-An internal error occurred.
-This may occur when an address family other than
-.Dv AF_INET
-or
-.Dv AF_INET6
-is specified or when a resource is unable to be allocated.
-It is always set by
-.Fn gethostent .
-.It Dv NETDB_SUCCESS
-The function completed successfully.
-.El
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr getnameinfo 3 ,
-.Xr res_init 3 ,
-.Xr hosts 5 ,
-.Xr resolv.conf 5 ,
-.Xr hostname 7
-.Sh HISTORY
-The
-.Fn endhostent ,
-.Fn gethostbyaddr ,
-.Fn gethostbyname ,
-.Fn gethostent ,
-and
-.Fn sethostent
-functions appeared in
-.Bx 4.1c .
-The function
-.Fn herror
-was added in
-.Bx 4.3 Tahoe ,
-.Fn hstrerror
-in
-.Bx 4.4 ,
-and
-.Fn gethostbyname2
-in
-.Ox 2.1 .
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-.Pp
-Only the Internet
-address formats are currently understood.
-.Pp
-YP does not support any address families other than
-.Dv AF_INET
-and uses
-the traditional database format.
diff --git a/src/lib/libc/net/getifaddrs.3 b/src/lib/libc/net/getifaddrs.3
deleted file mode 100644
index 26eac49320..0000000000
--- a/src/lib/libc/net/getifaddrs.3
+++ /dev/null
@@ -1,157 +0,0 @@
-.\"     $OpenBSD: getifaddrs.3,v 1.22 2018/01/12 04:36:44 deraadt Exp $
-.\"     BSDI    getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
-.\"
-.\" Copyright (c) 1995, 1999
-.\"     Berkeley Software Design, Inc.  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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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 $Mdocdate: January 12 2018 $
-.Dt GETIFADDRS 3
-.Os
-.Sh NAME
-.Nm getifaddrs ,
-.Nm freeifaddrs
-.Nd get interface addresses
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In ifaddrs.h
-.Ft int
-.Fn getifaddrs "struct ifaddrs **ifap"
-.Ft void
-.Fn freeifaddrs "struct ifaddrs *ifap"
-.Sh DESCRIPTION
-The
-.Fn getifaddrs
-function stores a reference to a linked list of the network interfaces
-on the local machine in the memory referenced by
-.Fa ifap .
-The list consists of
-.Vt ifaddrs
-structures, as defined in the include file
-.In ifaddrs.h .
-The
-.Vt ifaddrs
-structure contains at least the following entries:
-.Bd -literal
-    struct ifaddrs   *ifa_next;         /* Pointer to next struct */
-    char             *ifa_name;         /* Interface name */
-    u_int             ifa_flags;        /* Interface flags */
-    struct sockaddr  *ifa_addr;         /* Interface address */
-    struct sockaddr  *ifa_netmask;      /* Interface netmask */
-    struct sockaddr  *ifa_broadaddr;    /* Interface broadcast address */
-    struct sockaddr  *ifa_dstaddr;      /* P2P interface destination */
-    void             *ifa_data;         /* Address specific data */
-.Ed
-.Bl -tag -width ifa_broadaddr
-.It Fa ifa_next
-Contains a pointer to the next structure on the list.
-This field is set to
-.Dv NULL
-in the last structure on the list.
-.It Fa ifa_name
-Contains the interface name.
-.It Fa ifa_flags
-Contains the interface flags, as set by
-.Xr ifconfig 8 .
-.It Fa ifa_addr
-References either the address of the interface or the link level
-address of the interface, if one exists, otherwise it is
-.Dv NULL .
-(The
-.Fa sa_family
-field of the
-.Fa ifa_addr
-field should be consulted to determine the format of the
-.Fa ifa_addr
-address.)
-.It Fa ifa_netmask
-References the netmask associated with
-.Fa ifa_addr ,
-if one is set, otherwise it is
-.Dv NULL .
-.It Fa ifa_broadaddr
-This field, which should only be referenced for non-P2P interfaces,
-references the broadcast address associated with
-.Fa ifa_addr ,
-if one exists, otherwise it is
-.Dv NULL .
-.It Fa ifa_dstaddr
-This field, which should only be referenced for P2P interfaces,
-references the destination address on a P2P interface,
-if one exists, otherwise it is
-.Dv NULL .
-.It Fa ifa_data
-References address family specific data.
-For
-.Dv AF_LINK
-addresses it contains a pointer to the
-.Vt struct if_data
-(as defined in include file
-.In net/if.h )
-which contains various interface attributes and statistics.
-For all other address families,
-.Fa ifa_data
-is
-.Dv NULL .
-.El
-.Pp
-The data returned by
-.Fn getifaddrs
-is dynamically allocated and should be freed using
-.Fn freeifaddrs
-when no longer needed.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn getifaddrs
-may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr ioctl 2 ,
-.Xr socket 2 ,
-.Xr malloc 3 ,
-or
-.Xr sysctl 2 .
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr socket 2 ,
-.Xr sysctl 2 ,
-.Xr netintro 4 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Fn getifaddrs
-function first appeared in BSDI
-.Bsx .
-The function has been available on
-.Ox
-since
-.Ox 2.7 .
-.Sh BUGS
-If both
-.In net/if.h
-and
-.In ifaddrs.h
-are being included,
-.In net/if.h
-.Em must
-be included before
-.In ifaddrs.h .
diff --git a/src/lib/libc/net/getifaddrs.c b/src/lib/libc/net/getifaddrs.c
deleted file mode 100644
index 182829c9d5..0000000000
--- a/src/lib/libc/net/getifaddrs.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*      $OpenBSD: getifaddrs.c,v 1.13 2015/09/14 11:01:47 guenther Exp $        */
-
-/*
- * Copyright (c) 1995, 1999
- *      Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *      BSDI getifaddrs.c,v 2.12 2000/02/23 14:51:59 dab Exp
- */
-
-#include <sys/param.h>  /* ALIGN */
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <sys/sysctl.h>
-#include <net/if_dl.h>
-
-#include <errno.h>
-#include <ifaddrs.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define SALIGN  (sizeof(long) - 1)
-#define SA_RLEN(sa)     ((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : (SALIGN + 1))
-
-int
-getifaddrs(struct ifaddrs **pif)
-{
-        int icnt = 1;
-        int dcnt = 0;
-        int ncnt = 0;
-        int mib[6];
-        size_t needed;
-        char *buf = NULL, *bufp;
-        char *next;
-        struct ifaddrs *cif = 0;
-        char *p, *p0;
-        struct rt_msghdr *rtm;
-        struct if_msghdr *ifm;
-        struct ifa_msghdr *ifam;
-        struct sockaddr_dl *dl;
-        struct sockaddr *sa;
-        u_short index = 0;
-        size_t len, alen, dlen;
-        struct ifaddrs *ifa, *ift;
-        int i;
-        char *data;
-        char *names;
-
-        mib[0] = CTL_NET;
-        mib[1] = PF_ROUTE;
-        mib[2] = 0;             /* protocol */
-        mib[3] = 0;             /* wildcard address family */
-        mib[4] = NET_RT_IFLIST;
-        mib[5] = 0;             /* no flags */
-        while (1) {
-                if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1) {
-                        free(buf);
-                        return (-1);
-                }
-                if (needed == 0)
-                        break;
-                if ((bufp = realloc(buf, needed)) == NULL) {
-                        free(buf);
-                        return (-1);
-                }
-                buf = bufp;
-                if (sysctl(mib, 6, buf, &needed, NULL, 0) == -1) {
-                        if (errno == ENOMEM)
-                                continue;
-                        free(buf);
-                        return (-1);
-                }
-                break;
-        }
-
-        for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-                rtm = (struct rt_msghdr *)next;
-                if (rtm->rtm_version != RTM_VERSION)
-                        continue;
-                switch (rtm->rtm_type) {
-                case RTM_IFINFO:
-                        ifm = (struct if_msghdr *)rtm;
-                        if (ifm->ifm_addrs & RTA_IFP) {
-                                index = ifm->ifm_index;
-                                ++icnt;
-                                dl = (struct sockaddr_dl *)(next +
-                                    rtm->rtm_hdrlen);
-                                dcnt += SA_RLEN((struct sockaddr *)dl) +
-                                        ALIGNBYTES;
-                                dcnt += sizeof(ifm->ifm_data);
-                                ncnt += dl->sdl_nlen + 1;
-                        } else
-                                index = 0;
-                        break;
-
-                case RTM_NEWADDR:
-                        ifam = (struct ifa_msghdr *)rtm;
-                        if (index && ifam->ifam_index != index)
-                                abort();        /* XXX abort illegal in library */
-
-#define RTA_MASKS       (RTA_NETMASK | RTA_IFA | RTA_BRD)
-                        if (index == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
-                                break;
-                        p = next + rtm->rtm_hdrlen;
-                        ++icnt;
-                        /* Scan to look for length of address */
-                        alen = 0;
-                        for (p0 = p, i = 0; i < RTAX_MAX; i++) {
-                                if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-                                    == 0)
-                                        continue;
-                                sa = (struct sockaddr *)p;
-                                len = SA_RLEN(sa);
-                                if (i == RTAX_IFA) {
-                                        alen = len;
-                                        break;
-                                }
-                                p += len;
-                        }
-                        for (p = p0, i = 0; i < RTAX_MAX; i++) {
-                                if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-                                    == 0)
-                                        continue;
-                                sa = (struct sockaddr *)p;
-                                len = SA_RLEN(sa);
-                                if (i == RTAX_NETMASK && sa->sa_len == 0)
-                                        dcnt += alen;
-                                else
-                                        dcnt += len;
-                                p += len;
-                        }
-                        break;
-                }
-        }
-
-        if (icnt + dcnt + ncnt == 1) {
-                *pif = NULL;
-                free(buf);
-                return (0);
-        }
-        data = malloc(sizeof(struct ifaddrs) * icnt + dcnt + ncnt);
-        if (data == NULL) {
-                free(buf);
-                return(-1);
-        }
-
-        ifa = (struct ifaddrs *)data;
-        data += sizeof(struct ifaddrs) * icnt;
-        names = data + dcnt;
-
-        memset(ifa, 0, sizeof(struct ifaddrs) * icnt);
-        ift = ifa;
-
-        index = 0;
-        for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-                rtm = (struct rt_msghdr *)next;
-                if (rtm->rtm_version != RTM_VERSION)
-                        continue;
-                switch (rtm->rtm_type) {
-                case RTM_IFINFO:
-                        ifm = (struct if_msghdr *)rtm;
-                        if (ifm->ifm_addrs & RTA_IFP) {
-                                index = ifm->ifm_index;
-                                dl = (struct sockaddr_dl *)(next +
-                                    rtm->rtm_hdrlen);
-
-                                cif = ift;
-                                ift->ifa_name = names;
-                                ift->ifa_flags = (int)ifm->ifm_flags;
-                                memcpy(names, dl->sdl_data, dl->sdl_nlen);
-                                names[dl->sdl_nlen] = 0;
-                                names += dl->sdl_nlen + 1;
-
-                                ift->ifa_addr = (struct sockaddr *)data;
-                                memcpy(data, dl,
-                                    ((struct sockaddr *)dl)->sa_len);
-                                data += SA_RLEN((struct sockaddr *)dl);
-
-                                /* ifm_data needs to be aligned */
-                                ift->ifa_data = data = (void *)ALIGN(data);
-                                dlen = rtm->rtm_hdrlen -
-                                    offsetof(struct if_msghdr, ifm_data);
-                                if (dlen > sizeof(ifm->ifm_data))
-                                        dlen = sizeof(ifm->ifm_data);
-                                memcpy(data, &ifm->ifm_data, dlen);
-                                data += sizeof(ifm->ifm_data);
-
-                                ift = (ift->ifa_next = ift + 1);
-                        } else
-                                index = 0;
-                        break;
-
-                case RTM_NEWADDR:
-                        ifam = (struct ifa_msghdr *)rtm;
-                        if (index && ifam->ifam_index != index)
-                                abort();        /* XXX abort illegal in library */
-
-                        if (index == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
-                                break;
-                        ift->ifa_name = cif->ifa_name;
-                        ift->ifa_flags = cif->ifa_flags;
-                        ift->ifa_data = NULL;
-                        p = next + rtm->rtm_hdrlen;
-                        /* Scan to look for length of address */
-                        alen = 0;
-                        for (p0 = p, i = 0; i < RTAX_MAX; i++) {
-                                if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-                                    == 0)
-                                        continue;
-                                sa = (struct sockaddr *)p;
-                                len = SA_RLEN(sa);
-                                if (i == RTAX_IFA) {
-                                        alen = len;
-                                        break;
-                                }
-                                p += len;
-                        }
-                        for (p = p0, i = 0; i < RTAX_MAX; i++) {
-                                if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-                                    == 0)
-                                        continue;
-                                sa = (struct sockaddr *)p;
-                                len = SA_RLEN(sa);
-                                switch (i) {
-                                case RTAX_IFA:
-                                        ift->ifa_addr = (struct sockaddr *)data;
-                                        memcpy(data, p, len);
-                                        data += len;
-                                        break;
-
-                                case RTAX_NETMASK:
-                                        ift->ifa_netmask =
-                                            (struct sockaddr *)data;
-                                        if (sa->sa_len == 0) {
-                                                memset(data, 0, alen);
-                                                data += alen;
-                                                break;
-                                        }
-                                        memcpy(data, p, len);
-                                        data += len;
-                                        break;
-
-                                case RTAX_BRD:
-                                        ift->ifa_broadaddr =
-                                            (struct sockaddr *)data;
-                                        memcpy(data, p, len);
-                                        data += len;
-                                        break;
-                                }
-                                p += len;
-                        }
-
-
-                        ift = (ift->ifa_next = ift + 1);
-                        break;
-                }
-        }
-
-        free(buf);
-        if (--ift >= ifa) {
-                ift->ifa_next = NULL;
-                *pif = ifa;
-        } else {
-                *pif = NULL;
-                free(ifa);
-        }
-        return (0);
-}
-DEF_WEAK(getifaddrs);
-
-void
-freeifaddrs(struct ifaddrs *ifp)
-{
-        free(ifp);
-}
-DEF_WEAK(freeifaddrs);
diff --git a/src/lib/libc/net/getnameinfo.3 b/src/lib/libc/net/getnameinfo.3
deleted file mode 100644
index 18c2cdc075..0000000000
--- a/src/lib/libc/net/getnameinfo.3
+++ /dev/null
@@ -1,264 +0,0 @@
-.\"     $OpenBSD: getnameinfo.3,v 1.48 2019/08/30 20:20:51 jmc Exp $
-.\"     $KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $
-.\"
-.\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001  Internet Software Consortium.
-.\"
-.\" 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 ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS.  IN NO EVENT SHALL ISC 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 $Mdocdate: August 30 2019 $
-.Dt GETNAMEINFO 3
-.Os
-.Sh NAME
-.Nm getnameinfo
-.Nd socket address structure to hostname and service name
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft int
-.Fn getnameinfo "const struct sockaddr *sa" "socklen_t salen" "char *host" \
-    "size_t hostlen" "char *serv" "size_t servlen" "int flags"
-.Sh DESCRIPTION
-The
-.Fn getnameinfo
-function is used to convert a
-.Li sockaddr
-structure to a pair of host name and service strings.
-It is a replacement for and provides more flexibility than the
-.Xr gethostbyaddr 3
-and
-.Xr getservbyport 3
-functions and is the converse of the
-.Xr getaddrinfo 3
-function.
-.Pp
-The
-.Li sockaddr
-structure
-.Fa sa
-should point to either a
-.Li sockaddr_in
-or
-.Li sockaddr_in6
-structure (for IPv4 or IPv6 respectively) that is
-.Fa salen
-bytes long.
-.Pp
-The host and service names associated with
-.Fa sa
-are stored in
-.Fa host
-and
-.Fa serv
-which have length parameters
-.Fa hostlen
-and
-.Fa servlen .
-The maximum value for
-.Fa hostlen
-is
-.Dv NI_MAXHOST
-and
-the maximum value for
-.Fa servlen
-is
-.Dv NI_MAXSERV ,
-as defined by
-.In netdb.h .
-If a length parameter is zero, no string will be stored.
-Otherwise, enough space must be provided to store the
-host name or service string plus a byte for the NUL terminator.
-.Pp
-The
-.Fa flags
-argument is formed by
-.Tn OR Ns 'ing
-the following values:
-.Bl -tag -width "NI_NUMERICHOSTXX"
-.It Dv NI_NOFQDN
-A fully qualified domain name is not required for local hosts.
-The local part of the fully qualified domain name is returned instead.
-.It Dv NI_NUMERICHOST
-Return the address in numeric form, as if calling
-.Xr inet_ntop 3 ,
-instead of a host name.
-.It Dv NI_NAMEREQD
-A name is required.
-If the host name cannot be found in DNS and this flag is set,
-a non-zero error code is returned.
-If the host name is not found and the flag is not set, the
-address is returned in numeric form.
-.It NI_NUMERICSERV
-The service name is returned as a digit string representing the port number.
-.It NI_DGRAM
-Specifies that the service being looked up is a datagram
-service, and causes
-.Xr getservbyport 3
-to be called with a second argument of
-.Dq udp
-instead of its default of
-.Dq tcp .
-This is required for the few ports (512\-514) that have different services
-for
-.Tn UDP
-and
-.Tn TCP .
-.El
-.Pp
-This implementation allows numeric IPv6 address notation with scope identifier,
-as documented in RFC 4007.
-IPv6 link-local address will appear as a string like
-.Dq Li fe80::1%ne0 .
-Refer to
-.Xr getaddrinfo 3
-for more information.
-.Sh RETURN VALUES
-.Fn getnameinfo
-returns zero on success or one of the error codes listed in
-.Xr gai_strerror 3
-if an error occurs.
-.Sh EXAMPLES
-The following code tries to get a numeric host name, and service name,
-for a given socket address.
-Observe that there is no hardcoded reference to a particular address family.
-.Bd -literal -offset indent
-struct sockaddr *sa;    /* input */
-char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
-
-if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), sbuf,
-    sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV))
-        errx(1, "could not get numeric hostname");
-printf("host=%s, serv=%s\en", hbuf, sbuf);
-.Ed
-.Pp
-The following version checks if the socket address has a reverse address mapping:
-.Bd -literal -offset indent
-struct sockaddr *sa;    /* input */
-char hbuf[NI_MAXHOST];
-
-if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), NULL, 0,
-    NI_NAMEREQD))
-        errx(1, "could not resolve hostname");
-printf("host=%s\en", hbuf);
-.Ed
-.Sh SEE ALSO
-.Xr gai_strerror 3 ,
-.Xr getaddrinfo 3 ,
-.Xr gethostbyaddr 3 ,
-.Xr getservbyport 3 ,
-.Xr inet_ntop 3 ,
-.Xr res_init 3 ,
-.Xr hosts 5 ,
-.Xr resolv.conf 5 ,
-.Xr services 5 ,
-.Xr hostname 7
-.Rs
-.%A Craig Metz
-.%T Protocol Independence Using the Sockets API
-.%B Proceedings of the Freenix Track: 2000 USENIX Annual Technical Conference
-.%D June 2000
-.Re
-.Sh STANDARDS
-The
-.Fn getnameinfo
-function is defined by the
-.St -p1003.1g-2000
-draft specification and documented in RFC 3493.
-.Pp
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A J. McCann
-.%A W. Stevens
-.%D February 2003
-.%R RFC 3493
-.%T Basic Socket Interface Extensions for IPv6
-.Re
-.Pp
-.Rs
-.%A S. Deering
-.%A B. Haberman
-.%A T. Jinmei
-.%A E. Nordmark
-.%A B. Zill
-.%D March 2005
-.%R RFC 4007
-.%T IPv6 Scoped Address Architecture
-.Re
-.Sh CAVEATS
-.Fn getnameinfo
-can return both numeric and FQDN forms of the address specified in
-.Fa sa .
-There is no return value that indicates whether the string returned in
-.Fa host
-is a result of binary to numeric-text translation (like
-.Xr inet_ntop 3 ) ,
-or is the result of a DNS reverse lookup.
-Because of this, malicious parties could set up a PTR record as follows:
-.Bd -literal -offset indent
-1.0.0.127.in-addr.arpa. IN PTR  10.1.1.1
-.Ed
-.Pp
-and trick the caller of
-.Fn getnameinfo
-into believing that
-.Fa sa
-is
-.Li 10.1.1.1
-when it is actually
-.Li 127.0.0.1 .
-.Pp
-To prevent such attacks, the use of
-.Dv NI_NAMEREQD
-is recommended when the result of
-.Fn getnameinfo
-is used
-for access control purposes:
-.Bd -literal -offset indent
-struct sockaddr *sa;
-char addr[NI_MAXHOST];
-struct addrinfo hints, *res;
-int error;
-
-error = getnameinfo(sa, sa->sa_len, addr, sizeof(addr),
-    NULL, 0, NI_NAMEREQD);
-if (error == 0) {
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_socktype = SOCK_DGRAM; /*dummy*/
-        hints.ai_flags = AI_NUMERICHOST;
-        if (getaddrinfo(addr, "0", &hints, &res) == 0) {
-                /* malicious PTR record */
-                freeaddrinfo(res);
-                printf("bogus PTR record\en");
-                return -1;
-        }
-        /* addr is FQDN as a result of PTR lookup */
-} else {
-        /* addr is numeric string */
-        error = getnameinfo(sa, sa->sa_len, addr, sizeof(addr),
-            NULL, 0, NI_NUMERICHOST);
-}
-.Ed
-.Sh BUGS
-The implementation of
-.Fn getnameinfo
-is not thread-safe.
-.Pp
-.Ox
-intentionally uses a different
-.Dv NI_MAXHOST
-value from what
-.Tn "RFC 2553"
-suggests, to avoid buffer length handling mistakes.
diff --git a/src/lib/libc/net/getnetent.3 b/src/lib/libc/net/getnetent.3
deleted file mode 100644
index da2c4ef4a3..0000000000
--- a/src/lib/libc/net/getnetent.3
+++ /dev/null
@@ -1,147 +0,0 @@
-.\"     $OpenBSD: getnetent.3,v 1.19 2019/08/30 20:20:51 jmc Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.Dd $Mdocdate: August 30 2019 $
-.Dt GETNETENT 3
-.Os
-.Sh NAME
-.Nm getnetent ,
-.Nm getnetbyaddr ,
-.Nm getnetbyname ,
-.Nm setnetent ,
-.Nm endnetent
-.Nd get network entry
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct netent *
-.Fn getnetent "void"
-.Ft struct netent *
-.Fn getnetbyname "const char *name"
-.Ft struct netent *
-.Fn getnetbyaddr "in_addr_t net" "int type"
-.Ft void
-.Fn setnetent "int stayopen"
-.Ft void
-.Fn endnetent "void"
-.Sh DESCRIPTION
-The
-.Fn getnetbyname
-and
-.Fn getnetbyaddr
-functions return a pointer to an object with the following structure:
-.Bd -literal -offset indent
-struct  netent {
-        char            *n_name;        /* official name of net */
-        char            **n_aliases;    /* alias list */
-        int             n_addrtype;     /* net number type */
-        in_addr_t       n_net;          /* net number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width n_addrtype
-.It Fa n_name
-The official name of the network.
-.It Fa n_aliases
-A null-terminated list of alternate names for the network.
-.It Fa n_addrtype
-The type of the network number returned; it is always
-.Dv AF_INET .
-.It Fa n_net
-The network number.
-Network numbers are returned in machine byte order.
-.El
-.Pp
-On
-.Ox ,
-these legacy functions perform a lookup in a similar fashion as
-.Xr gethostbyname 3
-and
-.Xr gethostbyaddr 3 ,
-respectively.
-On other systems, they may use a separate network database file,
-.Pa /etc/networks .
-.Pp
-In contrast to
-.Xr gethostbyaddr 3 ,
-the
-.Fa net
-argument is expected in machine byte order.
-.Pp
-The
-.Fn setnetent ,
-.Fn getnetent ,
-and
-.Fn endnetent
-functions are deprecated and no longer have any effect.
-They could be used in the past to iterate over entries in the former file
-.Pa /etc/networks .
-.Sh RETURN VALUES
-The
-.Fn getnetbyaddr
-and
-.Fn getnetbyname
-functions return
-.Dv NULL
-if the requested entry is not found.
-.Pp
-The
-.Fn getnetent
-function always returns
-.Dv NULL .
-.Sh FILES
-.Bl -tag -width /etc/hosts -compact
-.It Pa /etc/hosts
-The local host and network name database.
-.El
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnameinfo 3 ,
-.Xr res_init 3 ,
-.Xr hosts 5
-.Sh STANDARDS
-These functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn getnetent ,
-.Fn getnetbyaddr ,
-.Fn getnetbyname ,
-.Fn setnetent ,
-and
-.Fn endnetent
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-The data space used by these functions is static; if future use
-requires the data, it should be copied before any subsequent calls
-to these functions overwrite it.
-Only Internet network numbers are currently understood.
-Expecting network numbers to fit in no more than 32 bits is naive.
diff --git a/src/lib/libc/net/getnetent.c b/src/lib/libc/net/getnetent.c
deleted file mode 100644
index b93e442fa9..0000000000
--- a/src/lib/libc/net/getnetent.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*      $OpenBSD: getnetent.c,v 1.18 2018/04/28 15:05:40 schwarze Exp $ */
-/*
- * Copyright (c) 1983, 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 <netdb.h>
-#include <stddef.h>
-
-void
-setnetent(int f)
-{
-}
-
-void
-endnetent(void)
-{
-}
-
-struct netent *
-getnetent(void)
-{
-        h_errno = NETDB_INTERNAL;
-        return NULL;
-}
diff --git a/src/lib/libc/net/getpeereid.3 b/src/lib/libc/net/getpeereid.3
deleted file mode 100644
index 9c5742a245..0000000000
--- a/src/lib/libc/net/getpeereid.3
+++ /dev/null
@@ -1,121 +0,0 @@
-.\"     $OpenBSD: getpeereid.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.Dd $Mdocdate: June 5 2013 $
-.Dt GETPEEREID 3
-.Os
-.Sh NAME
-.Nm getpeereid
-.Nd get effective user and group identification of locally-connected peer
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn getpeereid "int s" "uid_t *euid" "gid_t *egid"
-.Sh DESCRIPTION
-.Fn getpeereid
-returns the effective user ID and group ID of the peer connected to
-a
-.Ux Ns -domain
-socket (see
-.Xr unix 4 ) .
-The argument
-.Fa s
-must be of type
-.Dv SOCK_STREAM
-or
-.Dv SOCK_SEQPACKET .
-.Pp
-One common use is for
-.Ux Ns -domain
-servers to determine the credentials of clients that have connected to it.
-.Pp
-.Fn getpeereid
-takes three parameters:
-.Bl -bullet
-.It
-.Fa s
-contains the file descriptor of the socket whose peer credentials
-should be looked up.
-.It
-.Fa euid
-points to a
-.Li uid_t
-variable into which the effective user ID for the connected peer will
-be stored.
-.It
-.Fa egid
-points to a
-.Li gid_t
-variable into which the effective group ID for the connected peer will
-be stored.
-.El
-.Sh RETURN VALUES
-If the call succeeds, a 0 is returned and
-.Fa euid
-and
-.Fa egid
-are set to the effective user ID and group ID of the connected peer.
-Otherwise,
-.Va errno
-is set and a value of \-1 is returned.
-.Sh ERRORS
-On failure,
-.Va errno
-is set to one of the following:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is a file, not a socket.
-.It Bq Er EOPNOTSUPP
-The socket is not in the
-.Ux Ns -domain .
-.It Bq Er ENOTCONN
-The socket is not connected.
-.It Bq Er ENOBUFS
-Insufficient resources were available in the system
-to perform the operation.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr bind 2 ,
-.Xr getpeername 2 ,
-.Xr getsockname 2 ,
-.Xr getsockopt 2 ,
-.Xr socket 2 ,
-.Xr unix 4
-.Sh HISTORY
-The
-.Fn getpeereid
-function call appeared in
-.Ox 3.0 .
diff --git a/src/lib/libc/net/getpeereid.c b/src/lib/libc/net/getpeereid.c
deleted file mode 100644
index 208e541f17..0000000000
--- a/src/lib/libc/net/getpeereid.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*      $OpenBSD: getpeereid.c,v 1.1 2010/07/01 19:15:30 deraadt Exp $  */
-
-/*
- * Copyright (c) 2010 Theo de Raadt <deraadt@openbsd.org>
- *
- * 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 <sys/types.h>
-#include <sys/socket.h>
-
-int
-getpeereid(int s, uid_t *euid, gid_t *egid)
-{
-        struct sockpeercred creds;
-        socklen_t credslen = sizeof(creds);
-        int error;
-
-        error = getsockopt(s, SOL_SOCKET, SO_PEERCRED,
-            &creds, &credslen);
-        if (error)
-                return (error);
-        *euid = creds.uid;
-        *egid = creds.gid;
-        return (0);
-}
diff --git a/src/lib/libc/net/getproto.c b/src/lib/libc/net/getproto.c
deleted file mode 100644
index 8e080679d0..0000000000
--- a/src/lib/libc/net/getproto.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*      $OpenBSD: getproto.c,v 1.8 2015/09/14 07:38:38 guenther Exp $ */
-/*
- * Copyright (c) 1983, 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 <netdb.h>
-#include <stdio.h>
-
-int
-getprotobynumber_r(int num, struct protoent *pe, struct protoent_data *pd)
-{
-        int error;
-
-        setprotoent_r(pd->stayopen, pd);
-        while ((error = getprotoent_r(pe, pd)) == 0)
-                if (pe->p_proto == num)
-                        break;
-        if (!pd->stayopen && pd->fp != NULL) {
-                (void)fclose(pd->fp);
-                pd->fp = NULL;
-        }
-        return (error);
-}
-DEF_WEAK(getprotobynumber_r);
-
-struct protoent *
-getprotobynumber(int num)
-{
-        extern struct protoent_data _protoent_data;
-        static struct protoent proto;
-
-        if (getprotobynumber_r(num, &proto, &_protoent_data) != 0)
-                return (NULL);
-        return (&proto);
-}
diff --git a/src/lib/libc/net/getprotoent.3 b/src/lib/libc/net/getprotoent.3
deleted file mode 100644
index cc2c69836a..0000000000
--- a/src/lib/libc/net/getprotoent.3
+++ /dev/null
@@ -1,213 +0,0 @@
-.\"     $OpenBSD: getprotoent.3,v 1.18 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt GETPROTOENT 3
-.Os
-.Sh NAME
-.Nm getprotoent ,
-.Nm getprotoent_r ,
-.Nm getprotobynumber ,
-.Nm getprotobynumber_r ,
-.Nm getprotobyname ,
-.Nm getprotobyname_r ,
-.Nm setprotoent ,
-.Nm setprotoent_r ,
-.Nm endprotoent ,
-.Nm endprotoent_r
-.Nd get protocol entry
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct protoent *
-.Fn getprotoent "void"
-.Ft int
-.Fn getprotoent_r "struct protoent *protoent" "struct protoent_data *protoent_data"
-.Ft struct protoent *
-.Fn getprotobyname "const char *name"
-.Ft int
-.Fn getprotobyname_r "const char *name" "struct protoent *protoent" "struct protoent_data *protoent_data"
-.Ft struct protoent *
-.Fn getprotobynumber "int proto"
-.Ft int
-.Fn getprotobynumber_r "int proto" "struct protoent *protoent" "struct protoent_data *protoent_data"
-.Ft void
-.Fn setprotoent "int stayopen"
-.Ft void
-.Fn setprotoent_r "int stayopen" "struct protoent_data *protoent_data"
-.Ft void
-.Fn endprotoent "void"
-.Ft void
-.Fn endprotoent_r "struct protoent_data *protoent_data"
-.Sh DESCRIPTION
-The
-.Fn getprotoent ,
-.Fn getprotobyname ,
-and
-.Fn getprotobynumber
-functions each return a pointer to an object with the following structure
-containing the broken-out fields of a line in the network protocol database,
-.Pa /etc/protocols .
-.Bd -literal -offset indent
-.Pp
-struct  protoent {
-        char    *p_name;        /* official name of protocol */
-        char    **p_aliases;    /* alias list */
-        int     p_proto;        /* protocol number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width p_aliases
-.It Fa p_name
-The official name of the protocol.
-.It Fa p_aliases
-A null-terminated list of alternate names for the protocol.
-.It Fa p_proto
-The protocol number.
-.El
-.Pp
-The
-.Fn getprotoent
-function reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setprotoent
-function opens and rewinds the file.
-If the
-.Fa stayopen
-flag is non-zero,
-the protocol database will not be closed after each call to
-.Fn getprotobyname
-or
-.Fn getprotobynumber .
-.Pp
-The
-.Fn endprotoent
-function closes the file.
-.Pp
-The
-.Fn getprotobyname
-and
-.Fn getprotobynumber
-functions sequentially search from the beginning of the file until a
-matching protocol name or protocol number is found, or until
-.Dv EOF
-is encountered.
-.Pp
-The
-.Fn getprotoent_r ,
-.Fn getprotobyport_r ,
-.Fn getprotobyname_r ,
-.Fn setprotoent_r ,
-and
-.Fn endprotoent_r
-functions are reentrant versions of the above functions that take a
-pointer to a
-.Vt protoent_data
-structure which is used to store state information.
-The structure must be zero-filled before it is used
-and should be considered opaque for the sake of portability.
-.Pp
-The
-.Fn getprotoent_r ,
-.Fn getprotobyport_r ,
-and
-.Fn getprotobyname_r
-functions
-also take a pointer to a
-.Vt protoent
-structure which is used to store the results of the database lookup.
-.Sh RETURN VALUES
-The
-.Fn getprotoent ,
-.Fn getprotobyport ,
-and
-.Fn getprotobyname
-functions return a pointer to a
-.Vt protoent
-structure on success or a null pointer if end-of-file
-is reached or an error occurs.
-.Pp
-The
-.Fn getprotoent_r ,
-.Fn getprotobyport_r ,
-and
-.Fn getprotobyname_r
-functions return 0 on success or \-1 if end-of-file
-is reached or an error occurs.
-.Sh FILES
-.Bl -tag -width /etc/protocols -compact
-.It Pa /etc/protocols
-.El
-.Sh SEE ALSO
-.Xr protocols 5
-.Sh STANDARDS
-The
-.Fn getprotoent ,
-.Fn getprotobynumber ,
-.Fn getprotobyname ,
-.Fn setprotoent ,
-and
-.Fn endprotoent
-functions conform to
-.St -p1003.1-2004 .
-.Pp
-The
-.Fn getprotoent_r ,
-.Fn getprotobyport_r ,
-.Fn getprotobyname_r ,
-.Fn setprotoent_r ,
-and
-.Fn endprotoent_r
-functions are not currently standardized.
-This implementation follows the API used by HP, IBM, and Digital.
-.Sh HISTORY
-The
-.Fn getprotoent ,
-.Fn getprotobynumber ,
-.Fn getprotobyname ,
-.Fn setprotoent ,
-and
-.Fn endprotoent
-functions appeared in
-.Bx 4.2 .
-.Pp
-The
-.Fn getprotoent_r ,
-.Fn getprotobyport_r ,
-.Fn getprotobyname_r ,
-.Fn setprotoent_r ,
-and
-.Fn endprotoent_r
-functions appeared in
-.Ox 3.7 .
-.Sh BUGS
-The non-reentrant functions use a static data space; if the data is needed
-for future use, it should be copied before any subsequent calls overwrite it.
-Only the Internet protocols are currently understood.
diff --git a/src/lib/libc/net/getprotoent.c b/src/lib/libc/net/getprotoent.c
deleted file mode 100644
index a218863d07..0000000000
--- a/src/lib/libc/net/getprotoent.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*      $OpenBSD: getprotoent.c,v 1.13 2015/09/14 07:38:38 guenther Exp $ */
-/*
- * Copyright (c) 1983, 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 <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-void
-setprotoent_r(int f, struct protoent_data *pd)
-{
-        if (pd->fp == NULL)
-                pd->fp = fopen(_PATH_PROTOCOLS, "re" );
-        else
-                rewind(pd->fp);
-        pd->stayopen |= f;
-}
-DEF_WEAK(setprotoent_r);
-
-void
-endprotoent_r(struct protoent_data *pd)
-{
-        if (pd->fp) {
-                fclose(pd->fp);
-                pd->fp = NULL;
-        }
-        free(pd->aliases);
-        pd->aliases = NULL;
-        pd->maxaliases = 0;
-        free(pd->line);
-        pd->line = NULL;
-        pd->stayopen = 0;
-}
-DEF_WEAK(endprotoent_r);
-
-int
-getprotoent_r(struct protoent *pe, struct protoent_data *pd)
-{
-        char *p, *cp, **q, *endp;
-        size_t len;
-        long l;
-        int serrno;
-
-        if (pd->fp == NULL && (pd->fp = fopen(_PATH_PROTOCOLS, "re" )) == NULL)
-                return (-1);
-again:
-        if ((p = fgetln(pd->fp, &len)) == NULL)
-                return (-1);
-        if (len == 0 || *p == '#' || *p == '\n')
-                goto again;
-        if (p[len-1] == '\n')
-                len--;
-        if ((cp = memchr(p, '#', len)) != NULL)
-                len = cp - p;
-        cp = realloc(pd->line, len + 1);
-        if (cp == NULL)
-                return (-1);
-        pd->line = pe->p_name = memcpy(cp, p, len);
-        cp[len] = '\0';
-        cp = strpbrk(cp, " \t");
-        if (cp == NULL)
-                goto again;
-        *cp++ = '\0';
-        while (*cp == ' ' || *cp == '\t')
-                cp++;
-        p = strpbrk(cp, " \t");
-        if (p != NULL)
-                *p++ = '\0';
-        l = strtol(cp, &endp, 10);
-        if (endp == cp || *endp != '\0' || l < 0 || l >= INT_MAX)
-                goto again;
-        pe->p_proto = l;
-        if (pd->aliases == NULL) {
-                pd->maxaliases = 5;
-                pd->aliases = calloc(pd->maxaliases, sizeof(char *));
-                if (pd->aliases == NULL) {
-                        serrno = errno;
-                        endprotoent_r(pd);
-                        errno = serrno;
-                        return (-1);
-                }
-        }
-        q = pe->p_aliases = pd->aliases;
-        if (p != NULL) {
-                cp = p;
-                while (cp && *cp) {
-                        if (*cp == ' ' || *cp == '\t') {
-                                cp++;
-                                continue;
-                        }
-                        if (q == &pe->p_aliases[pd->maxaliases - 1]) {
-                                p = reallocarray(pe->p_aliases,
-                                    pd->maxaliases, 2 * sizeof(char *));
-                                if (p == NULL) {
-                                        serrno = errno;
-                                        endprotoent_r(pd);
-                                        errno = serrno;
-                                        return (-1);
-                                }
-                                pd->maxaliases *= 2;
-                                q = (char **)p + (q - pe->p_aliases);
-                                pe->p_aliases = pd->aliases = (char **)p;
-                        }
-                        *q++ = cp;
-                        cp = strpbrk(cp, " \t");
-                        if (cp != NULL)
-                                *cp++ = '\0';
-                }
-        }
-        *q = NULL;
-        return (0);
-}
-DEF_WEAK(getprotoent_r);
-
-struct protoent_data _protoent_data;    /* shared with getproto{,name}.c */
-
-void
-setprotoent(int f)
-{
-        setprotoent_r(f, &_protoent_data);
-}
-
-void
-endprotoent(void)
-{
-        endprotoent_r(&_protoent_data);
-}
-
-struct protoent *
-getprotoent(void)
-{
-        static struct protoent proto;
-
-        if (getprotoent_r(&proto, &_protoent_data) != 0)
-                return (NULL);
-        return (&proto);
-}
diff --git a/src/lib/libc/net/getprotoname.c b/src/lib/libc/net/getprotoname.c
deleted file mode 100644
index f6ed4c49b1..0000000000
--- a/src/lib/libc/net/getprotoname.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*      $OpenBSD: getprotoname.c,v 1.8 2015/09/14 07:38:38 guenther Exp $ */
-/*
- * Copyright (c) 1983, 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 <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-int
-getprotobyname_r(const char *name, struct protoent *pe,
-    struct protoent_data *pd)
-{
-        char **cp;
-        int error;
-
-        setprotoent_r(pd->stayopen, pd);
-        while ((error = getprotoent_r(pe, pd)) == 0) {
-                if (strcmp(pe->p_name, name) == 0)
-                        break;
-                for (cp = pe->p_aliases; *cp != 0; cp++)
-                        if (strcmp(*cp, name) == 0)
-                                goto found;
-        }
-found:
-        if (!pd->stayopen && pd->fp != NULL) {
-                fclose(pd->fp);
-                pd->fp = NULL;
-        }
-        return (error);
-}
-DEF_WEAK(getprotobyname_r);
-
-struct protoent *
-getprotobyname(const char *name)
-{
-        extern struct protoent_data _protoent_data;
-        static struct protoent proto;
-
-        if (getprotobyname_r(name, &proto, &_protoent_data) != 0)
-                return (NULL);
-        return (&proto);
-}
-DEF_WEAK(getprotobyname);
diff --git a/src/lib/libc/net/getrrsetbyname.3 b/src/lib/libc/net/getrrsetbyname.3
deleted file mode 100644
index d0acb60238..0000000000
--- a/src/lib/libc/net/getrrsetbyname.3
+++ /dev/null
@@ -1,164 +0,0 @@
-.\" $OpenBSD: getrrsetbyname.3,v 1.21 2019/08/30 20:20:51 jmc Exp $
-.\"
-.\" Copyright (C) 2000, 2001  Internet Software Consortium.
-.\"
-.\" 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 INTERNET SOFTWARE CONSORTIUM
-.\" DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-.\" INTERNET SOFTWARE CONSORTIUM 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 $Mdocdate: August 30 2019 $
-.Dt GETRRSETBYNAME 3
-.Os
-.Sh NAME
-.Nm freerrset ,
-.Nm getrrsetbyname
-.Nd retrieve DNS records
-.Sh SYNOPSIS
-.In netdb.h
-.Ft int
-.Fn getrrsetbyname "const char *hostname" "unsigned int rdclass" \
-"unsigned int rdtype" "unsigned int flags" "struct rrsetinfo **res"
-.Ft void
-.Fn freerrset "struct rrsetinfo *rrset"
-.Sh DESCRIPTION
-.Fn getrrsetbyname
-gets a set of resource records associated with a
-.Fa hostname ,
-.Fa rdclass ,
-and
-.Fa rdtype .
-.Fa hostname
-is a pointer to a NUL-terminated string.
-The
-.Fa flags
-field is currently unused and must be zero.
-.Pp
-After a successful call to
-.Fn getrrsetbyname ,
-.Fa *res
-is a pointer to an
-.Li rrsetinfo
-structure, containing a list of one or more
-.Li rdatainfo
-structures containing resource records and potentially another list of
-.Li rdatainfo
-structures containing SIG resource records associated with those records.
-The members
-.Li rri_rdclass
-and
-.Li rri_rdtype
-are copied from the parameters.
-.Li rri_ttl
-and
-.Li rri_name
-are properties of the obtained rrset.
-The resource records contained in
-.Li rri_rdatas
-and
-.Li rri_sigs
-are in uncompressed DNS wire format.
-Properties of the rdataset are represented in the
-.Li rri_flags
-bitfield.
-If the
-.Dv RRSET_VALIDATED
-bit is set, the data has been DNSSEC
-validated and the signatures verified.
-.Pp
-The following structures are used:
-.Bd -literal -offset indent
-struct  rdatainfo {
-        unsigned int    rdi_length;     /* length of data */
-        unsigned char   *rdi_data;      /* record data */
-};
-
-struct  rrsetinfo {
-        unsigned int     rri_flags;     /* RRSET_VALIDATED ... */
-        unsigned int     rri_rdclass;   /* class number */
-        unsigned int     rri_rdtype;    /* RR type number */
-        unsigned int     rri_ttl;       /* time to live */
-        unsigned int     rri_nrdatas;   /* size of rdatas array */
-        unsigned int     rri_nsigs;     /* size of sigs array */
-        char             *rri_name;     /* canonical name */
-        struct rdatainfo *rri_rdatas;   /* individual records */
-        struct rdatainfo *rri_sigs;     /* individual signatures */
-};
-.Ed
-.Pp
-All of the information returned by
-.Fn getrrsetbyname
-is dynamically allocated: the
-.Li rrsetinfo
-and
-.Li rdatainfo
-structures,
-and the canonical host name strings pointed to by the
-.Li rrsetinfo
-structure.
-Memory allocated for the dynamically allocated structures created by
-a successful call to
-.Fn getrrsetbyname
-is released by
-.Fn freerrset .
-.Li rrset
-is a pointer to a
-.Li struct rrsetinfo
-created by a call to
-.Fn getrrsetbyname .
-.\" .Pp
-.\" If the EDNS0 option is activated in
-.\" .Xr resolv.conf 5 ,
-.\" .Fn getrrsetbyname
-.\" will request DNSSEC authentication using the EDNS0 DNSSEC OK (DO) bit.
-.Sh RETURN VALUES
-.Fn getrrsetbyname
-returns zero on success, and one of the following error
-codes if an error occurred:
-.Bl -tag -width ERRSET_NOMEMORY
-.It Bq Er ERRSET_NONAME
-The name does not exist.
-.It Bq Er ERRSET_NODATA
-The name exists, but does not have data of the desired type.
-.It Bq Er ERRSET_NOMEMORY
-Memory could not be allocated.
-.It Bq Er ERRSET_INVAL
-A parameter is invalid.
-.It Bq Er ERRSET_FAIL
-Other failure.
-.El
-.Sh SEE ALSO
-.Xr res_init 3 ,
-.Xr resolv.conf 5
-.Sh HISTORY
-.Fn getrrsetbyname
-first appeared in
-.Ox 3.0 .
-The API first appeared in ISC BIND version 9.
-.Sh AUTHORS
-.An Jakob Schlyter Aq Mt jakob@openbsd.org
-.Sh CAVEATS
-The
-.Dv RRSET_VALIDATED
-flag in
-.Li rri_flags
-is set if the AD (authenticated data) bit in the DNS answer is
-set.
-This flag
-.Em should not
-be trusted unless the transport between the nameserver and the resolver
-is secure (e.g. IPsec, trusted network, loopback communication).
-.Sh BUGS
-The data in
-.Li *rdi_data
-should be returned in uncompressed wire format.
-Currently, the data is in compressed format and the caller can't
-uncompress since it doesn't have the full message.
diff --git a/src/lib/libc/net/getservbyname.c b/src/lib/libc/net/getservbyname.c
deleted file mode 100644
index 80c7e62a41..0000000000
--- a/src/lib/libc/net/getservbyname.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*      $OpenBSD: getservbyname.c,v 1.11 2015/09/14 07:38:38 guenther Exp $ */
-/*
- * Copyright (c) 1983, 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 <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-int
-getservbyname_r(const char *name, const char *proto, struct servent *se,
-    struct servent_data *sd)
-{
-        char **cp;
-        int error;
-
-        setservent_r(sd->stayopen, sd);
-        while ((error = getservent_r(se, sd)) == 0) {
-                if (strcmp(name, se->s_name) == 0)
-                        goto gotname;
-                for (cp = se->s_aliases; *cp; cp++)
-                        if (strcmp(name, *cp) == 0)
-                                goto gotname;
-                continue;
-gotname:
-                if (proto == 0 || strcmp(se->s_proto, proto) == 0)
-                        break;
-        }
-        if (!sd->stayopen && sd->fp != NULL) {
-                fclose(sd->fp);
-                sd->fp = NULL;
-        }
-        return (error);
-}
-DEF_WEAK(getservbyname_r);
-
-struct servent *
-getservbyname(const char *name, const char *proto)
-{
-        extern struct servent_data _servent_data;
-        static struct servent serv;
-
-        if (getservbyname_r(name, proto, &serv, &_servent_data) != 0)
-                return (NULL);
-        return (&serv);
-}
-DEF_WEAK(getservbyname);
diff --git a/src/lib/libc/net/getservbyport.c b/src/lib/libc/net/getservbyport.c
deleted file mode 100644
index 3584fbea3a..0000000000
--- a/src/lib/libc/net/getservbyport.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*      $OpenBSD: getservbyport.c,v 1.8 2015/09/14 07:38:38 guenther Exp $ */
-/*
- * Copyright (c) 1983, 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 <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-int
-getservbyport_r(int port, const char *proto, struct servent *se,
-    struct servent_data *sd)
-{
-        int error;
-
-        setservent_r(sd->stayopen, sd);
-        while ((error = getservent_r(se, sd)) == 0) {
-                if (se->s_port != port)
-                        continue;
-                if (proto == 0 || strcmp(se->s_proto, proto) == 0)
-                        break;
-        }
-        if (!sd->stayopen && sd->fp != NULL) {
-                fclose(sd->fp);
-                sd->fp = NULL;
-        }
-        return (error);
-}
-DEF_WEAK(getservbyport_r);
-
-struct servent *
-getservbyport(int port, const char *proto)
-{
-        extern struct servent_data _servent_data;
-        static struct servent serv;
-
-        if (getservbyport_r(port, proto, &serv, &_servent_data) != 0)
-                return (NULL);
-        return (&serv);
-}
diff --git a/src/lib/libc/net/getservent.3 b/src/lib/libc/net/getservent.3
deleted file mode 100644
index 29dd3eb5f4..0000000000
--- a/src/lib/libc/net/getservent.3
+++ /dev/null
@@ -1,220 +0,0 @@
-.\"     $OpenBSD: getservent.3,v 1.21 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt GETSERVENT 3
-.Os
-.Sh NAME
-.Nm getservent ,
-.Nm getservent_r ,
-.Nm getservbyport ,
-.Nm getservbyport_r ,
-.Nm getservbyname ,
-.Nm getservbyname_r ,
-.Nm setservent ,
-.Nm setservent_r ,
-.Nm endservent ,
-.Nm endservent_r
-.Nd get service entry
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct servent *
-.Fn getservent "void"
-.Ft int
-.Fn getservent_r "struct servent *servent" "struct servent_data *servent_data"
-.Ft struct servent *
-.Fn getservbyname "const char *name" "const char *proto"
-.Ft int
-.Fn getservbyname_r "const char *name" "const char *proto" "struct servent *servent" "struct servent_data *servent_data"
-.Ft struct servent *
-.Fn getservbyport "int port" "const char *proto"
-.Ft int
-.Fn getservbyport_r "int port" "const char *proto" "struct servent *servent" "struct servent_data *servent_data"
-.Ft void
-.Fn setservent "int stayopen"
-.Ft void
-.Fn setservent_r "int stayopen" "struct servent_data *servent_data"
-.Ft void
-.Fn endservent "void"
-.Ft void
-.Fn endservent_r "struct servent_data *servent_data"
-.Sh DESCRIPTION
-The
-.Fn getservent ,
-.Fn getservbyname ,
-and
-.Fn getservbyport
-functions each return a pointer to an object with the following structure
-containing the broken-out fields of a line in the network services database,
-.Pa /etc/services .
-.Bd -literal -offset indent
-struct  servent {
-        char    *s_name;        /* official name of service */
-        char    **s_aliases;    /* alias list */
-        int     s_port;         /* port service resides at */
-        char    *s_proto;       /* protocol to use */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width s_aliases
-.It Fa s_name
-The official name of the service.
-.It Fa s_aliases
-A null-terminated list of alternate names for the service.
-.It Fa s_port
-The port number at which the service resides.
-Port numbers are returned in network byte order.
-.It Fa s_proto
-The name of the protocol to use when contacting the service.
-.El
-.Pp
-The
-.Fn getservent
-function reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setservent
-function opens and rewinds the file.
-If the
-.Fa stayopen
-flag is non-zero,
-the services database will not be closed after each call to
-.Fn getservbyname
-or
-.Fn getservbyport .
-.Pp
-The
-.Fn endservent
-function closes the file.
-.Pp
-The
-.Fn getservbyname
-and
-.Fn getservbyport
-functions sequentially search from the beginning of the file until a
-matching protocol name or port number (specified in network byte order)
-is found, or until
-.Dv EOF
-is encountered.
-If a protocol name is also supplied (non-null),
-searches must also match the protocol.
-.Pp
-The
-.Fn getservent_r ,
-.Fn getservbyport_r ,
-.Fn getservbyname_r ,
-.Fn setservent_r ,
-and
-.Fn endservent_r
-functions are reentrant versions of the above functions that take a
-pointer to a
-.Fa servent_data
-structure which is used to store state information.
-The structure must be zero-filled before it is used
-and should be considered opaque for the sake of portability.
-.Pp
-The
-.Fn getservent_r ,
-.Fn getservbyport_r ,
-and
-.Fn getservbyname_r
-functions
-also take a pointer to a
-.Fa servent
-structure which is used to store the results of the database lookup.
-.Sh RETURN VALUES
-The
-.Fn getservent ,
-.Fn getservbyport ,
-and
-.Fn getservbyname
-functions return a pointer to a
-.Fa servent
-structure on success or a null pointer if end-of-file
-is reached or an error occurs.
-.Pp
-The
-.Fn getservent_r ,
-.Fn getservbyport_r ,
-and
-.Fn getservbyname_r
-functions return 0 on success or \-1 if end-of-file
-is reached or an error occurs.
-.Sh FILES
-.Bl -tag -width /etc/services -compact
-.It Pa /etc/services
-.El
-.Sh SEE ALSO
-.Xr getprotoent 3 ,
-.Xr services 5
-.Sh STANDARDS
-The
-.Fn getservent ,
-.Fn getservbynumber ,
-.Fn getservbyname ,
-.Fn setservent ,
-and
-.Fn endservent
-functions conform to
-.St -p1003.1-2004 .
-.Pp
-The
-.Fn getservent_r ,
-.Fn getservbyport_r ,
-.Fn getservbyname_r ,
-.Fn setservent_r ,
-and
-.Fn endservent_r
-functions are not currently standardized.
-This implementation follows the API used by HP, IBM, and Digital.
-.Sh HISTORY
-The
-.Fn getservent ,
-.Fn getservbyport ,
-.Fn getservbyname ,
-.Fn setservent ,
-and
-.Fn endservent
-functions appeared in
-.Bx 4.2 .
-.Pp
-The
-.Fn getservent_r ,
-.Fn getservbyport_r ,
-.Fn getservbyname_r ,
-.Fn setservent_r ,
-and
-.Fn endservent_r
-functions appeared in
-.Ox 3.7 .
-.Sh BUGS
-The non-reentrant functions use static data storage; if the data is needed
-for future use, it should be copied before any subsequent calls overwrite it.
-Expecting port numbers to fit in a 32-bit quantity is probably naive.
diff --git a/src/lib/libc/net/getservent.c b/src/lib/libc/net/getservent.c
deleted file mode 100644
index 220a5851ce..0000000000
--- a/src/lib/libc/net/getservent.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*      $OpenBSD: getservent.c,v 1.15 2015/09/14 07:38:38 guenther Exp $ */
-/*
- * Copyright (c) 1983, 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 <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-void
-setservent_r(int f, struct servent_data *sd)
-{
-        if (sd->fp == NULL)
-                sd->fp = fopen(_PATH_SERVICES, "re" );
-        else
-                rewind(sd->fp);
-        sd->stayopen |= f;
-}
-DEF_WEAK(setservent_r);
-
-void
-endservent_r(struct servent_data *sd)
-{
-        if (sd->fp) {
-                fclose(sd->fp);
-                sd->fp = NULL;
-        }
-        free(sd->aliases);
-        sd->aliases = NULL;
-        sd->maxaliases = 0;
-        free(sd->line);
-        sd->line = NULL;
-        sd->stayopen = 0;
-}
-DEF_WEAK(endservent_r);
-
-int
-getservent_r(struct servent *se, struct servent_data *sd)
-{
-        char *p, *cp, **q, *endp;
-        size_t len;
-        long l;
-        int serrno;
-
-        if (sd->fp == NULL && (sd->fp = fopen(_PATH_SERVICES, "re" )) == NULL)
-                return (-1);
-again:
-        if ((p = fgetln(sd->fp, &len)) == NULL)
-                return (-1);
-        if (len == 0 || *p == '#' || *p == '\n')
-                goto again;
-        if (p[len-1] == '\n')
-                len--;
-        if ((cp = memchr(p, '#', len)) != NULL)
-                len = cp - p;
-        cp = realloc(sd->line, len + 1);
-        if (cp == NULL)
-                return (-1);
-        sd->line = se->s_name = memcpy(cp, p, len);
-        cp[len] = '\0';
-        p = strpbrk(cp, " \t");
-        if (p == NULL)
-                goto again;
-        *p++ = '\0';
-        while (*p == ' ' || *p == '\t')
-                p++;
-        cp = strpbrk(p, ",/");
-        if (cp == NULL)
-                goto again;
-        *cp++ = '\0';
-        l = strtol(p, &endp, 10);
-        if (endp == p || *endp != '\0' || l < 0 || l > USHRT_MAX)
-                goto again;
-        se->s_port = htons((in_port_t)l);
-        se->s_proto = cp;
-        if (sd->aliases == NULL) {
-                sd->maxaliases = 10;
-                sd->aliases = calloc(sd->maxaliases, sizeof(char *));
-                if (sd->aliases == NULL) {
-                        serrno = errno;
-                        endservent_r(sd);
-                        errno = serrno;
-                        return (-1);
-                }
-        }
-        q = se->s_aliases = sd->aliases;
-        cp = strpbrk(cp, " \t");
-        if (cp != NULL)
-                *cp++ = '\0';
-        while (cp && *cp) {
-                if (*cp == ' ' || *cp == '\t') {
-                        cp++;
-                        continue;
-                }
-                if (q == &se->s_aliases[sd->maxaliases - 1]) {
-                        p = reallocarray(se->s_aliases, sd->maxaliases,
-                            2 * sizeof(char *));
-                        if (p == NULL) {
-                                serrno = errno;
-                                endservent_r(sd);
-                                errno = serrno;
-                                return (-1);
-                        }
-                        sd->maxaliases *= 2;
-                        q = (char **)p + (q - se->s_aliases);
-                        se->s_aliases = sd->aliases = (char **)p;
-                }
-                *q++ = cp;
-                cp = strpbrk(cp, " \t");
-                if (cp != NULL)
-                        *cp++ = '\0';
-        }
-        *q = NULL;
-        return (0);
-}
-DEF_WEAK(getservent_r);
-
-struct servent_data _servent_data;      /* shared with getservby{name,port}.c */
-
-void
-setservent(int f)
-{
-        setservent_r(f, &_servent_data);
-}
-
-void
-endservent(void)
-{
-        endservent_r(&_servent_data);
-}
-
-struct servent *
-getservent(void)
-{
-        static struct servent serv;
-
-        if (getservent_r(&serv, &_servent_data) != 0)
-                return (NULL);
-        return (&serv);
-}
diff --git a/src/lib/libc/net/herror.c b/src/lib/libc/net/herror.c
deleted file mode 100644
index 356c85fa1d..0000000000
--- a/src/lib/libc/net/herror.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*      $OpenBSD: herror.c,v 1.10 2015/09/14 07:38:38 guenther Exp $    */
-
-/*
- * ++Copyright++ 1987, 1993
- * -
- * Copyright (c) 1987, 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * 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, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION 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.
- * -
- * --Copyright--
- */
-
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <string.h>
-
-const char * const h_errlist[] = {
-        "Resolver Error 0 (no error)",
-        "Unknown host",                         /* 1 HOST_NOT_FOUND */
-        "Host name lookup failure",             /* 2 TRY_AGAIN */
-        "Unknown server error",                 /* 3 NO_RECOVERY */
-        "No address associated with name",      /* 4 NO_ADDRESS */
-};
-const int       h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
-
-extern int      h_errno;
-
-/*
- * herror --
- *      print the error indicated by the h_errno value.
- */
-void
-herror(const char *s)
-{
-        struct iovec iov[4];
-        struct iovec *v = iov;
-
-        if (s && *s) {
-                v->iov_base = (char *)s;
-                v->iov_len = strlen(s);
-                v++;
-                v->iov_base = ": ";
-                v->iov_len = 2;
-                v++;
-        }
-        v->iov_base = (char *)hstrerror(h_errno);
-        v->iov_len = strlen(v->iov_base);
-        v++;
-        v->iov_base = "\n";
-        v->iov_len = 1;
-        writev(STDERR_FILENO, iov, (v - iov) + 1);
-}
-
-const char *
-hstrerror(int err)
-{
-        if (err < 0)
-                return ("Resolver internal error");
-        else if (err < h_nerr)
-                return (h_errlist[err]);
-        return ("Unknown resolver error");
-}
-DEF_WEAK(hstrerror);
diff --git a/src/lib/libc/net/htobe64.3 b/src/lib/libc/net/htobe64.3
deleted file mode 100644
index 3e500897e2..0000000000
--- a/src/lib/libc/net/htobe64.3
+++ /dev/null
@@ -1,166 +0,0 @@
-.\"     $OpenBSD: htobe64.3,v 1.1 2019/08/30 18:33:17 deraadt Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.Dd $Mdocdate: August 30 2019 $
-.Dt HTOBE64 3
-.Os
-.Sh NAME
-.Nm htobe64 ,
-.Nm htobe32 ,
-.Nm htobe16 ,
-.Nm be64toh ,
-.Nm be32toh ,
-.Nm be16toh ,
-.Nm betoh64 ,
-.Nm betoh32 ,
-.Nm betoh16 ,
-.Nm htole64 ,
-.Nm htole32 ,
-.Nm htole16 ,
-.Nm le64toh ,
-.Nm le32toh ,
-.Nm le16toh ,
-.Nm letoh64 ,
-.Nm letoh32 ,
-.Nm letoh16 ,
-.Nm swap64 ,
-.Nm swap32 ,
-.Nm swap16
-.Nd convert values between different byte orderings
-.Sh SYNOPSIS
-.In endian.h
-.Ft uint64_t
-.Fn htobe64 "uint64_t host64"
-.Ft uint32_t
-.Fn htobe32 "uint32_t host32"
-.Ft uint16_t
-.Fn htobe16 "uint16_t host16"
-.Ft uint64_t
-.Fn be64toh "uint64_t big64"
-.Ft uint32_t
-.Fn be32toh "uint32_t big32"
-.Ft uint16_t
-.Fn be16toh "uint16_t big16"
-.Ft uint64_t
-.Fn betoh64 "uint64_t big64"
-.Ft uint32_t
-.Fn betoh32 "uint32_t big32"
-.Ft uint16_t
-.Fn betoh16 "uint16_t big16"
-.Ft uint64_t
-.Fn htole64 "uint64_t host64"
-.Ft uint32_t
-.Fn htole32 "uint32_t host32"
-.Ft uint16_t
-.Fn htole16 "uint16_t host16"
-.Ft uint64_t
-.Fn letoh64 "uint64_t little64"
-.Ft uint64_t
-.Fn le64toh "uint64_t little64"
-.Ft uint32_t
-.Fn le32toh "uint32_t little32"
-.Ft uint16_t
-.Fn le16toh "uint16_t little16"
-.Ft uint32_t
-.Fn letoh32 "uint32_t little32"
-.Ft uint16_t
-.Fn letoh16 "uint16_t little16"
-.Ft uint64_t
-.Fn swap64 "uint64_t val64"
-.Ft uint32_t
-.Fn swap32 "uint32_t val32"
-.Ft uint16_t
-.Fn swap16 "uint16_t val16"
-.Sh DESCRIPTION
-These routines convert 16, 32 and 64-bit quantities between different
-byte orderings.
-The
-.Dq swap
-functions reverse the byte ordering of
-the given quantity; the others convert either from/to the native
-byte order used by the host to/from either little- or big-endian (a.k.a
-network) order.
-.Pp
-Apart from the swap functions,
-the names containing
-.Dq be
-convert between host and big-endian (most significant byte first) order
-of the given quantity, while the names containing
-.Dq le
-convert between host and little-endian (least significant byte first) order
-of the given quantity.
-.Pp
-All these functions use the numbers
-16, 32, or 64 for specifying the bitwidth of the quantities they operate on.
-Currently all supported architectures are either big- or little-endian
-so either the
-.Dq be
-or
-.Dq le
-variants are implemented as null macros.
-.Sh SEE ALSO
-.Xr htonl 3
-.Sh STANDARDS
-The
-.Fn htobe64 ,
-.Fn htobe32 ,
-.Fn htobe16 ,
-.Fn be64toh ,
-.Fn be32toh ,
-.Fn be16toh ,
-.Fn htole64 ,
-.Fn htole32 ,
-.Fn htole16 ,
-.Fn le64toh ,
-.Fn le32toh ,
-and
-.Fn le16toh
-functions are expected to conform to a future version of
-.St -p1003.1 .
-The other functions are extensions that should not be used
-when portability is required.
-.Sh HISTORY
-The
-.Nm swap{size}
-and
-.Nm {src-order}to{dst-order}{size}
-functions appeared in
-.Bx 4.2 .
-The
-.Nm {src-order}{size}to{dst-order}
-functions appeared in
-.Ox 5.6 .
-A subset of them was submitted for standardization after
-.St -p1003.1-2008 .
-.Sh BUGS
-The perceived antagonism between
-.Sq host
-and
-.Sq network
-byte order does not allow PDP-11 users to sleep soundly at night.
diff --git a/src/lib/libc/net/htonl.3 b/src/lib/libc/net/htonl.3
deleted file mode 100644
index a63959717a..0000000000
--- a/src/lib/libc/net/htonl.3
+++ /dev/null
@@ -1,105 +0,0 @@
-.\"     $OpenBSD: htonl.3,v 1.5 2019/02/13 07:02:09 jmc Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.Dd $Mdocdate: February 13 2019 $
-.Dt HTONL 3
-.Os
-.Sh NAME
-.Nm htonl ,
-.Nm htons ,
-.Nm ntohl ,
-.Nm ntohs
-.Nd convert values between host and network byte orderings
-.Sh SYNOPSIS
-.In arpa/inet.h
-.Ft uint32_t
-.Fn htonl "uint32_t host32"
-.Ft uint16_t
-.Fn htons "uint16_t host16"
-.Ft uint32_t
-.Fn ntohl "uint32_t net32"
-.Ft uint16_t
-.Fn ntohs "uint16_t net16"
-.Sh DESCRIPTION
-These routines convert 16 and 32-bit quantities between different
-byte orderings.
-.Pp
-The
-.Fn htonl
-and
-.Fn htons
-functions convert quantities from host to network byte order while the
-.Fn ntohl
-and
-.Fn ntohs
-functions convert in the other direction.
-.Pp
-The last letter
-.Pf ( Sq s
-or
-.Sq l )
-is a mnemonic
-for the traditional names for such quantities,
-.Li short
-and
-.Li long ,
-respectively.
-Today, the C concept of
-.Li short
-and
-.Li long
-integers need not coincide with this traditional misunderstanding.
-On machines which have a byte order which is the same as the network
-order, routines are defined as null macros.
-.Pp
-These routines are most often used in conjunction with Internet
-addresses and ports as returned by
-.Xr gethostbyname 3
-and
-.Xr getservent 3 .
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr getservent 3 ,
-.Xr htobe64 3
-.Sh STANDARDS
-The
-.Fn htonl ,
-.Fn htons ,
-.Fn ntohl ,
-and
-.Fn ntohs
-functions conform to
-.St -p1003.1 .
-.Sh HISTORY
-These functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-On the alpha, amd64, i386, and some mips and arm architectures,
-bytes are handled backwards from most everyone else in the world.
-This is not expected to be fixed in the near future.
diff --git a/src/lib/libc/net/htonl.c b/src/lib/libc/net/htonl.c
deleted file mode 100644
index 6ee6e7efbf..0000000000
--- a/src/lib/libc/net/htonl.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*      $OpenBSD: htonl.c,v 1.7 2014/07/21 01:51:10 guenther Exp $ */
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-#include <sys/types.h>
-#include <endian.h>
-
-#undef htonl
-
-u_int32_t
-htonl(u_int32_t x)
-{
-#if BYTE_ORDER == LITTLE_ENDIAN
-        u_char *s = (u_char *)&x;
-        return (u_int32_t)(s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]);
-#else
-        return x;
-#endif
-}
diff --git a/src/lib/libc/net/htons.c b/src/lib/libc/net/htons.c
deleted file mode 100644
index f48d91ee03..0000000000
--- a/src/lib/libc/net/htons.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*      $OpenBSD: htons.c,v 1.9 2014/07/21 01:51:10 guenther Exp $ */
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-#include <sys/types.h>
-#include <endian.h>
-
-#undef htons
-
-u_int16_t
-htons(u_int16_t x)
-{
-#if BYTE_ORDER == LITTLE_ENDIAN
-        u_char *s = (u_char *) &x;
-        return (u_int16_t)(s[0] << 8 | s[1]);
-#else
-        return x;
-#endif
-}
diff --git a/src/lib/libc/net/if_indextoname.3 b/src/lib/libc/net/if_indextoname.3
deleted file mode 100644
index 25d2a2722f..0000000000
--- a/src/lib/libc/net/if_indextoname.3
+++ /dev/null
@@ -1,143 +0,0 @@
-.\"     $OpenBSD: if_indextoname.3,v 1.16 2015/11/21 07:48:10 jmc Exp $
-.\" Copyright (c) 1983, 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.
-.\"
-.\"     From: @(#)rcmd.3        8.1 (Berkeley) 6/4/93
-.\"
-.Dd $Mdocdate: November 21 2015 $
-.Dt IF_NAMETOINDEX 3
-.Os
-.Sh NAME
-.Nm if_nametoindex ,
-.Nm if_indextoname ,
-.Nm if_nameindex ,
-.Nm if_freenameindex
-.Nd convert interface index to name, and vice versa
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/if.h
-.Ft "unsigned int"
-.Fn if_nametoindex "const char *ifname"
-.Ft "char *"
-.Fn if_indextoname "unsigned int ifindex" "char *ifname"
-.Ft "struct if_nameindex *"
-.Fn if_nameindex "void"
-.Ft "void"
-.Fn if_freenameindex "struct if_nameindex *ptr"
-.Sh DESCRIPTION
-These functions map interface indexes to interface names (such as
-.Dq lo0 ) ,
-and vice versa.
-.Pp
-The
-.Fn if_nametoindex
-function converts an interface name specified by the
-.Fa ifname
-argument to an interface index (positive integer value).
-If the specified interface does not exist, 0 will be returned.
-.Pp
-.Fn if_indextoname
-converts an interface index specified by the
-.Fa ifindex
-argument to an interface name.
-The
-.Fa ifname
-argument must point to a buffer of at least
-.Dv IF_NAMESIZE
-bytes into which the interface name corresponding to the specified index is
-returned.
-.Pf ( Dv IF_NAMESIZE
-is also defined in
-.In net/if.h
-and its value includes a terminating NUL byte at the end of the
-interface name.)
-This pointer is also the return value of the function.
-If there is no interface corresponding to the specified index,
-.Dv NULL
-is returned.
-.Pp
-.Fn if_nameindex
-returns an array of
-.Vt if_nameindex
-structures.
-.Vt if_nameindex
-is also defined in
-.In net/if.h ,
-and is as follows:
-.Bd -literal -offset indent
-struct if_nameindex {
-        unsigned int      if_index;     /* 1, 2, ... */
-        char             *if_name;      /* NUL-terminated name */
-};
-.Ed
-.Pp
-The end of the array of structures is indicated by a structure with
-an
-.Fa if_index
-of 0 and an
-.Fa if_name
-of
-.Dv NULL .
-The function returns a null pointer on error.
-The memory used for this array of structures along with the interface
-names pointed to by the
-.Fa if_name
-members is obtained dynamically.
-This memory is freed by the
-.Fn if_freenameindex
-function.
-.Pp
-.Fn if_freenameindex
-takes a pointer that was returned by
-.Fn if_nameindex
-as argument
-.Pq Fa ptr ,
-and it reclaims the region allocated.
-.Sh DIAGNOSTICS
-.Fn if_nametoindex
-returns 0 on error, positive integer on success.
-.Fn if_indextoname
-and
-.Fn if_nameindex
-return
-.Dv NULL
-on errors.
-.Sh SEE ALSO
-.Xr getifaddrs 3 ,
-.Xr netintro 4
-.Sh STANDARDS
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A J. McCann
-.%A W. Stevens
-.%D February 2003
-.%R RFC 3493
-.%T Basic Socket Interface Extensions for IPv6
-.Re
diff --git a/src/lib/libc/net/if_indextoname.c b/src/lib/libc/net/if_indextoname.c
deleted file mode 100644
index 3c6e8681fb..0000000000
--- a/src/lib/libc/net/if_indextoname.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*      $OpenBSD: if_indextoname.c,v 1.12 2018/05/10 13:44:43 tb Exp $  */
-/*      $KAME: if_indextoname.c,v 1.6 2000/11/07 22:33:25 jinmei Exp $  */
-
-/*-
- * Copyright (c) 2015 Claudio Jeker <claudio@openbsd.org>
- * Copyright (c) 1997, 2000
- *      Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *      BSDI Id: if_indextoname.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-/*
- * From RFC 2553:
- *
- * The second function maps an interface index into its corresponding
- * name.
- *
- *    #include <net/if.h>
- *
- *    char  *if_indextoname(unsigned int ifindex, char *ifname);
- *
- * The ifname argument must point to a buffer of at least IF_NAMESIZE
- * bytes into which the interface name corresponding to the specified
- * index is returned.  (IF_NAMESIZE is also defined in <net/if.h> and
- * its value includes a terminating null byte at the end of the
- * interface name.) This pointer is also the return value of the
- * function.  If there is no interface corresponding to the specified
- * index, NULL is returned, and errno is set to ENXIO, if there was a
- * system error (such as running out of memory), if_indextoname returns
- * NULL and errno would be set to the proper value (e.g., ENOMEM).
- */
-
-char *
-if_indextoname(unsigned int ifindex, char *ifname)
-{
-        struct if_nameindex *ifni, *ifni2;
-
-        if ((ifni = if_nameindex()) == NULL)
-                return NULL;
-
-        for (ifni2 = ifni; ifni2->if_index != 0; ifni2++) {
-                if (ifni2->if_index == ifindex) {
-                        strlcpy(ifname, ifni2->if_name, IFNAMSIZ);
-                        if_freenameindex(ifni);
-                        return ifname;
-                }
-        }
-
-        if_freenameindex(ifni);
-        errno = ENXIO;
-        return NULL;
-}
-DEF_WEAK(if_indextoname);
diff --git a/src/lib/libc/net/if_nameindex.c b/src/lib/libc/net/if_nameindex.c
deleted file mode 100644
index 6e5bc0809a..0000000000
--- a/src/lib/libc/net/if_nameindex.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*      $OpenBSD: if_nameindex.c,v 1.13 2016/12/16 17:44:59 krw Exp $   */
-/*      $KAME: if_nameindex.c,v 1.7 2000/11/24 08:17:20 itojun Exp $    */
-
-/*-
- * Copyright (c) 2015 Claudio Jeker <claudio@openbsd.org>
- * Copyright (c) 1997, 2000
- *      Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *      BSDI Id: if_nameindex.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-#include <net/if.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-/*
- * From RFC 2553:
- *
- * 4.3 Return All Interface Names and Indexes
- *
- *    The if_nameindex structure holds the information about a single
- *    interface and is defined as a result of including the <net/if.h>
- *    header.
- *
- *       struct if_nameindex {
- *         unsigned int   if_index;
- *         char          *if_name;
- *       };
- *
- *    The final function returns an array of if_nameindex structures, one
- *    structure per interface.
- *
- *       struct if_nameindex  *if_nameindex(void);
- *
- *    The end of the array of structures is indicated by a structure with
- *    an if_index of 0 and an if_name of NULL.  The function returns a NULL
- *    pointer upon an error, and would set errno to the appropriate value.
- *
- *    The memory used for this array of structures along with the interface
- *    names pointed to by the if_name members is obtained dynamically.
- *    This memory is freed by the next function.
- *
- * 4.4.  Free Memory
- *
- *    The following function frees the dynamic memory that was allocated by
- *    if_nameindex().
- *
- *        #include <net/if.h>
- *
- *        void  if_freenameindex(struct if_nameindex *ptr);
- *
- *    The argument to this function must be a pointer that was returned by
- *    if_nameindex().
- */
-
-struct if_nameindex *
-if_nameindex(void)
-{
-        struct if_nameindex_msg *ifnm = NULL;
-        struct if_nameindex *ifni = NULL, *ifni2;
-        char *cp;
-        size_t needed;
-        unsigned int ni, i;
-        int mib[6];
-
-        mib[0] = CTL_NET;
-        mib[1] = PF_ROUTE;
-        mib[2] = 0;             /* protocol */
-        mib[3] = 0;             /* not used */
-        mib[4] = NET_RT_IFNAMES;
-        mib[5] = 0;             /* no flags */
-        while (1) {
-                struct if_nameindex_msg *buf = NULL;
-
-                if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1)
-                        goto out;
-                if (needed == 0)
-                        break;
-                if ((buf = realloc(ifnm, needed)) == NULL)
-                        goto out;
-                ifnm = buf;
-                if (sysctl(mib, 6, ifnm, &needed, NULL, 0) == -1) {
-                        if (errno == ENOMEM)
-                                continue;
-                        goto out;
-                }
-                break;
-        }
-
-        /*
-         * Allocate a chunk of memory, use the first part for the array of
-         * structures, and the last part for the strings.
-         */
-        ni = needed / sizeof(*ifnm);
-        ifni = calloc(ni + 1, sizeof(struct if_nameindex) + IF_NAMESIZE);
-        if (ifni == NULL)
-                goto out;
-        cp = (char *)(ifni + (ni + 1));
-
-        ifni2 = ifni;
-        for (i = 0; i < ni; i++) {
-                ifni2->if_index = ifnm[i].if_index;
-                /* don't care about truncation */
-                strlcpy(cp, ifnm[i].if_name, IF_NAMESIZE);
-                ifni2->if_name = cp;
-                ifni2++;
-                cp += IF_NAMESIZE;
-        }
-        /* Finally, terminate the array. */
-        ifni2->if_index = 0;
-        ifni2->if_name = NULL;
-out:
-        free(ifnm);
-        return ifni;
-}
-
-void
-if_freenameindex(struct if_nameindex *ptr)
-{
-        free(ptr);
-}
-DEF_WEAK(if_nameindex);
-DEF_WEAK(if_freenameindex);
diff --git a/src/lib/libc/net/if_nametoindex.c b/src/lib/libc/net/if_nametoindex.c
deleted file mode 100644
index 7a4492e37d..0000000000
--- a/src/lib/libc/net/if_nametoindex.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*      $OpenBSD: if_nametoindex.c,v 1.10 2015/10/23 13:09:19 claudio Exp $     */
-/*      $KAME: if_nametoindex.c,v 1.5 2000/11/24 08:04:40 itojun Exp $  */
-
-/*-
- * Copyright (c) 2015 Claudio Jeker <claudio@openbsd.org>
- * Copyright (c) 1997, 2000
- *      Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *      BSDI Id: if_nametoindex.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-/*
- * From RFC 2553:
- *
- * 4.1 Name-to-Index
- *
- *
- *    The first function maps an interface name into its corresponding
- *    index.
- *
- *       #include <net/if.h>
- *
- *       unsigned int  if_nametoindex(const char *ifname);
- *
- *    If the specified interface name does not exist, the return value is
- *    0, and errno is set to ENXIO.  If there was a system error (such as
- *    running out of memory), the return value is 0 and errno is set to the
- *    proper value (e.g., ENOMEM).
- */
-
-unsigned int
-if_nametoindex(const char *ifname)
-{
-        struct if_nameindex *ifni, *ifni2;
-        unsigned int index;
-
-        if ((ifni = if_nameindex()) == NULL)
-                return(0);
-
-        for (ifni2 = ifni; ifni2->if_index != 0; ifni2++) {
-                if (strcmp(ifni2->if_name, ifname) == 0) {
-                        index = ifni2->if_index;
-                        if_freenameindex(ifni);
-                        return index;
-                }
-        }
-
-        if_freenameindex(ifni);
-        errno = ENXIO;
-        return 0;
-}
-DEF_WEAK(if_nametoindex);
diff --git a/src/lib/libc/net/inet6_opt_init.3 b/src/lib/libc/net/inet6_opt_init.3
deleted file mode 100644
index dd7ab53f6f..0000000000
--- a/src/lib/libc/net/inet6_opt_init.3
+++ /dev/null
@@ -1,328 +0,0 @@
-.\"     $OpenBSD: inet6_opt_init.3,v 1.6 2014/01/21 03:15:45 schwarze Exp $
-.\"     $KAME: inet6_opt_init.3,v 1.7 2004/12/27 05:08:23 itojun Exp $
-.\"
-.\" Copyright (C) 2004 WIDE Project.
-.\" 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 project 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 PROJECT 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 PROJECT 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 $Mdocdate: January 21 2014 $
-.Dt INET6_OPT_INIT 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_opt_init ,
-.Nm inet6_opt_append ,
-.Nm inet6_opt_finish ,
-.Nm inet6_opt_set_val ,
-.Nm inet6_opt_next ,
-.Nm inet6_opt_find ,
-.Nm inet6_opt_get_val
-.Nd IPv6 Hop-by-Hop and Destination Options manipulation
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft "int"
-.Fn inet6_opt_init "void *extbuf" "socklen_t extlen"
-.Ft "int"
-.Fn inet6_opt_append "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t len" "u_int8_t align" "void **databufp"
-.Ft "int"
-.Fn inet6_opt_finish "void *extbuf" "socklen_t extlen" "int offset"
-.Ft "int"
-.Fn inet6_opt_set_val "void *databuf" "int offset" "void *val" "socklen_t vallen"
-.Ft "int"
-.Fn inet6_opt_next "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t *typep" "socklen_t *lenp" "void **databufp"
-.Ft "int"
-.Fn inet6_opt_find "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t *lenp" "void **databufp"
-.Ft "int"
-.Fn inet6_opt_get_val "void *databuf" "socklen_t offset" "void *val" "socklen_t vallen"
-.\"
-.Sh DESCRIPTION
-Building and parsing the Hop-by-Hop and Destination options is
-complicated.
-The advanced sockets API defines a set of functions to
-help applications create and manipulate Hop-by-Hop and Destination
-options.
-These functions use the
-formatting rules specified in Appendix B in RFC 2460, i.e. that the
-largest field is placed last in the option.
-The function prototypes
-for these functions are all contained in the header file
-.In netinet/in.h .
-.\"
-.Ss inet6_opt_init
-The
-.Fn inet6_opt_init
-function
-returns the number of bytes needed for an empty
-extension header, one without any options.
-If the
-.Va extbuf
-argument points to a valid section of memory
-then the
-.Fn inet6_opt_init
-function also initializes the extension header's length field.
-When attempting to initialize an extension buffer passed in the
-.Va extbuf
-argument,
-.Fa extlen
-must be a positive multiple of 8 or else the function fails and
-returns \-1 to the caller.
-.\"
-.Ss inet6_opt_append
-The
-.Fn inet6_opt_append
-function can perform different jobs.
-When a valid
-.Fa extbuf
-argument is supplied it appends an option to the extension buffer and
-returns the updated total length as well as a pointer to the newly
-created option in
-.Fa databufp .
-If the value
-of
-.Fa extbuf
-is
-.Dv NULL
-then the
-.Fn inet6_opt_append
-function only reports what the total length would
-be if the option were actually appended.
-The
-.Fa len
-and
-.Fa align
-arguments specify the length of the option and the required data
-alignment which must be used when appending the option.
-The
-.Fa offset
-argument should be the length returned by the
-.Fn inet6_opt_init
-function or a previous call to
-.Fn inet6_opt_append .
-.Pp
-The
-.Fa type
-argument is the 8-bit option type.
-.Pp
-After
-.Fn inet6_opt_append
-has been called, the application can use the buffer pointed to by
-.Fa databufp
-directly, or use
-.Fn inet6_opt_set_val
-to specify the data to be contained in the option.
-.Pp
-Option types of
-.Li 0
-and
-.Li 1
-are reserved for the
-.Li Pad1
-and
-.Li PadN
-options.
-All other values from 2 through 255 may be used by applications.
-.Pp
-The length of the option data is contained in an 8-bit value and so
-may contain any value from 0 through 255.
-.Pp
-The
-.Fa align
-parameter must have a value of 1, 2, 4, or 8 and cannot exceed the
-value of
-.Fa len .
-The alignment values represent no alignment, 16-bit, 32-bit and 64-bit
-alignments respectively.
-.\"
-.Ss inet6_opt_finish
-The
-.Fn inet6_opt_finish
-calculates the final padding necessary to make the extension header a
-multiple of 8 bytes, as required by the IPv6 extension header
-specification, and returns the extension header's updated total
-length.
-The
-.Fa offset
-argument should be the length returned by
-.Fn inet6_opt_init
-or
-.Fn inet6_opt_append .
-When
-.Fa extbuf
-is not
-.Dv NULL
-the function also sets up the appropriate padding bytes by inserting a
-Pad1 or PadN option of the proper length.
-.Pp
-If the extension header is too small to contain the proper padding
-then an error of \-1 is returned to the caller.
-.\"
-.Ss inet6_opt_set_val
-The
-.Fn inet6_opt_set_val
-function inserts data items of various sizes into the data portion of
-the option.
-The
-.Fa databuf
-argument is a pointer to memory that was returned by the
-.Fn inet6_opt_append
-call and the
-.Fa offset
-argument specifies where the option should be placed in the
-data buffer.
-The
-.Fa val
-argument points to an area of memory containing the data to be
-inserted into the extension header, and the
-.Fa vallen
-argument indicates how much data to copy.
-.Pp
-The caller should ensure that each field is aligned on its natural
-boundaries as described in Appendix B of RFC 2460.
-.Pp
-The function returns the offset for the next field which is calculated as
-.Fa offset
-+
-.Fa vallen
-and is used when composing options with multiple fields.
-.\"
-.Ss inet6_opt_next
-The
-.Fn inet6_opt_next
-function parses received extension headers.
-The
-.Fa extbuf
-and
-.Fa extlen
-arguments specify the location and length of the extension header
-being parsed.
-The
-.Fa offset
-argument should either be zero, for the first option, or the length value
-returned by a previous call to
-.Fn inet6_opt_next
-or
-.Fn inet6_opt_find .
-The return value specifies the position where to continue scanning the
-extension buffer.
-The option is returned in the arguments
-.Fa typep , lenp ,
-and
-.Fa databufp .
-.Fa typep , lenp ,
-and
-.Fa databufp
-point to the 8-bit option type, the 8-bit option length and the option
-data respectively.
-This function does not return any PAD1 or PADN options.
-When an error occurs or there are no more options the return
-value is \-1.
-.\"
-.Ss inet6_opt_find
-The
-.Fn inet6_opt_find
-function searches the extension buffer for a particular option type,
-passed in through the
-.Fa type
-argument.
-If the option is found then the
-.Fa lenp
-and
-.Fa databufp
-arguments are updated to point to the option's length and data
-respectively.
-.Fa extbuf
-and
-.Fa extlen
-must point to a valid extension buffer and give its length.
-The
-.Fa offset
-argument can be used to search from a location anywhere in the
-extension header.
-.Ss inet6_opt_get_val
-The
-.Fn inet6_opt_get_val
-function extracts data items of various sizes in the data portion of
-the option.
-The
-.Fa databuf
-is a pointer returned by the
-.Fn inet6_opt_next
-or
-.Fn inet6_opt_find
-functions.
-The
-.Fa val
-argument points to where the data will be extracted.
-The
-.Fa offset
-argument specifies from where in the data portion of the option the
-value should be extracted; the first byte of option data is specified
-by an offset of zero.
-.Pp
-It is expected that each field is aligned on its natural boundaries as
-described in Appendix B of RFC 2460.
-.Pp
-The function returns the offset for the next field
-by calculating
-.Fa offset
-+
-.Fa vallen
-which can be used when extracting option content with multiple fields.
-Robust receivers must verify alignment before calling this function.
-.\"
-.Sh EXAMPLES
-RFC 3542 gives comprehensive examples in Section 23.
-KAME also provides examples in the
-.Pa advapitest
-directory of its kit.
-.\"
-.Sh DIAGNOSTICS
-All the functions return
-\-1
-on an error.
-.\"
-.Sh STANDARDS
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%D December 1998
-.%R RFC 2460
-.%T Internet Protocol, Version 6 (IPv6) Specification
-.Re
-.Pp
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%A E. Nordmark
-.%A T. Jinmei
-.%D May 2003
-.%R RFC 3542
-.%T Advanced Sockets Application Program Interface (API) for IPv6
-.Re
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
diff --git a/src/lib/libc/net/inet6_rth_space.3 b/src/lib/libc/net/inet6_rth_space.3
deleted file mode 100644
index fd69da2455..0000000000
--- a/src/lib/libc/net/inet6_rth_space.3
+++ /dev/null
@@ -1,220 +0,0 @@
-.\"     $OpenBSD: inet6_rth_space.3,v 1.7 2014/06/11 16:59:47 chrisz Exp $
-.\"     $KAME: inet6_rth_space.3,v 1.7 2005/01/05 03:00:44 itojun Exp $
-.\"
-.\" Copyright (C) 2004 WIDE Project.
-.\" 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 project 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 PROJECT 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 PROJECT 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 $Mdocdate: June 11 2014 $
-.Dt INET6_RTH_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_rth_space ,
-.Nm inet6_rth_init ,
-.Nm inet6_rth_add ,
-.Nm inet6_rth_reverse ,
-.Nm inet6_rth_segments ,
-.Nm inet6_rth_getaddr
-.Nd IPv6 Routing Header Options manipulation
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft socklen_t
-.Fn inet6_rth_space "int" "int"
-.Ft "void *"
-.Fn inet6_rth_init "void *" "socklen_t" "int" "int"
-.Ft int
-.Fn inet6_rth_add "void *" "const struct in6_addr *"
-.Ft int
-.Fn inet6_rth_reverse "const void *" "void *"
-.Ft int
-.Fn inet6_rth_segments "const void *"
-.Ft "struct in6_addr *"
-.Fn inet6_rth_getaddr "const void *" "int"
-.\"
-.Sh DESCRIPTION
-The IPv6 Advanced API, RFC 3542, defines the functions that an
-application calls to build and examine IPv6 Routing headers.
-Routing headers are used to perform source routing in IPv6 networks.
-The RFC uses the word
-.Dq segments
-to describe addresses and that is the term used here as well.
-All of the functions are defined in the header file
-.In netinet/in.h .
-The functions described in this manual page all operate
-on routing header structures which are defined in
-.In netinet/ip6.h
-but which should not need to be modified outside the use of this API.
-The size and shape of the route header structures may change, so using
-the APIs is a more portable, long term, solution.
-.Pp
-The functions in the API are split into two groups, those that build a
-routing header and those that parse a received routing header.
-The builder functions are described first, followed by the parser functions.
-.Ss inet6_rth_space
-The
-.Fn inet6_rth_space
-function returns the number of bytes required to hold a Routing Header
-of the type, specified in the
-.Fa type
-argument and containing the number of addresses specified in the
-.Fa segments
-argument.
-When the type is
-.Dv IPV6_RTHDR_TYPE_0
-the number of segments must be from 0 through 127.
-The return value from this function is the number of bytes required to
-store the routing header.
-If the value 0 is returned then either the
-route header type was not recognized or another error occurred.
-.Ss inet6_rth_init
-The
-.Fn inet6_rth_init
-function initializes the pre-allocated buffer pointed to by
-.Fa bp
-to contain a routing header of the specified type.
-The
-.Fa bp_len
-argument is used to verify that the buffer is large enough.
-The caller must allocate the buffer pointed to by bp.
-The necessary buffer size should be determined by calling
-.Fn inet6_rth_space
-described in the previous sections.
-.Pp
-The
-.Fn inet6_rth_init
-function returns a pointer to
-.Fa bp
-on success and
-.Dv NULL
-when there is an error.
-.Ss inet6_rth_add
-The
-.Fn inet6_rth_add
-function adds the IPv6 address pointed to by
-.Fa addr
-to the end of the routing header being constructed.
-.Pp
-A successful addition results in the function returning 0, otherwise
-\-1 is returned.
-.Ss inet6_rth_reverse
-The
-.Fn inet6_rth_reverse
-function takes a routing header, pointed to by the
-argument
-.Fa in ,
-and writes a new routing header into the argument pointed to by
-.Fa out .
-The routing header at that sends datagrams along the reverse of that
-route.
-Both arguments are allowed to point to the same buffer meaning
-that the reversal can occur in place.
-.Pp
-The return value of the function is 0 on success, or \-1 when
-there is an error.
-.\"
-.Pp
-The next set of functions operate on a routing header that the
-application wants to parse.
-In the usual case such a routing header
-is received from the network, although these functions can also be
-used with routing headers that the application itself created.
-.Ss inet6_rth_segments
-The
-.Fn inet6_rth_segments
-function returns the number of segments contained in the
-routing header pointed to by
-.Fa bp .
-The return value is the number of segments contained in the routing
-header, or \-1 if an error occurred.
-It is not an error for 0 to be
-returned as a routing header may contain 0 segments.
-.\"
-.Ss inet6_rth_getaddr
-The
-.Fn inet6_rth_getaddr
-function is used to retrieve a single address from a routing header.
-The
-.Fa index
-is the location in the routing header from which the application wants
-to retrieve an address.
-The
-.Fa index
-parameter must have a value between 0 and one less than the number of
-segments present in the routing header.
-The
-.Fn inet6_rth_segments
-function, described in the last section, should be used to determine
-the total number of segments in the routing header.
-The
-.Fn inet6_rth_getaddr
-function returns a pointer to an IPv6 address on success or
-.Dv NULL
-when an error has occurred.
-.\"
-.Sh EXAMPLES
-RFC 3542 gives extensive examples in Section 21, Appendix B.
-KAME also provides examples in the advapitest directory of its kit.
-.\"
-.Sh DIAGNOSTICS
-The
-.Fn inet6_rth_space
-and
-.Fn inet6_rth_getaddr
-functions return 0 on errors.
-.Pp
-The
-.Fn inet6_rth_init
-function returns
-.Dv NULL
-on error.
-The
-.Fn inet6_rth_add
-and
-.Fn inet6_rth_reverse
-functions return 0 on success, or \-1 upon an error.
-.\"
-.Sh STANDARDS
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%D December 1998
-.%R RFC 2460
-.%T Internet Protocol, Version 6 (IPv6) Specification
-.Re
-.Pp
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%A E. Nordmark
-.%A T. Jinmei
-.%D May 2003
-.%R RFC 3542
-.%T Advanced Sockets Application Programming Interface (API) for IPv6
-.Re
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
diff --git a/src/lib/libc/net/inet_addr.3 b/src/lib/libc/net/inet_addr.3
deleted file mode 100644
index 129b08d277..0000000000
--- a/src/lib/libc/net/inet_addr.3
+++ /dev/null
@@ -1,195 +0,0 @@
-.\"     $OpenBSD: inet_addr.3,v 1.5 2019/08/30 20:06:07 jmc Exp $
-.\"     $NetBSD: inet.3,v 1.7 1997/06/18 02:25:24 lukem Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.\"     @(#)inet.3      8.1 (Berkeley) 6/4/93
-.\"
-.Dd $Mdocdate: August 30 2019 $
-.Dt INET_ADDR 3
-.Os
-.Sh NAME
-.Nm inet_aton ,
-.Nm inet_addr ,
-.Nm inet_network ,
-.Nm inet_ntoa
-.Nd Internet Protocol version 4 (IPv4) address manipulation routines
-.Sh SYNOPSIS
-.In arpa/inet.h
-.Ft int
-.Fn inet_aton "const char *cp" "struct in_addr *addr"
-.Ft in_addr_t
-.Fn inet_addr "const char *cp"
-.Ft in_addr_t
-.Fn inet_network "const char *cp"
-.Ft char *
-.Fn inet_ntoa "struct in_addr in"
-.Sh DESCRIPTION
-The functions presented here only support IPv4 addresses.
-In order to support IPv6 addresses as well,
-.Xr inet_ntop 3
-and
-.Xr inet_pton 3
-should be used rather than the functions presented here.
-Scoped IPv6 addresses are supported via
-.Xr getaddrinfo 3
-and
-.Xr getnameinfo 3 .
-.Pp
-The routines
-.Fn inet_aton ,
-.Fn inet_addr ,
-and
-.Fn inet_network
-interpret character strings representing
-numbers expressed in the Internet standard
-.Dq dot
-notation.
-.Pp
-The
-.Fn inet_aton
-routine interprets the specified character string as an Internet address,
-placing the address into the structure provided.
-It returns 1 if the string was successfully interpreted,
-or 0 if the string was invalid.
-.Pp
-The
-.Fn inet_addr
-and
-.Fn inet_network
-functions return numbers suitable for use
-as Internet addresses and Internet network
-numbers, respectively.
-Both functions return the constant
-.Dv INADDR_NONE
-if the specified character string is malformed.
-.Pp
-The routine
-.Fn inet_ntoa
-takes an Internet address and returns an
-ASCII string representing the address in dot notation.
-.Pp
-All Internet addresses are returned in network
-order (bytes ordered from left to right).
-All network numbers and local address parts are
-returned as machine format integer values.
-.Sh INTERNET ADDRESSES (IP VERSION 4)
-Values specified using dot notation take one of the following forms:
-.Bd -literal -offset indent
-a.b.c.d
-a.b.c
-a.b
-a
-.Ed
-.Pp
-When four parts are specified, each is interpreted
-as a byte of data and assigned, from left to right,
-to the four bytes of an Internet address.
-Note that when an Internet address is viewed as a 32-bit
-integer quantity on a system that uses little-endian
-byte order
-(such as AMD64 or ARM processors)
-the bytes referred to above appear as
-.Dq Li d.c.b.a .
-That is, little-endian bytes are ordered from right to left.
-.Pp
-When a three part address is specified, the last
-part is interpreted as a 16-bit quantity and placed
-in the rightmost two bytes of the network address.
-This makes the three part address format convenient
-for specifying Class B network addresses as
-.Dq Li 128.net.host .
-.Pp
-When a two part address is supplied, the last part
-is interpreted as a 24-bit quantity and placed in
-the rightmost three bytes of the network address.
-This makes the two part address format convenient
-for specifying Class A network addresses as
-.Dq Li net.host .
-.Pp
-When only one part is given, the value is stored
-directly in the network address without any byte
-rearrangement.
-.Pp
-All numbers supplied as
-.Dq parts
-in a dot notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr htonl 3 ,
-.Xr inet_lnaof 3 ,
-.Xr inet_net_ntop 3 ,
-.Xr inet_ntop 3 ,
-.Xr hosts 5
-.Sh STANDARDS
-The
-.Nm inet_addr
-and
-.Nm inet_aton
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Nm inet_addr
-and
-.Nm inet_network
-functions appeared in
-.Bx 4.2 .
-The
-.Nm inet_aton
-and
-.Nm inet_ntoa
-functions appeared in
-.Bx 4.3 .
-.Sh BUGS
-The value
-.Dv INADDR_NONE
-(0xffffffff) is a valid broadcast address, but
-.Fn inet_addr
-cannot return that value without indicating failure.
-Also,
-.Fn inet_addr
-should have been designed to return a
-.Li struct in_addr .
-The newer
-.Fn inet_aton
-function does not share these problems, and almost all existing code
-should be modified to use
-.Fn inet_aton
-instead.
-.Pp
-The problem of host byte ordering versus network byte ordering is
-confusing.
-.Pp
-The string returned by
-.Fn inet_ntoa
-resides in a static memory area.
diff --git a/src/lib/libc/net/inet_addr.c b/src/lib/libc/net/inet_addr.c
deleted file mode 100644
index 62d46ad664..0000000000
--- a/src/lib/libc/net/inet_addr.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*      $OpenBSD: inet_addr.c,v 1.12 2015/09/13 21:36:08 guenther Exp $ */
-
-/*
- * ++Copyright++ 1983, 1990, 1993
- * -
- * Copyright (c) 1983, 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * 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, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION 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.
- * -
- * --Copyright--
- */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-/*
- * Ascii internet address interpretation routine.
- * The value returned is in network order.
- */
-in_addr_t
-inet_addr(const char *cp)
-{
-        struct in_addr val;
-
-        if (inet_aton(cp, &val))
-                return (val.s_addr);
-        return (INADDR_NONE);
-}
-
-/* 
- * Check whether "cp" is a valid ascii representation
- * of an Internet address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- * This replaces inet_addr, the return value from which
- * cannot distinguish between failure and a local broadcast address.
- */
-int
-inet_aton(const char *cp, struct in_addr *addr)
-{
-        in_addr_t val;
-        int base, n;
-        char c;
-        u_int parts[4];
-        u_int *pp = parts;
-
-        c = *cp;
-        for (;;) {
-                /*
-                 * Collect number up to ``.''.
-                 * Values are specified as for C:
-                 * 0x=hex, 0=octal, isdigit=decimal.
-                 */
-                if (!isdigit((unsigned char)c))
-                        return (0);
-                val = 0; base = 10;
-                if (c == '0') {
-                        c = *++cp;
-                        if (c == 'x' || c == 'X')
-                                base = 16, c = *++cp;
-                        else
-                                base = 8;
-                }
-                for (;;) {
-                        if (isascii((unsigned char)c) &&
-                            isdigit((unsigned char)c)) {
-                                val = (val * base) + (c - '0');
-                                c = *++cp;
-                        } else if (base == 16 &&
-                            isascii((unsigned char)c) &&
-                            isxdigit((unsigned char)c)) {
-                                val = (val << 4) |
-                                    (c + 10 - (islower((unsigned char)c) ? 'a' : 'A'));
-                                c = *++cp;
-                        } else
-                                break;
-                }
-                if (c == '.') {
-                        /*
-                         * Internet format:
-                         *      a.b.c.d
-                         *      a.b.c   (with c treated as 16 bits)
-                         *      a.b     (with b treated as 24 bits)
-                         */
-                        if (pp >= parts + 3)
-                                return (0);
-                        *pp++ = val;
-                        c = *++cp;
-                } else
-                        break;
-        }
-        /*
-         * Check for trailing characters.
-         */
-        if (c != '\0' &&
-            (!isascii((unsigned char)c) || !isspace((unsigned char)c)))
-                return (0);
-        /*
-         * Concoct the address according to
-         * the number of parts specified.
-         */
-        n = pp - parts + 1;
-        switch (n) {
-
-        case 0:
-                return (0);             /* initial nondigit */
-
-        case 1:                         /* a -- 32 bits */
-                break;
-
-        case 2:                         /* a.b -- 8.24 bits */
-                if ((val > 0xffffff) || (parts[0] > 0xff))
-                        return (0);
-                val |= parts[0] << 24;
-                break;
-
-        case 3:                         /* a.b.c -- 8.8.16 bits */
-                if ((val > 0xffff) || (parts[0] > 0xff) || (parts[1] > 0xff))
-                        return (0);
-                val |= (parts[0] << 24) | (parts[1] << 16);
-                break;
-
-        case 4:                         /* a.b.c.d -- 8.8.8.8 bits */
-                if ((val > 0xff) || (parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff))
-                        return (0);
-                val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-                break;
-        }
-        if (addr)
-                addr->s_addr = htonl(val);
-        return (1);
-}
-DEF_WEAK(inet_aton);
diff --git a/src/lib/libc/net/inet_lnaof.3 b/src/lib/libc/net/inet_lnaof.3
deleted file mode 100644
index 6151f7fe34..0000000000
--- a/src/lib/libc/net/inet_lnaof.3
+++ /dev/null
@@ -1,89 +0,0 @@
-.\"     $OpenBSD: inet_lnaof.3,v 1.4 2019/08/30 20:06:07 jmc Exp $
-.\"     $NetBSD: inet.3,v 1.7 1997/06/18 02:25:24 lukem Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.\"     @(#)inet.3      8.1 (Berkeley) 6/4/93
-.\"
-.Dd $Mdocdate: August 30 2019 $
-.Dt INET_LNAOF 3
-.Os
-.Sh NAME
-.Nm inet_makeaddr ,
-.Nm inet_netof ,
-.Nm inet_lnaof
-.Nd routines for manipulating classful Internet Protocol version 4 (IPv4) addresses
-.Sh SYNOPSIS
-.In arpa/inet.h
-.Ft struct in_addr
-.Fn inet_makeaddr "in_addr_t net" "in_addr_t lna"
-.Ft in_addr_t
-.Fn inet_netof "struct in_addr in"
-.Ft in_addr_t
-.Fn inet_lnaof "struct in_addr in"
-.Sh DESCRIPTION
-As originally designed,
-IP version 4 split each address into a network part and local network
-address part, encoding that split into the address itself.
-It is frequency-encoded;
-the most-significant bit is clear in Class A addresses,
-in which the high-order 8 bits are the network number.
-Class B addresses use the high-order 16 bits as the network field,
-and Class C addresses have a 24-bit network part.
-.Pp
-The routine
-.Fn inet_makeaddr
-takes an Internet network number and a local
-network address and constructs an Internet address
-from it.
-.Pp
-The routines
-.Fn inet_netof
-and
-.Fn inet_lnaof
-break apart Internet host addresses, returning
-the network number and local network address part,
-respectively.
-.Pp
-All Internet addresses are returned in network
-order (bytes ordered from left to right).
-All network numbers and local address parts are
-returned as machine format integer values.
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr inet_addr 3 ,
-.Xr inet_net_ntop 3 ,
-.Xr hosts 5
-.Sh HISTORY
-The
-.Nm inet_makeaddr ,
-.Nm inet_lnaof ,
-and
-.Nm inet_netof
-functions appeared in
-.Bx 4.2 .
diff --git a/src/lib/libc/net/inet_lnaof.c b/src/lib/libc/net/inet_lnaof.c
deleted file mode 100644
index 92845387d3..0000000000
--- a/src/lib/libc/net/inet_lnaof.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*      $OpenBSD: inet_lnaof.c,v 1.7 2015/01/16 16:48:51 deraadt Exp $ */
-/*
- * Copyright (c) 1983, 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 <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Return the local network address portion of an
- * internet address; handles class a/b/c network
- * number formats.
- */
-in_addr_t
-inet_lnaof(struct in_addr in)
-{
-        in_addr_t i = ntohl(in.s_addr);
-
-        if (IN_CLASSA(i))
-                return ((i)&IN_CLASSA_HOST);
-        else if (IN_CLASSB(i))
-                return ((i)&IN_CLASSB_HOST);
-        else
-                return ((i)&IN_CLASSC_HOST);
-}
diff --git a/src/lib/libc/net/inet_makeaddr.c b/src/lib/libc/net/inet_makeaddr.c
deleted file mode 100644
index 88ddd2850e..0000000000
--- a/src/lib/libc/net/inet_makeaddr.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*      $OpenBSD: inet_makeaddr.c,v 1.7 2015/01/16 16:48:51 deraadt Exp $ */
-/*
- * Copyright (c) 1983, 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 <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Formulate an Internet address from network + host.  Used in
- * building addresses stored in the ifnet structure.
- */
-struct in_addr
-inet_makeaddr(in_addr_t net, in_addr_t host)
-{
-        in_addr_t addr;
-
-        if (net < 128)
-                addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
-        else if (net < 65536)
-                addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
-        else if (net < 16777216L)
-                addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
-        else
-                addr = net | host;
-        addr = htonl(addr);
-        return (*(struct in_addr *)&addr);
-}
diff --git a/src/lib/libc/net/inet_net_ntop.3 b/src/lib/libc/net/inet_net_ntop.3
deleted file mode 100644
index db10bf962c..0000000000
--- a/src/lib/libc/net/inet_net_ntop.3
+++ /dev/null
@@ -1,197 +0,0 @@
-.\"     $OpenBSD: inet_net_ntop.3,v 1.1 2019/08/30 18:33:17 deraadt Exp $
-.\"     $NetBSD: inet_net.3,v 1.1 1997/06/18 02:25:27 lukem Exp $
-.\"
-.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn.
-.\"
-.\" 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 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 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.
-.\"
-.Dd $Mdocdate: August 30 2019 $
-.Dt INET_NET_NTOP 3
-.Os
-.Sh NAME
-.Nm inet_net_ntop ,
-.Nm inet_net_pton
-.Nd Internet network number manipulation routines
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/in.h
-.In arpa/inet.h
-.Ft char *
-.Fn inet_net_ntop "int af" "const void *src" "int bits" "char *dst" "size_t size"
-.Ft int
-.Fn inet_net_pton "int af" "const char *src" "void *dst" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn inet_net_ntop
-function converts an Internet network number from network format (usually a
-.Li struct in_addr
-or some other binary form, in network byte order) to CIDR presentation format
-(suitable for external display purposes).
-.Fa bits
-is the number of bits in
-.Fa src
-that are the network number.
-It returns
-.Dv NULL
-if a system error occurs (in which case,
-.Va errno
-will have been set), or it returns a pointer to the destination string.
-.Pp
-The
-.Fn inet_net_pton
-function converts a presentation format Internet network number (that is,
-printable form as held in a character string) to network format (usually a
-.Li struct in_addr
-or some other internal binary representation, in network byte order).
-It returns the number of bits (either computed based on the class, or
-specified with /CIDR), or \-1 if a failure occurred
-(in which case
-.Va errno
-will have been set.
-It will be set to
-.Er ENOENT
-if the Internet network number was not valid).
-.Pp
-Caution:
-The
-.Fa dst
-field should be zeroed before calling
-.Fn inet_net_pton
-as the function will only fill the number of bytes necessary to
-encode the network number in network byte order.
-.Pp
-The only values for
-.Fa af
-currently supported are
-.Dv AF_INET
-and
-.Dv AF_INET6 .
-.Fa size
-is the size of the result buffer
-.Fa dst .
-.Sh NETWORK NUMBERS (IP VERSION 4)
-The external representation of Internet network numbers may be specified in
-one of the following forms:
-.Bd -literal -offset indent
-a
-a.b
-a.b.c
-a.b.c.d
-.Ed
-.Pp
-Any of the above four forms may have
-.Dq Li /bits
-appended where
-.Dq Li bits
-is in the range
-.Li 0-32
-and is used to explicitly specify the number of bits in the network address.
-When
-.Dq Li /bits
-is not specified the number of bits in the network address is calculated
-as the larger of the number of bits in the class to which the address
-belongs and the number of bits provided rounded up modulo 8.
-Examples:
-.Pp
-.Bl -tag -width 10.1.2.3/24 -offset indent -compact
-.It Li 10
-an 8-bit network number (class A), value
-.Li 10.0.0.0 .
-.It Li 192
-a 24-bit network number (class C), value
-.Li 192.0.0.0 .
-.It Li 10.10
-a 16-bit network number, value
-.Li 10.10.0.0 .
-.It Li 10.1.2
-a 24-bit network number, value
-.Li 10.1.2.0 .
-.It Li 10.1.2.3
-a 32-bit network number, value
-.Li 10.1.2.3 .
-.It Li 10.1.2.3/24
-a 24-bit network number (explicit), value
-.Li 10.1.2.3 .
-.El
-.Pp
-Note that when the number of bits is specified using
-.Dq Li /bits
-notation, the value of the address still includes all bits supplied
-in the external representation, even those bits which are the host
-part of an Internet address.
-Also, unlike
-.Xr inet_pton 3
-where the external representation is assumed to be a host address, the
-external representation for
-.Fn inet_net_pton
-is assumed to be a network address.
-Thus
-.Dq Li 10.1
-is assumed to be
-.Dq Li 10.1.0.0
-not
-.Dq Li 10.0.0.1
-.Pp
-All numbers supplied as
-.Dq parts
-in a
-.Ql \&.
-notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; otherwise, a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.Sh NETWORK NUMBERS (IP VERSION 6)
-See
-.Xr inet_pton 3
-for valid external representations of IP version 6 addresses.
-A valid external representation may have
-.Dq Li /bits
-appended where
-.Dq Li bits
-is in the range
-.Li 0-128
-and is used to explicitly specify the number of bits in the network address.
-When
-.Dq Li /bits
-is not specified 128 is used.
-Note that when the number of bits is specified using
-.Dq Li /bits
-notation, the value of the address still includes all bits supplied
-in the external representation, even those bits which are the host
-part of an Internet address.
-.Sh SEE ALSO
-.Xr htonl 3 ,
-.Xr inet_pton 3 ,
-.Xr inet 4 ,
-.Xr hosts 5
-.Sh HISTORY
-The
-.Nm inet_net_ntop
-and
-.Nm inet_net_pton
-functions first appeared in BIND 4.9.4.
diff --git a/src/lib/libc/net/inet_net_ntop.c b/src/lib/libc/net/inet_net_ntop.c
deleted file mode 100644
index 1f1c4bed12..0000000000
--- a/src/lib/libc/net/inet_net_ntop.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*      $OpenBSD: inet_net_ntop.c,v 1.9 2019/07/03 03:24:04 deraadt Exp $       */
-
-/*
- * Copyright (c) 2012 by Gilles Chehade <gilles@openbsd.org>
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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 <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-static char *inet_net_ntop_ipv4(const u_char *, int, char *, size_t);
-static char *inet_net_ntop_ipv6(const u_char *, int, char *, size_t);
-
-/*
- * char *
- * inet_net_ntop(af, src, bits, dst, size)
- *      convert network number from network to presentation format.
- *      generates CIDR style result always.
- * return:
- *      pointer to dst, or NULL if an error occurred (check errno).
- * author:
- *      Paul Vixie (ISC), July 1996
- */
-char *
-inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size)
-{
-        switch (af) {
-        case AF_INET:
-                return (inet_net_ntop_ipv4(src, bits, dst, size));
-        case AF_INET6:
-                return (inet_net_ntop_ipv6(src, bits, dst, size));
-        default:
-                errno = EAFNOSUPPORT;
-                return (NULL);
-        }
-}
-
-/*
- * static char *
- * inet_net_ntop_ipv4(src, bits, dst, size)
- *      convert IPv4 network number from network to presentation format.
- *      generates CIDR style result always.
- * return:
- *      pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *      network byte order assumed.  this means 192.5.5.240/28 has
- *      0x11110000 in its fourth octet.
- * author:
- *      Paul Vixie (ISC), July 1996
- */
-static char *
-inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
-{
-        char *odst = dst;
-        u_int m;
-        int b;
-        char *ep;
-        int advance;
-
-        ep = dst + size;
-        if (ep <= dst)
-                goto emsgsize;
-
-        if (bits < 0 || bits > 32) {
-                errno = EINVAL;
-                return (NULL);
-        }
-        if (bits == 0) {
-                if (ep - dst < sizeof "0")
-                        goto emsgsize;
-                *dst++ = '0';
-                *dst = '\0';
-        }
-
-        /* Format whole octets. */
-        for (b = bits / 8; b > 0; b--) {
-                if (ep - dst < sizeof "255.")
-                        goto emsgsize;
-                advance = snprintf(dst, ep - dst, "%u", *src++);
-                if (advance <= 0 || advance >= ep - dst)
-                        goto emsgsize;
-                dst += advance;
-                if (b > 1) {
-                        if (dst + 1 >= ep)
-                                goto emsgsize;
-                        *dst++ = '.';
-                        *dst = '\0';
-                }
-        }
-
-        /* Format partial octet. */
-        b = bits % 8;
-        if (b > 0) {
-                if (ep - dst < sizeof ".255")
-                        goto emsgsize;
-                if (dst != odst)
-                        *dst++ = '.';
-                m = ((1 << b) - 1) << (8 - b);
-                advance = snprintf(dst, ep - dst, "%u", *src & m);
-                if (advance <= 0 || advance >= ep - dst)
-                        goto emsgsize;
-                dst += advance;
-        }
-
-        /* Format CIDR /width. */
-        if (ep - dst < sizeof "/32")
-                goto emsgsize;
-        advance = snprintf(dst, ep - dst, "/%u", bits);
-        if (advance <= 0 || advance >= ep - dst)
-                goto emsgsize;
-        dst += advance;
-        return (odst);
-
- emsgsize:
-        errno = EMSGSIZE;
-        return (NULL);
-}
-
-static char *
-inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
-{
-        int     ret;
-        char    buf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255:255:255:255/128")];
-
-        if (bits < 0 || bits > 128) {
-                errno = EINVAL;
-                return (NULL);
-        }
-
-        if (inet_ntop(AF_INET6, src, buf, size) == NULL)
-                return (NULL);
-
-        ret = snprintf(dst, size, "%s/%d", buf, bits);
-        if (ret < 0 || ret >= size) {
-                errno = EMSGSIZE;
-                return (NULL); 
-        }
-
-        return (dst);
-}
diff --git a/src/lib/libc/net/inet_net_pton.c b/src/lib/libc/net/inet_net_pton.c
deleted file mode 100644
index aaffc1802a..0000000000
--- a/src/lib/libc/net/inet_net_pton.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*      $OpenBSD: inet_net_pton.c,v 1.11 2021/01/19 16:43:44 florian Exp $      */
-
-/*
- * Copyright (c) 2012 by Gilles Chehade <gilles@openbsd.org>
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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 <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-static int      inet_net_pton_ipv4(const char *, u_char *, size_t);
-static int      inet_net_pton_ipv6(const char *, u_char *, size_t);
-
-/*
- * static int
- * inet_net_pton(af, src, dst, size)
- *      convert network number from presentation to network format.
- *      accepts hex octets, hex strings, decimal octets, and /CIDR.
- *      "size" is in bytes and describes "dst".
- * return:
- *      number of bits, either imputed classfully or specified with /CIDR,
- *      or -1 if some failure occurred (check errno).  ENOENT means it was
- *      not a valid network specification.
- * author:
- *      Paul Vixie (ISC), June 1996
- */
-int
-inet_net_pton(int af, const char *src, void *dst, size_t size)
-{
-        switch (af) {
-        case AF_INET:
-                return (inet_net_pton_ipv4(src, dst, size));
-        case AF_INET6:
-                return (inet_net_pton_ipv6(src, dst, size));
-        default:
-                errno = EAFNOSUPPORT;
-                return (-1);
-        }
-}
-
-/*
- * static int
- * inet_net_pton_ipv4(src, dst, size)
- *      convert IPv4 network number from presentation to network format.
- *      accepts hex octets, hex strings, decimal octets, and /CIDR.
- *      "size" is in bytes and describes "dst".
- * return:
- *      number of bits, either imputed classfully or specified with /CIDR,
- *      or -1 if some failure occurred (check errno).  ENOENT means it was
- *      not an IPv4 network specification.
- * note:
- *      network byte order assumed.  this means 192.5.5.240/28 has
- *      0x11110000 in its fourth octet.
- * author:
- *      Paul Vixie (ISC), June 1996
- */
-static int
-inet_net_pton_ipv4(const char *src, u_char *dst, size_t size)
-{
-        static const char
-                xdigits[] = "0123456789abcdef",
-                digits[] = "0123456789";
-        int n, ch, tmp, dirty, bits;
-        const u_char *odst = dst;
-
-        ch = (unsigned char)*src++;
-        if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
-            && isascii((unsigned char)src[1]) && isxdigit((unsigned char)src[1])) {
-                /* Hexadecimal: Eat nybble string. */
-                if (size == 0)
-                        goto emsgsize;
-                tmp = 0, dirty = 0;
-                src++;  /* skip x or X. */
-                while ((ch = (unsigned char)*src++) != '\0' &&
-                    isascii(ch) && isxdigit(ch)) {
-                        if (isupper(ch))
-                                ch = tolower(ch);
-                        n = strchr(xdigits, ch) - xdigits;
-                        assert(n >= 0 && n <= 15);
-                        if (dirty == 0)
-                                tmp = n;
-                        else
-                                tmp = (tmp << 4) | n;
-                        if (++dirty == 2) {
-                                if (size-- == 0)
-                                        goto emsgsize;
-                                *dst++ = (u_char) tmp;
-                                dirty = 0;
-                        }
-                }
-                if (dirty) {  /* Odd trailing nybble? */
-                        if (size-- == 0)
-                                goto emsgsize;
-                        *dst++ = (u_char) (tmp << 4);
-                }
-        } else if (isascii(ch) && isdigit(ch)) {
-                /* Decimal: eat dotted digit string. */
-                for (;;) {
-                        tmp = 0;
-                        do {
-                                n = strchr(digits, ch) - digits;
-                                assert(n >= 0 && n <= 9);
-                                tmp *= 10;
-                                tmp += n;
-                                if (tmp > 255)
-                                        goto enoent;
-                        } while ((ch = (unsigned char)*src++) != '\0' &&
-                                 isascii(ch) && isdigit(ch));
-                        if (size-- == 0)
-                                goto emsgsize;
-                        *dst++ = (u_char) tmp;
-                        if (ch == '\0' || ch == '/')
-                                break;
-                        if (ch != '.')
-                                goto enoent;
-                        ch = (unsigned char)*src++;
-                        if (!isascii(ch) || !isdigit(ch))
-                                goto enoent;
-                }
-        } else
-                goto enoent;
-
-        bits = -1;
-        if (ch == '/' && isascii((unsigned char)src[0]) &&
-            isdigit((unsigned char)src[0]) && dst > odst) {
-                /* CIDR width specifier.  Nothing can follow it. */
-                ch = (unsigned char)*src++;     /* Skip over the /. */
-                bits = 0;
-                do {
-                        n = strchr(digits, ch) - digits;
-                        assert(n >= 0 && n <= 9);
-                        bits *= 10;
-                        bits += n;
-                        if (bits > 32)
-                                goto emsgsize;
-                } while ((ch = (unsigned char)*src++) != '\0' &&
-                         isascii(ch) && isdigit(ch));
-                if (ch != '\0')
-                        goto enoent;
-        }
-
-        /* Firey death and destruction unless we prefetched EOS. */
-        if (ch != '\0')
-                goto enoent;
-
-        /* If nothing was written to the destination, we found no address. */
-        if (dst == odst)
-                goto enoent;
-        /* If no CIDR spec was given, infer width from net class. */
-        if (bits == -1) {
-                if (*odst >= 240)       /* Class E */
-                        bits = 32;
-                else if (*odst >= 224)  /* Class D */
-                        bits = 4;
-                else if (*odst >= 192)  /* Class C */
-                        bits = 24;
-                else if (*odst >= 128)  /* Class B */
-                        bits = 16;
-                else                    /* Class A */
-                        bits = 8;
-                /* If imputed mask is narrower than specified octets, widen. */
-                if (bits < ((dst - odst) * 8))
-                        bits = (dst - odst) * 8;
-        }
-        /* Extend network to cover the actual mask. */
-        while (bits > ((dst - odst) * 8)) {
-                if (size-- == 0)
-                        goto emsgsize;
-                *dst++ = '\0';
-        }
-        return (bits);
-
- enoent:
-        errno = ENOENT;
-        return (-1);
-
- emsgsize:
-        errno = EMSGSIZE;
-        return (-1);
-}
-
-
-static int
-inet_net_pton_ipv6(const char *src, u_char *dst, size_t size)
-{
-        struct in6_addr  in6;
-        int              ret;
-        int              bits;
-        char             buf[INET6_ADDRSTRLEN + sizeof("/128")];
-        char            *sep;
-        const char      *errstr;
-
-        if (strlcpy(buf, src, sizeof buf) >= sizeof buf) {
-                errno = EMSGSIZE;
-                return (-1);
-        }
-
-        sep = strchr(buf, '/');
-        if (sep != NULL)
-                *sep++ = '\0';
-
-        ret = inet_pton(AF_INET6, buf, &in6);
-        if (ret != 1)
-                return (-1);
-
-        if (sep == NULL)
-                bits = 128;
-        else {
-                bits = strtonum(sep, 0, 128, &errstr);
-                if (errstr) {
-                        errno = EINVAL;
-                        return (-1);
-                }
-        }
-
-        if ((bits + 7) / 8 > size) {
-                errno = EMSGSIZE;
-                return (-1);
-        }
-        memcpy(dst, &in6.s6_addr, size);
-        return (bits);
-}
diff --git a/src/lib/libc/net/inet_neta.c b/src/lib/libc/net/inet_neta.c
deleted file mode 100644
index e3e7d0eb71..0000000000
--- a/src/lib/libc/net/inet_neta.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*      $OpenBSD: inet_neta.c,v 1.7 2005/08/06 20:30:03 espie Exp $     */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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 <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-/*
- * char *
- * inet_neta(src, dst, size)
- *      format an in_addr_t network number into presentation format.
- * return:
- *      pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *      format of ``src'' is as for inet_network().
- * author:
- *      Paul Vixie (ISC), July 1996
- */
-char *
-inet_neta(in_addr_t src, char *dst, size_t size)
-{
-        char *odst = dst;
-        char *ep;
-        int advance;
-
-        if (src == 0x00000000) {
-                if (size < sizeof "0.0.0.0")
-                        goto emsgsize;
-                strlcpy(dst, "0.0.0.0", size);
-                return dst;
-        }
-        ep = dst + size;
-        if (ep <= dst)
-                goto emsgsize;
-        while (src & 0xffffffff) {
-                u_char b = (src & 0xff000000) >> 24;
-
-                src <<= 8;
-                if (b || src) {
-                        if (ep - dst < sizeof "255.")
-                                goto emsgsize;
-                        advance = snprintf(dst, ep - dst, "%u", b);
-                        if (advance <= 0 || advance >= ep - dst)
-                                goto emsgsize;
-                        dst += advance;
-                        if (src != 0L) {
-                                if (dst + 1 >= ep)
-                                        goto emsgsize;
-                                *dst++ = '.';
-                                *dst = '\0';
-                        }
-                }
-        }
-        return (odst);
-
- emsgsize:
-        errno = EMSGSIZE;
-        return (NULL);
-}
diff --git a/src/lib/libc/net/inet_netof.c b/src/lib/libc/net/inet_netof.c
deleted file mode 100644
index 4efceede13..0000000000
--- a/src/lib/libc/net/inet_netof.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*      $OpenBSD: inet_netof.c,v 1.7 2015/01/16 16:48:51 deraadt Exp $ */
-/*
- * Copyright (c) 1983, 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 <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Return the network number from an internet
- * address; handles class a/b/c network #'s.
- */
-in_addr_t
-inet_netof(struct in_addr in)
-{
-        in_addr_t i = ntohl(in.s_addr);
-
-        if (IN_CLASSA(i))
-                return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
-        else if (IN_CLASSB(i))
-                return (((i)&IN_CLASSB_NET) >> IN_CLASSB_NSHIFT);
-        else
-                return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
-}
diff --git a/src/lib/libc/net/inet_network.c b/src/lib/libc/net/inet_network.c
deleted file mode 100644
index 7b0cf50e79..0000000000
--- a/src/lib/libc/net/inet_network.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*      $OpenBSD: inet_network.c,v 1.13 2015/10/22 23:55:51 mmcc Exp $ */
-/*
- * Copyright (c) 1983, 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 <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-/*
- * Internet network address interpretation routine.
- * The library routines call this routine to interpret
- * network numbers.
- */
-in_addr_t
-inet_network(const char *cp)
-{
-        in_addr_t val, base, n;
-        u_char c;
-        in_addr_t parts[4], *pp = parts;
-        int i;
-
-again:
-        val = 0; base = 10;
-        if (*cp == '0')
-                base = 8, cp++;
-        if (*cp == 'x' || *cp == 'X')
-                base = 16, cp++;
-        while ((c = *cp)) {
-                if (isdigit(c)) {
-                        val = (val * base) + (c - '0');
-                        cp++;
-                        continue;
-                }
-                if (base == 16 && isxdigit(c)) {
-                        val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A'));
-                        cp++;
-                        continue;
-                }
-                break;
-        }
-        if (*cp == '.') {
-                if (pp >= parts + 3)
-                        return (INADDR_NONE);
-                *pp++ = val, cp++;
-                goto again;
-        }
-        if (*cp && !isspace((unsigned char)*cp))
-                return (INADDR_NONE);
-        *pp++ = val;
-        n = pp - parts;
-        for (val = 0, i = 0; i < 4; i++) {
-                val <<= 8;
-                if (i < n)
-                        val |= parts[i] & 0xff;
-        }
-        return (val);
-}
-DEF_WEAK(inet_network);
diff --git a/src/lib/libc/net/inet_ntoa.c b/src/lib/libc/net/inet_ntoa.c
deleted file mode 100644
index ff5d93ded2..0000000000
--- a/src/lib/libc/net/inet_ntoa.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*      $OpenBSD: inet_ntoa.c,v 1.6 2005/08/06 20:30:03 espie Exp $ */
-/*
- * Copyright (c) 1983, 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.
- */
-
-/*
- * Convert network-format internet address
- * to base 256 d.d.d.d representation.
- */
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-
-char *
-inet_ntoa(struct in_addr in)
-{
-        static char b[18];
-        char *p;
-
-        p = (char *)&in;
-#define UC(b)   (((int)b)&0xff)
-        (void)snprintf(b, sizeof(b),
-            "%u.%u.%u.%u", UC(p[0]), UC(p[1]), UC(p[2]), UC(p[3]));
-        return (b);
-}
diff --git a/src/lib/libc/net/inet_ntop.3 b/src/lib/libc/net/inet_ntop.3
deleted file mode 100644
index 0e168c7d86..0000000000
--- a/src/lib/libc/net/inet_ntop.3
+++ /dev/null
@@ -1,212 +0,0 @@
-.\"     $OpenBSD: inet_ntop.3,v 1.4 2019/08/30 20:06:07 jmc Exp $
-.\"     $NetBSD: inet.3,v 1.7 1997/06/18 02:25:24 lukem Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.\"     @(#)inet.3      8.1 (Berkeley) 6/4/93
-.\"
-.Dd $Mdocdate: August 30 2019 $
-.Dt INET_NTOP 3
-.Os
-.Sh NAME
-.Nm inet_ntop ,
-.Nm inet_pton
-.Nd convert Internet addresses between presentation and network formats
-.Sh SYNOPSIS
-.In arpa/inet.h
-.Ft const char *
-.Fn inet_ntop "int af" "const void * restrict src" "char * restrict dst" "socklen_t size"
-.Ft int
-.Fn inet_pton "int af" "const char * restrict src" "void * restrict dst"
-.Sh DESCRIPTION
-The
-.Fn inet_pton
-function converts a presentation format address (that is, printable form
-as held in a character string) to network format (usually a
-.Li struct in_addr
-or some other internal binary representation, in network byte order).
-It returns 1 if the address was valid for the specified address family;
-0 if the address wasn't parseable in the specified address family; or \-1
-if some system error occurred (in which case
-.Va errno
-will have been set).
-This function is presently valid for
-.Dv AF_INET
-and
-.Dv AF_INET6 .
-.Pp
-The function
-.Fn inet_ntop
-converts an address from network format to presentation format.
-It returns
-.Dv NULL
-if a system
-error occurs (in which case,
-.Va errno
-will have been set), or it returns a pointer to the destination string.
-.Pp
-All Internet addresses are returned in network
-order (bytes ordered from left to right).
-.Sh INTERNET ADDRESSES (IP VERSION 4)
-Values must be specified using the standard dot notation:
-.Bd -literal -offset indent
-a.b.c.d
-.Ed
-.Pp
-All four parts must be decimal numbers between 0 and 255, inclusive,
-and are assigned, from left to right,
-to the four bytes of an Internet address.
-Note that when an Internet address is viewed as a 32-bit integer
-quantity on a system that uses little-endian byte order
-(such as AMD64 or ARM processors)
-the bytes referred to above appear as
-.Dq Li d.c.b.a .
-That is, little-endian bytes are ordered from right to left.
-.Sh INTERNET ADDRESSES (IP VERSION 6)
-In order to support scoped IPv6 addresses,
-.Xr getaddrinfo 3
-and
-.Xr getnameinfo 3
-are recommended rather than the functions presented here.
-.Pp
-The presentation format of an IPv6 address is given in RFC 4291:
-.Pp
-There are three conventional forms for representing IPv6 addresses as
-text strings:
-.Bl -enum
-.It
-The preferred form is x:x:x:x:x:x:x:x, where the 'x's are the
-hexadecimal values of the eight 16-bit pieces of the address.
-Examples:
-.Bd -literal -offset indent
-FEDC:BA98:7654:3210:FEDC:BA98:7654:3210
-1080:0:0:0:8:800:200C:417A
-.Ed
-.Pp
-Note that it is not necessary to write the leading zeros in an
-individual field, but there must be at least one numeral in
-every field (except for the case described in 2.).
-.It
-Due to the method of allocating certain styles of IPv6
-addresses, it will be common for addresses to contain long
-strings of zero bits.
-In order to make writing addresses
-containing zero bits easier, a special syntax is available to
-compress the zeros.
-The use of
-.Dq \&:\&:
-indicates multiple groups
-of 16 bits of zeros.
-The
-.Dq \&:\&:
-can only appear once in an
-address.
-The
-.Dq \&:\&:
-can also be used to compress the leading and/or trailing zeros in an address.
-.Pp
-For example the following addresses:
-.Bd -literal -offset indent
-1080:0:0:0:8:800:200C:417A  a unicast address
-FF01:0:0:0:0:0:0:43         a multicast address
-0:0:0:0:0:0:0:1             the loopback address
-0:0:0:0:0:0:0:0             the unspecified addresses
-.Ed
-.Pp
-may be represented as:
-.Bd -literal -offset indent
-1080::8:800:200C:417A       a unicast address
-FF01::43                    a multicast address
-::1                         the loopback address
-::                          the unspecified addresses
-.Ed
-.It
-An alternative form that is sometimes more convenient when
-dealing with a mixed environment of IPv4 and IPv6 nodes is
-x:x:x:x:x:x:d.d.d.d, where the 'x's are the hexadecimal values
-of the six high-order 16-bit pieces of the address, and the 'd's
-are the decimal values of the four low-order 8-bit pieces of the
-address (standard IPv4 representation).
-Examples:
-.Bd -literal -offset indent
-0:0:0:0:0:0:13.1.68.3
-0:0:0:0:0:FFFF:129.144.52.38
-.Ed
-.Pp
-or in compressed form:
-.Bd -literal -offset indent
-::13.1.68.3
-::FFFF:129.144.52.38
-.Ed
-.El
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr inet_addr 3 ,
-.Xr inet_net_ntop 3 ,
-.Xr hosts 5
-.Sh STANDARDS
-The
-.Nm inet_ntop
-and
-.Nm inet_pton
-functions conform to the IETF IPv6 BSD API and address formatting
-specifications, as well as
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Nm inet_pton
-and
-.Nm inet_ntop
-functions appeared in BIND 4.9.4.
-.Sh CAVEATS
-Note that
-.Nm inet_pton
-does not accept 1-, 2-, or 3-part dotted addresses;
-all four parts must be specified and must be in decimal
-(and not octal or hexadecimal).
-This is a narrower input set than that accepted by
-.Nm inet_aton .
-.Pp
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A J. McCann
-.%A W. Stevens
-.%D February 2003
-.%R RFC 3493
-.%T Basic Socket Interface Extensions for IPv6
-.Re
-.Pp
-.Rs
-.%A R. Hinden
-.%A S. Deering
-.%D February 2006
-.%R RFC 4291
-.%T IP Version 6 Addressing Architecture
-.Re
diff --git a/src/lib/libc/net/inet_ntop.c b/src/lib/libc/net/inet_ntop.c
deleted file mode 100644
index 2bb11c2ab2..0000000000
--- a/src/lib/libc/net/inet_ntop.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*      $OpenBSD: inet_ntop.c,v 1.13 2016/09/21 04:38:56 guenther Exp $ */
-
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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 <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4(const u_char *src, char *dst, size_t size);
-static const char *inet_ntop6(const u_char *src, char *dst, size_t size);
-
-/* const char *
- * inet_ntop(af, src, dst, size)
- *      convert a network format address to presentation format.
- * return:
- *      pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *      Paul Vixie, 1996.
- */
-const char *
-inet_ntop(int af, const void *src, char *dst, socklen_t size)
-{
-        switch (af) {
-        case AF_INET:
-                return (inet_ntop4(src, dst, size));
-        case AF_INET6:
-                return (inet_ntop6(src, dst, size));
-        default:
-                errno = EAFNOSUPPORT;
-                return (NULL);
-        }
-        /* NOTREACHED */
-}
-DEF_WEAK(inet_ntop);
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *      format an IPv4 address, more or less like inet_ntoa()
- * return:
- *      `dst' (as a const)
- * notes:
- *      (1) uses no statics
- *      (2) takes a u_char* not an in_addr as input
- * author:
- *      Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(const u_char *src, char *dst, size_t size)
-{
-        char tmp[sizeof "255.255.255.255"];
-        int l;
-
-        l = snprintf(tmp, sizeof(tmp), "%u.%u.%u.%u",
-            src[0], src[1], src[2], src[3]);
-        if (l <= 0 || l >= size) {
-                errno = ENOSPC;
-                return (NULL);
-        }
-        strlcpy(dst, tmp, size);
-        return (dst);
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *      convert IPv6 binary address into presentation (printable) format
- * author:
- *      Paul Vixie, 1996.
- */
-static const char *
-inet_ntop6(const u_char *src, char *dst, size_t size)
-{
-        /*
-         * Note that int32_t and int16_t need only be "at least" large enough
-         * to contain a value of the specified size.  On some systems, like
-         * Crays, there is no such thing as an integer variable with 16 bits.
-         * Keep this in mind if you think this function should have been coded
-         * to use pointer overlays.  All the world's not a VAX.
-         */
-        char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"];
-        char *tp, *ep;
-        struct { int base, len; } best, cur;
-        u_int words[IN6ADDRSZ / INT16SZ];
-        int i;
-        int advance;
-
-        /*
-         * Preprocess:
-         *      Copy the input (bytewise) array into a wordwise array.
-         *      Find the longest run of 0x00's in src[] for :: shorthanding.
-         */
-        memset(words, '\0', sizeof words);
-        for (i = 0; i < IN6ADDRSZ; i++)
-                words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-        best.base = -1;
-        cur.base = -1;
-        for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
-                if (words[i] == 0) {
-                        if (cur.base == -1)
-                                cur.base = i, cur.len = 1;
-                        else
-                                cur.len++;
-                } else {
-                        if (cur.base != -1) {
-                                if (best.base == -1 || cur.len > best.len)
-                                        best = cur;
-                                cur.base = -1;
-                        }
-                }
-        }
-        if (cur.base != -1) {
-                if (best.base == -1 || cur.len > best.len)
-                        best = cur;
-        }
-        if (best.base != -1 && best.len < 2)
-                best.base = -1;
-
-        /*
-         * Format the result.
-         */
-        tp = tmp;
-        ep = tmp + sizeof(tmp);
-        for (i = 0; i < (IN6ADDRSZ / INT16SZ) && tp < ep; i++) {
-                /* Are we inside the best run of 0x00's? */
-                if (best.base != -1 && i >= best.base &&
-                    i < (best.base + best.len)) {
-                        if (i == best.base) {
-                                if (tp + 1 >= ep) {
-                                        errno = ENOSPC;
-                                        return (NULL);
-                                }
-                                *tp++ = ':';
-                        }
-                        continue;
-                }
-                /* Are we following an initial run of 0x00s or any real hex? */
-                if (i != 0) {
-                        if (tp + 1 >= ep) {
-                                errno = ENOSPC;
-                                return (NULL);
-                        }
-                        *tp++ = ':';
-                }
-                /* Is this address an encapsulated IPv4? */
-                if (i == 6 && best.base == 0 &&
-                    (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
-                        if (!inet_ntop4(src+12, tp, ep - tp))
-                                return (NULL);
-                        tp += strlen(tp);
-                        break;
-                }
-                advance = snprintf(tp, ep - tp, "%x", words[i]);
-                if (advance <= 0 || advance >= ep - tp) {
-                        errno = ENOSPC;
-                        return (NULL);
-                }
-                tp += advance;
-        }
-        /* Was it a trailing run of 0x00's? */
-        if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) {
-                if (tp + 1 >= ep) {
-                        errno = ENOSPC;
-                        return (NULL);
-                }
-                *tp++ = ':';
-        }
-        if (tp + 1 >= ep) {
-                errno = ENOSPC;
-                return (NULL);
-        }
-        *tp++ = '\0';
-
-        /*
-         * Check for overflow, copy, and we're done.
-         */
-        if ((size_t)(tp - tmp) > size) {
-                errno = ENOSPC;
-                return (NULL);
-        }
-        strlcpy(dst, tmp, size);
-        return (dst);
-}
diff --git a/src/lib/libc/net/inet_pton.c b/src/lib/libc/net/inet_pton.c
deleted file mode 100644
index 5d7148e8e9..0000000000
--- a/src/lib/libc/net/inet_pton.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*      $OpenBSD: inet_pton.c,v 1.10 2015/09/13 21:36:08 guenther Exp $ */
-
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM 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 <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <string.h>
-#include <errno.h>
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static int      inet_pton4(const char *src, u_char *dst);
-static int      inet_pton6(const char *src, u_char *dst);
-
-/* int
- * inet_pton(af, src, dst)
- *      convert from presentation format (which usually means ASCII printable)
- *      to network format (which is usually some kind of binary format).
- * return:
- *      1 if the address was valid for the specified address family
- *      0 if the address wasn't valid (`dst' is untouched in this case)
- *      -1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- *      Paul Vixie, 1996.
- */
-int
-inet_pton(int af, const char *src, void *dst)
-{
-        switch (af) {
-        case AF_INET:
-                return (inet_pton4(src, dst));
-        case AF_INET6:
-                return (inet_pton6(src, dst));
-        default:
-                errno = EAFNOSUPPORT;
-                return (-1);
-        }
-        /* NOTREACHED */
-}
-DEF_WEAK(inet_pton);
-
-/* int
- * inet_pton4(src, dst)
- *      like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- *      1 if `src' is a valid dotted quad, else 0.
- * notice:
- *      does not touch `dst' unless it's returning 1.
- * author:
- *      Paul Vixie, 1996.
- */
-static int
-inet_pton4(const char *src, u_char *dst)
-{
-        static const char digits[] = "0123456789";
-        int saw_digit, octets, ch;
-        u_char tmp[INADDRSZ], *tp;
-
-        saw_digit = 0;
-        octets = 0;
-        *(tp = tmp) = 0;
-        while ((ch = *src++) != '\0') {
-                const char *pch;
-
-                if ((pch = strchr(digits, ch)) != NULL) {
-                        u_int new = *tp * 10 + (pch - digits);
-
-                        if (new > 255)
-                                return (0);
-                        if (! saw_digit) {
-                                if (++octets > 4)
-                                        return (0);
-                                saw_digit = 1;
-                        }
-                        *tp = new;
-                } else if (ch == '.' && saw_digit) {
-                        if (octets == 4)
-                                return (0);
-                        *++tp = 0;
-                        saw_digit = 0;
-                } else
-                        return (0);
-        }
-        if (octets < 4)
-                return (0);
-
-        memcpy(dst, tmp, INADDRSZ);
-        return (1);
-}
-
-/* int
- * inet_pton6(src, dst)
- *      convert presentation level address to network order binary form.
- * return:
- *      1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *      does not touch `dst' unless it's returning 1.
- * credit:
- *      inspired by Mark Andrews.
- * author:
- *      Paul Vixie, 1996.
- */
-static int
-inet_pton6(const char *src, u_char *dst)
-{
-        static const char xdigits_l[] = "0123456789abcdef",
-                          xdigits_u[] = "0123456789ABCDEF";
-        u_char tmp[IN6ADDRSZ], *tp, *endp, *colonp;
-        const char *xdigits, *curtok;
-        int ch, saw_xdigit, count_xdigit;
-        u_int val;
-
-        memset((tp = tmp), '\0', IN6ADDRSZ);
-        endp = tp + IN6ADDRSZ;
-        colonp = NULL;
-        /* Leading :: requires some special handling. */
-        if (*src == ':')
-                if (*++src != ':')
-                        return (0);
-        curtok = src;
-        saw_xdigit = count_xdigit = 0;
-        val = 0;
-        while ((ch = *src++) != '\0') {
-                const char *pch;
-
-                if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-                        pch = strchr((xdigits = xdigits_u), ch);
-                if (pch != NULL) {
-                        if (count_xdigit >= 4)
-                                return (0);
-                        val <<= 4;
-                        val |= (pch - xdigits);
-                        if (val > 0xffff)
-                                return (0);
-                        saw_xdigit = 1;
-                        count_xdigit++;
-                        continue;
-                }
-                if (ch == ':') {
-                        curtok = src;
-                        if (!saw_xdigit) {
-                                if (colonp)
-                                        return (0);
-                                colonp = tp;
-                                continue;
-                        } else if (*src == '\0') {
-                                return (0);
-                        }
-                        if (tp + INT16SZ > endp)
-                                return (0);
-                        *tp++ = (u_char) (val >> 8) & 0xff;
-                        *tp++ = (u_char) val & 0xff;
-                        saw_xdigit = 0;
-                        count_xdigit = 0;
-                        val = 0;
-                        continue;
-                }
-                if (ch == '.' && ((tp + INADDRSZ) <= endp) &&
-                    inet_pton4(curtok, tp) > 0) {
-                        tp += INADDRSZ;
-                        saw_xdigit = 0;
-                        count_xdigit = 0;
-                        break;  /* '\0' was seen by inet_pton4(). */
-                }
-                return (0);
-        }
-        if (saw_xdigit) {
-                if (tp + INT16SZ > endp)
-                        return (0);
-                *tp++ = (u_char) (val >> 8) & 0xff;
-                *tp++ = (u_char) val & 0xff;
-        }
-        if (colonp != NULL) {
-                /*
-                 * Since some memmove()'s erroneously fail to handle
-                 * overlapping regions, we'll do the shift by hand.
-                 */
-                const int n = tp - colonp;
-                int i;
-
-                if (tp == endp)
-                        return (0);
-                for (i = 1; i <= n; i++) {
-                        endp[- i] = colonp[n - i];
-                        colonp[n - i] = 0;
-                }
-                tp = endp;
-        }
-        if (tp != endp)
-                return (0);
-        memcpy(dst, tmp, IN6ADDRSZ);
-        return (1);
-}
diff --git a/src/lib/libc/net/ip6opt.c b/src/lib/libc/net/ip6opt.c
deleted file mode 100644
index 3837489448..0000000000
--- a/src/lib/libc/net/ip6opt.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*      $OpenBSD: ip6opt.c,v 1.10 2020/01/22 07:52:37 deraadt Exp $     */
-/*      $KAME: ip6opt.c,v 1.18 2005/06/15 07:11:35 keiichi Exp $        */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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 project 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 PROJECT 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 PROJECT 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 <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/ip6.h>
-
-#include <string.h>
-#include <stdio.h>
-
-static int ip6optlen(u_int8_t *opt, u_int8_t *lim);
-
-/*
- * Calculate the length of a given IPv6 option. Also checks
- * if the option is safely stored in user's buffer according to the
- * calculated length and the limitation of the buffer.
- */
-static int
-ip6optlen(u_int8_t *opt, u_int8_t *lim)
-{
-        int optlen;
-
-        if (*opt == IP6OPT_PAD1)
-                optlen = 1;
-        else {
-                /* is there enough space to store type and len? */
-                if (opt + 2 > lim)
-                        return (0);
-                optlen = *(opt + 1) + 2;
-        }
-        if (opt + optlen <= lim)
-                return (optlen);
-
-        return (0);
-}
-
-/*
- * The following functions are defined in RFC3542, which is a successor
- * of RFC2292.
- */
-
-int
-inet6_opt_init(void *extbuf, socklen_t extlen)
-{
-        struct ip6_ext *ext = (struct ip6_ext *)extbuf;
-
-        if (ext) {
-                if (extlen <= 0 || (extlen % 8))
-                        return (-1);
-                ext->ip6e_len = (extlen >> 3) - 1;
-        }
-
-        return (2);             /* sizeof the next and the length fields */
-}
-
-int
-inet6_opt_append(void *extbuf, socklen_t extlen, int offset, u_int8_t type,
-                 socklen_t len, u_int8_t align, void **databufp)
-{
-        int currentlen = offset, padlen = 0;
-
-        /*
-         * The option type must have a value from 2 to 255, inclusive.
-         * (0 and 1 are reserved for the Pad1 and PadN options, respectively.)
-         */
-#if 0 /* always false */
-        if (type < 2 || type > 255)
-#else
-        if (type < 2)
-#endif
-                return (-1);
-
-        /*
-         * The option data length must have a value between 0 and 255,
-         * inclusive, and is the length of the option data that follows.
-         */
-        if (len > 255)
-                return (-1);
-
-        /*
-         * The align parameter must have a value of 1, 2, 4, or 8.
-         * The align value can not exceed the value of len.
-         */
-        if (align != 1 && align != 2 && align != 4 && align != 8)
-                return (-1);
-        if (align > len)
-                return (-1);
-
-        /* Calculate the padding length. */
-        currentlen += 2 + len;  /* 2 means "type + len" */
-        if (currentlen % align)
-                padlen = align - (currentlen % align);
-
-        /* The option must fit in the extension header buffer. */
-        currentlen += padlen;
-        if (extlen &&           /* XXX: right? */
-            currentlen > extlen)
-                return (-1);
-
-        if (extbuf) {
-                u_int8_t *optp = (u_int8_t *)extbuf + offset;
-
-                if (padlen == 1) {
-                        /* insert a Pad1 option */
-                        *optp = IP6OPT_PAD1;
-                        optp++;
-                } else if (padlen > 0) {
-                        /* insert a PadN option for alignment */
-                        *optp++ = IP6OPT_PADN;
-                        *optp++ = padlen - 2;
-                        memset(optp, 0, padlen - 2);
-                        optp += (padlen - 2);
-                }
-
-                *optp++ = type;
-                *optp++ = len;
-
-                *databufp = optp;
-        }
-
-        return (currentlen);
-}
-
-int
-inet6_opt_finish(void *extbuf, socklen_t extlen, int offset)
-{
-        int updatelen = offset > 0 ? (1 + ((offset - 1) | 7)) : 0;
-
-        if (extbuf) {
-                u_int8_t *padp;
-                int padlen = updatelen - offset;
-
-                if (updatelen > extlen)
-                        return (-1);
-
-                padp = (u_int8_t *)extbuf + offset;
-                if (padlen == 1)
-                        *padp = IP6OPT_PAD1;
-                else if (padlen > 0) {
-                        *padp++ = IP6OPT_PADN;
-                        *padp++ = (padlen - 2);
-                        memset(padp, 0, padlen - 2);
-                }
-        }
-
-        return (updatelen);
-}
-
-int
-inet6_opt_set_val(void *databuf, int offset, void *val, socklen_t vallen)
-{
-
-        memcpy((u_int8_t *)databuf + offset, val, vallen);
-        return (offset + vallen);
-}
-
-int
-inet6_opt_next(void *extbuf, socklen_t extlen, int offset, u_int8_t *typep,
-               socklen_t *lenp, void **databufp)
-{
-        u_int8_t *optp, *lim;
-        int optlen;
-
-        /* Validate extlen. XXX: is the variable really necessary?? */
-        if (extlen == 0 || (extlen % 8))
-                return (-1);
-        lim = (u_int8_t *)extbuf + extlen;
-
-        /*
-         * If this is the first time this function called for this options
-         * header, simply return the 1st option.
-         * Otherwise, search the option list for the next option.
-         */
-        if (offset == 0)
-                optp = (u_int8_t *)((struct ip6_hbh *)extbuf + 1);
-        else
-                optp = (u_int8_t *)extbuf + offset;
-
-        /* Find the next option skipping any padding options. */
-        while (optp < lim) {
-                switch(*optp) {
-                case IP6OPT_PAD1:
-                        optp++;
-                        break;
-                case IP6OPT_PADN:
-                        if ((optlen = ip6optlen(optp, lim)) == 0)
-                                goto optend;
-                        optp += optlen;
-                        break;
-                default:        /* found */
-                        if ((optlen = ip6optlen(optp, lim)) == 0)
-                                goto optend;
-                        *typep = *optp;
-                        *lenp = optlen - 2;
-                        *databufp = optp + 2;
-                        return (optp + optlen - (u_int8_t *)extbuf);
-                }
-        }
-
-  optend:
-        *databufp = NULL; /* for safety */
-        return (-1);
-}
-
-int
-inet6_opt_find(void *extbuf, socklen_t extlen, int offset, u_int8_t type,
-               socklen_t *lenp, void **databufp)
-{
-        u_int8_t *optp, *lim;
-        int optlen;
-
-        /* Validate extlen. XXX: is the variable really necessary?? */
-        if (extlen == 0 || (extlen % 8))
-                return (-1);
-        lim = (u_int8_t *)extbuf + extlen;
-
-        /*
-         * If this is the first time this function called for this options
-         * header, simply return the 1st option.
-         * Otherwise, search the option list for the next option.
-         */
-        if (offset == 0)
-                optp = (u_int8_t *)((struct ip6_hbh *)extbuf + 1);
-        else
-                optp = (u_int8_t *)extbuf + offset;
-
-        /* Find the specified option */
-        while (optp < lim) {
-                if ((optlen = ip6optlen(optp, lim)) == 0)
-                        goto optend;
-
-                if (*optp == type) { /* found */
-                        *lenp = optlen - 2;
-                        *databufp = optp + 2;
-                        return (optp + optlen - (u_int8_t *)extbuf);
-                }
-
-                optp += optlen;
-        }
-
-  optend:
-        *databufp = NULL; /* for safety */
-        return (-1);
-}
-
-int
-inet6_opt_get_val(void *databuf, int offset, void *val, socklen_t vallen)
-{
-
-        /* we can't assume alignment here */
-        memcpy(val, (u_int8_t *)databuf + offset, vallen);
-
-        return (offset + vallen);
-}
diff --git a/src/lib/libc/net/link_ntoa.3 b/src/lib/libc/net/link_ntoa.3
deleted file mode 100644
index 8953677441..0000000000
--- a/src/lib/libc/net/link_ntoa.3
+++ /dev/null
@@ -1,78 +0,0 @@
-.\"     $OpenBSD: link_ntoa.3,v 1.2 2015/09/10 10:14:20 jmc Exp $
-.\"
-.\" Copyright (c) 1993
-.\"     The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley at BSDI.
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: September 10 2015 $
-.Dt LINK_NTOA 3
-.Os
-.Sh NAME
-.Nm link_ntoa
-.Nd elementary address specification routine for link level access
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/if_dl.h
-.Ft char *
-.Fn link_ntoa "const struct sockaddr_dl *sdl"
-.Sh DESCRIPTION
-The
-.Fn link_ntoa
-function takes
-a link-level
-address and returns an
-.Tn ASCII
-string representing some of the information present,
-including the link level address itself, and the interface name
-or number, if present.
-This facility is experimental and is
-still subject to change.
-.Sh RETURN VALUES
-.Fn link_ntoa
-always returns a NUL-terminated string.
-.Sh SEE ALSO
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Fn link_ntoa
-function appeared in
-.Bx 4.3 Reno .
-.Sh BUGS
-The returned values for
-.Fn link_ntoa
-reside in a static memory area.
-.Pp
-If the
-.Fa sdl_len
-field of the link socket address
-.Fa sdl
-is 0,
-.Fn link_ntoa
-will not insert a colon before the interface address bytes.
diff --git a/src/lib/libc/net/linkaddr.c b/src/lib/libc/net/linkaddr.c
deleted file mode 100644
index 9101e23a86..0000000000
--- a/src/lib/libc/net/linkaddr.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*      $OpenBSD: linkaddr.c,v 1.9 2016/12/08 03:20:50 millert 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 <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <string.h>
-
-static const char hexlist[] = "0123456789abcdef";
-
-char *
-link_ntoa(const struct sockaddr_dl *sdl)
-{
-        static char obuf[64];
-        char *out;
-        const u_char *in, *inlim;
-        int namelen, i, rem;
-
-        namelen = (sdl->sdl_nlen <= IFNAMSIZ) ? sdl->sdl_nlen : IFNAMSIZ;
-
-        out = obuf;
-        rem = sizeof(obuf);
-        if (namelen > 0) {
-                memcpy(out, sdl->sdl_data, namelen);
-                out += namelen;
-                rem -= namelen;
-                if (sdl->sdl_alen > 0) {
-                        *out++ = ':';
-                        rem--;
-                }
-        }
-
-        in = (const u_char *)sdl->sdl_data + sdl->sdl_nlen;
-        inlim = in + sdl->sdl_alen;
-
-        while (in < inlim && rem > 1) {
-                if (in != (const u_char *)sdl->sdl_data + sdl->sdl_nlen) {
-                        *out++ = '.';
-                        rem--;
-                }
-                i = *in++;
-                if (i > 0xf) {
-                        if (rem < 3)
-                                break;
-                        *out++ = hexlist[i >> 4];
-                        *out++ = hexlist[i & 0xf];
-                        rem -= 2;
-                } else {
-                        if (rem < 2)
-                                break;
-                        *out++ = hexlist[i];
-                        rem--;
-                }
-        }
-        *out = 0;
-        return (obuf);
-}
diff --git a/src/lib/libc/net/ntohl.c b/src/lib/libc/net/ntohl.c
deleted file mode 100644
index 0d05bac78a..0000000000
--- a/src/lib/libc/net/ntohl.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*      $OpenBSD: ntohl.c,v 1.7 2014/07/21 01:51:10 guenther Exp $ */
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-#include <sys/types.h>
-#include <endian.h>
-
-#undef ntohl
-
-u_int32_t
-ntohl(u_int32_t x)
-{
-#if BYTE_ORDER == LITTLE_ENDIAN
-        u_char *s = (u_char *)&x;
-        return (u_int32_t)(s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]);
-#else
-        return x;
-#endif
-}
diff --git a/src/lib/libc/net/ntohs.c b/src/lib/libc/net/ntohs.c
deleted file mode 100644
index b5ea361f83..0000000000
--- a/src/lib/libc/net/ntohs.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*      $OpenBSD: ntohs.c,v 1.9 2014/07/21 01:51:10 guenther Exp $ */
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-#include <sys/types.h>
-#include <endian.h>
-
-#undef ntohs
-
-u_int16_t
-ntohs(u_int16_t x)
-{
-#if BYTE_ORDER == LITTLE_ENDIAN
-        u_char *s = (u_char *) &x;
-        return (u_int16_t)(s[0] << 8 | s[1]);
-#else
-        return x;
-#endif
-}
diff --git a/src/lib/libc/net/rcmd.3 b/src/lib/libc/net/rcmd.3
deleted file mode 100644
index b2a5cdea9b..0000000000
--- a/src/lib/libc/net/rcmd.3
+++ /dev/null
@@ -1,232 +0,0 @@
-.\"     $OpenBSD: rcmd.3,v 1.34 2016/05/28 15:48:30 millert Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.Dd $Mdocdate: May 28 2016 $
-.Dt RCMD 3
-.Os
-.Sh NAME
-.Nm rcmd ,
-.Nm rcmd_af ,
-.Nm rresvport ,
-.Nm rresvport_af ,
-.Nm ruserok
-.Nd routines for returning a stream to a remote command
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn rcmd "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p"
-.Ft int
-.Fn rcmd_af "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p" "int af"
-.Ft int
-.Fn rresvport "int *port"
-.Ft int
-.Fn rresvport_af "int *port" "int af"
-.Ft int
-.Fn ruserok "const char *rhost" "int superuser" "const char *ruser" "const char *luser"
-.Sh DESCRIPTION
-The
-.Fn rcmd
-function is used by the superuser to execute a command on a remote
-machine using an authentication scheme based on reserved
-port numbers.
-If the calling process is not setuid, the
-.Ev RSH
-environment variable is set, and
-.Fa inport
-is
-.Dq shell/tcp ,
-.Xr rcmdsh 3
-is called instead with the value of
-.Ev RSH .
-Alternately, if the user is not the superuser,
-.Fn rcmd
-will invoke
-.Xr rcmdsh 3
-to run the command via
-.Xr ssh 1 .
-While
-.Fn rcmd
-can handle IPv4 cases only,
-the
-.Fn rcmd_af
-function can handle other cases as well.
-.Pp
-The
-.Fn rresvport
-and
-.Fn rresvport_af
-functions return a descriptor to a socket
-with an address in the privileged port space.
-The
-.Fn ruserok
-function is used by servers
-to authenticate clients requesting service with
-.Fn rcmd .
-.Pp
-The
-.Fn rcmd
-function looks up the host
-.Fa *ahost
-using
-.Xr getaddrinfo 3
-and, if the host exists,
-.Fa *ahost
-is set to the canonical name of the host.
-A connection is then established to a server
-residing at the well-known Internet port
-.Fa inport .
-If the user is not the superuser, the only valid port is
-.Dq shell/tcp
-(usually port 514).
-.Pp
-If the connection succeeds,
-a socket in the Internet domain of type
-.Dv SOCK_STREAM
-is returned to the caller, and given to the remote
-command as stdin and stdout.
-If
-.Fa fd2p
-is non-zero, then an auxiliary channel to a control
-process will be set up, and a descriptor for it will be placed
-in
-.Fa *fd2p .
-The control process will return diagnostic
-output from the command (unit 2) on this channel, and will also
-accept bytes on this channel as being
-.Tn UNIX
-signal numbers, to be
-forwarded to the process group of the command.
-If
-.Fa fd2p
-is
-.Va NULL ,
-then the standard error (unit 2 of the remote command) will be made
-the same as the standard output and no provision is made for sending
-arbitrary signals to the remote process, although you may be able to
-get its attention by using out-of-band data.
-Note that if the user is not the superuser,
-.Fa fd2p
-must be
-.Va NULL .
-.Pp
-.Fn rcmd_af
-takes address family in the last argument.
-If the last argument is
-.Dv AF_UNSPEC ,
-interpretation of
-.Fa *ahost
-will obey the underlying address resolution like DNS.
-.Pp
-The
-.Fn rresvport
-and
-.Fn rresvport_af
-functions are used to obtain a socket with a privileged
-address bound to it.
-This socket is suitable for use by
-.Fn rcmd
-and several other functions.
-Privileged Internet ports are those in the range 0 to
-.Va IPPORT_RESERVED - 1 ,
-which happens to be 1023.
-Only the superuser is allowed to bind an address of this sort to a socket.
-.Fn rresvport
-and
-.Fn rresvport_af
-need to be seeded with a port number; if that port
-is not available these functions will find another.
-.Pp
-The
-.Fn ruserok
-function takes a remote host's name, two user names,
-and a flag indicating whether the local user's
-name is that of the superuser.
-Then, if the user is
-.Em not
-the superuser, it checks the
-.Pa /etc/hosts.equiv
-file.
-If that lookup is not done, or is unsuccessful, the
-.Pa .rhosts
-in the local user's home directory is checked to see if the request for
-service is allowed.
-.Pp
-If this file does not exist, is not a regular file, is owned by anyone
-other than the user or the superuser, or is writeable by anyone other
-than the owner, the check automatically fails.
-Zero is returned if the machine name is listed in the
-.Pa hosts.equiv
-file, or the host and remote user name are found in the
-.Pa .rhosts
-file; otherwise
-.Fn ruserok
-returns \-1.
-If the local domain (as obtained from
-.Xr getaddrinfo 3 )
-is the same as the remote domain, only the machine name need be specified.
-.Pp
-.Fn ruserok
-implicitly requires trusting the DNS server for the remote host's domain.
-.Sh DIAGNOSTICS
-The
-.Fn rcmd
-function returns a valid socket descriptor on success.
-It returns \-1 on error and prints a diagnostic message on the standard error.
-.Pp
-The
-.Fn rresvport
-and
-.Fn rresvport_af
-functions return a valid, bound socket descriptor on success.
-It returns \-1 on error with the global value
-.Va errno
-set according to the reason for failure.
-The error code
-.Er EAGAIN
-is overloaded to mean
-.Dq all network ports in use .
-.Sh SEE ALSO
-.Xr ssh 1 ,
-.Xr intro 2 ,
-.Xr bindresvport 3 ,
-.Xr bindresvport_sa 3 ,
-.Xr rcmdsh 3
-.Sh HISTORY
-These
-functions appeared in
-.Bx 4.2 .
-.Pp
-The
-.Fn iruserok
-and
-.Fn iruserok_sa
-functions, IP address based versions of
-.Fn ruserok ,
-were removed in
-.Ox 6.0 .
diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c
deleted file mode 100644
index bf68603649..0000000000
--- a/src/lib/libc/net/rcmd.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1998 Theo de Raadt.  All rights reserved.
- * Copyright (c) 1983, 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. 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 <sys/socket.h>
-#include <sys/stat.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <signal.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <limits.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <syslog.h>
-#include <time.h>
-#include <stdlib.h>
-#include <poll.h>
-
-int
-rcmd(char **ahost, int rport, const char *locuser, const char *remuser,
-    const char *cmd, int *fd2p)
-{
-        return rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
-}
-
-int
-rcmd_af(char **ahost, int porta, const char *locuser, const char *remuser,
-    const char *cmd, int *fd2p, int af)
-{
-        static char hbuf[HOST_NAME_MAX+1];
-        char pbuf[NI_MAXSERV];
-        struct addrinfo hints, *res, *r;
-        int error;
-        struct sockaddr_storage from;
-        sigset_t oldmask, mask;
-        pid_t pid;
-        int s, lport;
-        struct timespec timo;
-        char c, *p;
-        int refused;
-        in_port_t rport = porta;
-        int numread;
-
-        /* call rcmdsh() with specified remote shell if appropriate. */
-        if (!issetugid() && (p = getenv("RSH")) && *p) {
-                struct servent *sp = getservbyname("shell", "tcp");
-
-                if (sp && sp->s_port == rport)
-                        return (rcmdsh(ahost, rport, locuser, remuser,
-                            cmd, p));
-        }
-
-        /* use rsh(1) if non-root and remote port is shell. */
-        if (geteuid()) {
-                struct servent *sp = getservbyname("shell", "tcp");
-
-                if (sp && sp->s_port == rport)
-                        return (rcmdsh(ahost, rport, locuser, remuser,
-                            cmd, NULL));
-        }
-
-        pid = getpid();
-        snprintf(pbuf, sizeof(pbuf), "%u", ntohs(rport));
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = af;
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags = AI_CANONNAME;
-        error = getaddrinfo(*ahost, pbuf, &hints, &res);
-        if (error) {
-                (void)fprintf(stderr, "rcmd: %s: %s\n", *ahost,
-                    gai_strerror(error));
-                return (-1);
-        }
-        if (res->ai_canonname) {
-                strlcpy(hbuf, res->ai_canonname, sizeof(hbuf));
-                *ahost = hbuf;
-        } else
-                ; /*XXX*/
-
-        r = res;
-        refused = 0;
-        timespecclear(&timo);
-        sigemptyset(&mask);
-        sigaddset(&mask, SIGURG);
-        sigprocmask(SIG_BLOCK, &mask, &oldmask);
-        for (timo.tv_sec = 1, lport = IPPORT_RESERVED - 1;;) {
-                s = rresvport_af(&lport, r->ai_family);
-                if (s < 0) {
-                        if (errno == EAGAIN)
-                                (void)fprintf(stderr,
-                                    "rcmd: socket: All ports in use\n");
-                        else
-                                (void)fprintf(stderr, "rcmd: socket: %s\n",
-                                    strerror(errno));
-                        if (r->ai_next) {
-                                r = r->ai_next;
-                                continue;
-                        } else {
-                                sigprocmask(SIG_SETMASK, &oldmask, NULL);
-                                freeaddrinfo(res);
-                                return (-1);
-                        }
-                }
-                fcntl(s, F_SETOWN, pid);
-                if (connect(s, r->ai_addr, r->ai_addrlen) >= 0)
-                        break;
-                (void)close(s);
-                if (errno == EADDRINUSE) {
-                        lport--;
-                        continue;
-                }
-                if (errno == ECONNREFUSED)
-                        refused++;
-                if (r->ai_next) {
-                        int oerrno = errno;
-                        char hbuf[NI_MAXHOST];
-                        const int niflags = NI_NUMERICHOST;
-
-                        hbuf[0] = '\0';
-                        if (getnameinfo(r->ai_addr, r->ai_addrlen,
-                            hbuf, sizeof(hbuf), NULL, 0, niflags) != 0)
-                                strlcpy(hbuf, "(invalid)", sizeof hbuf);
-                        (void)fprintf(stderr, "connect to address %s: ", hbuf);
-                        errno = oerrno;
-                        perror(0);
-                        r = r->ai_next;
-                        hbuf[0] = '\0';
-                        if (getnameinfo(r->ai_addr, r->ai_addrlen,
-                            hbuf, sizeof(hbuf), NULL, 0, niflags) != 0)
-                                strlcpy(hbuf, "(invalid)", sizeof hbuf);
-                        (void)fprintf(stderr, "Trying %s...\n", hbuf);
-                        continue;
-                }
-                if (refused && timo.tv_sec <= 16) {
-                        (void)nanosleep(&timo, NULL);
-                        timo.tv_sec *= 2;
-                        r = res;
-                        refused = 0;
-                        continue;
-                }
-                (void)fprintf(stderr, "%s: %s\n", res->ai_canonname,
-                    strerror(errno));
-                sigprocmask(SIG_SETMASK, &oldmask, NULL);
-                freeaddrinfo(res);
-                return (-1);
-        }
-        /* given "af" can be PF_UNSPEC, we need the real af for "s" */
-        af = r->ai_family;
-        freeaddrinfo(res);
-        if (fd2p == 0) {
-                write(s, "", 1);
-                lport = 0;
-        } else {
-                struct pollfd pfd[2];
-                char num[8];
-                int s2 = rresvport_af(&lport, af), s3;
-                socklen_t len = sizeof(from);
-
-                if (s2 < 0)
-                        goto bad;
-
-                listen(s2, 1);
-                (void)snprintf(num, sizeof(num), "%d", lport);
-                if (write(s, num, strlen(num)+1) != strlen(num)+1) {
-                        (void)fprintf(stderr,
-                            "rcmd: write (setting up stderr): %s\n",
-                            strerror(errno));
-                        (void)close(s2);
-                        goto bad;
-                }
-again:
-                pfd[0].fd = s;
-                pfd[0].events = POLLIN;
-                pfd[1].fd = s2;
-                pfd[1].events = POLLIN;
-
-                errno = 0;
-                if (poll(pfd, 2, INFTIM) < 1 ||
-                    (pfd[1].revents & (POLLIN|POLLHUP)) == 0) {
-                        if (errno != 0)
-                                (void)fprintf(stderr,
-                                    "rcmd: poll (setting up stderr): %s\n",
-                                    strerror(errno));
-                        else
-                                (void)fprintf(stderr,
-                                "poll: protocol failure in circuit setup\n");
-                        (void)close(s2);
-                        goto bad;
-                }
-                s3 = accept(s2, (struct sockaddr *)&from, &len);
-                if (s3 < 0) {
-                        (void)fprintf(stderr,
-                            "rcmd: accept: %s\n", strerror(errno));
-                        lport = 0;
-                        close(s2);
-                        goto bad;
-                }
-
-                /*
-                 * XXX careful for ftp bounce attacks. If discovered, shut them
-                 * down and check for the real auxiliary channel to connect.
-                 */
-                switch (from.ss_family) {
-                case AF_INET:
-                case AF_INET6:
-                        if (getnameinfo((struct sockaddr *)&from, len,
-                            NULL, 0, num, sizeof(num), NI_NUMERICSERV) == 0 &&
-                            atoi(num) != 20) {
-                                break;
-                        }
-                        close(s3);
-                        goto again;
-                default:
-                        break;
-                }
-                (void)close(s2);
-
-                *fd2p = s3;
-                switch (from.ss_family) {
-                case AF_INET:
-                case AF_INET6:
-                        if (getnameinfo((struct sockaddr *)&from, len,
-                            NULL, 0, num, sizeof(num), NI_NUMERICSERV) != 0 ||
-                            (atoi(num) >= IPPORT_RESERVED ||
-                             atoi(num) < IPPORT_RESERVED / 2)) {
-                                (void)fprintf(stderr,
-                                    "socket: protocol failure in circuit setup.\n");
-                                goto bad2;
-                        }
-                        break;
-                default:
-                        break;
-                }
-        }
-        (void)write(s, locuser, strlen(locuser)+1);
-        (void)write(s, remuser, strlen(remuser)+1);
-        (void)write(s, cmd, strlen(cmd)+1);
-        if ((numread = read(s, &c, 1)) != 1) {
-                (void)fprintf(stderr,
-                    "rcmd: %s: %s\n", *ahost,
-                    numread == -1 ? strerror(errno) : "Short read");
-                goto bad2;
-        }
-        if (c != 0) {
-                while (read(s, &c, 1) == 1) {
-                        (void)write(STDERR_FILENO, &c, 1);
-                        if (c == '\n')
-                                break;
-                }
-                goto bad2;
-        }
-        sigprocmask(SIG_SETMASK, &oldmask, NULL);
-        return (s);
-bad2:
-        if (lport)
-                (void)close(*fd2p);
-bad:
-        (void)close(s);
-        sigprocmask(SIG_SETMASK, &oldmask, NULL);
-        return (-1);
-}
-DEF_WEAK(rcmd_af);
-
diff --git a/src/lib/libc/net/rcmdsh.3 b/src/lib/libc/net/rcmdsh.3
deleted file mode 100644
index 9092d19f81..0000000000
--- a/src/lib/libc/net/rcmdsh.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"     $OpenBSD: rcmdsh.3,v 1.18 2016/05/28 15:48:30 millert Exp $
-.\"
-.\" Copyright (c) 1983, 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.
-.\"
-.Dd $Mdocdate: May 28 2016 $
-.Dt RCMDSH 3
-.Os
-.Sh NAME
-.Nm rcmdsh
-.Nd return a stream to a remote command without superuser
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn rcmdsh "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "char *rshprog"
-.Sh DESCRIPTION
-The
-.Fn rcmdsh
-function is used by normal users to execute a command on a remote machine
-using an authentication scheme based on reserved port numbers using
-.Xr ssh 1
-or the value of
-.Fa rshprog
-(if non-null).
-.Fa rshprog
-may be a fully-qualified path, a non-qualified command, or a command containing
-space-separated command line arguments.
-.Pp
-The
-.Fn rcmdsh
-function looks up the host
-.Fa *ahost
-using
-.Xr getaddrinfo 3
-and, if the host exists,
-.Fa *ahost
-is set to the canonical name of the host.
-A connection is then established to
-a server residing at the well-known Internet port
-.Li shell/tcp
-(or whatever port is used by
-.Fa rshprog ) .
-The parameter
-.Fa inport
-is ignored; it is only included to provide an interface similar to
-.Xr rcmd 3 .
-.Pp
-If the connection succeeds, a socket in the
-.Ux Ns -domain
-of type
-.Dv SOCK_STREAM
-is returned to the caller, and given to the remote
-command as stdin and stdout, and stderr.
-.Sh DIAGNOSTICS
-The
-.Fn rcmdsh
-function returns a valid socket descriptor on success.
-It returns \-1 on error and prints a diagnostic message on the standard error.
-.Sh SEE ALSO
-.Xr ssh 1 ,
-.Xr socketpair 2 ,
-.Xr rcmd 3
-.Sh HISTORY
-The
-.Fn rcmdsh
-function first appeared in
-.Ox 2.0 .
-.Sh BUGS
-If
-.Xr ssh 1
-encounters an error, a file descriptor is still returned instead of \-1.
diff --git a/src/lib/libc/net/rcmdsh.c b/src/lib/libc/net/rcmdsh.c
deleted file mode 100644
index 66caac3f3d..0000000000
--- a/src/lib/libc/net/rcmdsh.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*      $OpenBSD: rcmdsh.c,v 1.20 2019/06/28 13:32:42 deraadt Exp $     */ 
-
-/*
- * Copyright (c) 2001, MagniComp
- * 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 MagniComp 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 COPYRIGHT HOLDERS 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.
- */
-
-/*
- * This is an rcmd() replacement originally by 
- * Chris Siebenmann <cks@utcc.utoronto.ca>.
- */
-
-#include      <sys/types.h>
-#include      <sys/socket.h>
-#include      <sys/wait.h>
-#include      <signal.h>
-#include      <errno.h>
-#include      <limits.h>
-#include      <netdb.h>
-#include      <stdio.h>
-#include      <stdlib.h>
-#include      <string.h>
-#include      <pwd.h>
-#include      <paths.h>
-#include      <unistd.h>
-
-/*
- * This is a replacement rcmd() function that uses the ssh(1)
- * program in place of a direct rcmd(3) function call so as to
- * avoid having to be root.  Note that rport is ignored.
- */
-int
-rcmdsh(char **ahost, int rport, const char *locuser, const char *remuser,
-    const char *cmd, char *rshprog)
-{
-        static char hbuf[HOST_NAME_MAX+1];
-        struct addrinfo hint, *res;
-        int sp[2];
-        pid_t cpid;
-        char *p, pwbuf[_PW_BUF_LEN];
-        struct passwd pwstore, *pw = NULL;
-
-        /* What rsh/shell to use. */
-        if (rshprog == NULL)
-                rshprog = _PATH_RSH;
-
-        /* locuser must exist on this host. */
-        getpwnam_r(locuser, &pwstore, pwbuf, sizeof(pwbuf), &pw);
-        if (pw == NULL) {
-                (void) fprintf(stderr, "rcmdsh: unknown user: %s\n", locuser);
-                return(-1);
-        }
-
-        /* Validate remote hostname. */
-        if (strcmp(*ahost, "localhost") != 0) {
-                memset(&hint, 0, sizeof(hint));
-                hint.ai_family = PF_UNSPEC;
-                hint.ai_flags = AI_CANONNAME;
-                if (getaddrinfo(*ahost, NULL, &hint, &res) == 0) {
-                        if (res->ai_canonname) {
-                                strlcpy(hbuf, res->ai_canonname, sizeof(hbuf));
-                                *ahost = hbuf;
-                        }
-                        freeaddrinfo(res);
-                }
-        }
-
-        /* Get a socketpair we'll use for stdin and stdout. */
-        if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1) {
-                perror("rcmdsh: socketpair");
-                return(-1);
-        }
-
-        cpid = fork();
-        if (cpid == -1) {
-                perror("rcmdsh: fork failed");
-                return(-1);
-        } else if (cpid == 0) {
-                /*
-                 * Child.  We use sp[1] to be stdin/stdout, and close sp[0].
-                 */
-                (void) close(sp[0]);
-                if (dup2(sp[1], 0) == -1 || dup2(0, 1) == -1) {
-                        perror("rcmdsh: dup2 failed");
-                        _exit(255);
-                }
-                /* Fork again to lose parent. */
-                cpid = fork();
-                if (cpid == -1) {
-                        perror("rcmdsh: fork to lose parent failed");
-                        _exit(255);
-                }
-                if (cpid > 0)
-                        _exit(0);
-
-                /* In grandchild here.  Become local user for rshprog. */
-                if (setuid(pw->pw_uid)) {
-                        (void) fprintf(stderr, "rcmdsh: setuid(%u): %s\n",
-                                       pw->pw_uid, strerror(errno));
-                        _exit(255);
-                }
-
-                /*
-                 * If remote host is "localhost" and local and remote user
-                 * are the same, avoid running remote shell for efficiency.
-                 */
-                if (!strcmp(*ahost, "localhost") && !strcmp(locuser, remuser)) {
-                        char *argv[4];
-                        if (pw->pw_shell[0] == '\0')
-                                rshprog = _PATH_BSHELL;
-                        else
-                                rshprog = pw->pw_shell;
-                        p = strrchr(rshprog, '/');
-                        argv[0] = p ? p + 1 : rshprog;
-                        argv[1] = "-c";
-                        argv[2] = (char *)cmd;
-                        argv[3] = NULL;
-                        execvp(rshprog, argv);
-                } else if ((p = strchr(rshprog, ' ')) == NULL) {
-                        /* simple case */
-                        char *argv[6];
-                        p = strrchr(rshprog, '/');
-                        argv[0] = p ? p + 1 : rshprog;
-                        argv[1] = "-l";
-                        argv[2] = (char *)remuser;
-                        argv[3] = *ahost;
-                        argv[4] = (char *)cmd;
-                        argv[5] = NULL;
-                        execvp(rshprog, argv);
-                } else {
-                        /* must pull args out of rshprog and dyn alloc argv */
-                        char **argv, **ap;
-                        int n;
-                        for (n = 7; (p = strchr(++p, ' ')) != NULL; n++)
-                                continue;
-                        rshprog = strdup(rshprog);
-                        ap = argv = calloc(sizeof(char *), n);
-                        if (rshprog == NULL || argv == NULL) {
-                                perror("rcmdsh");
-                                _exit(255);
-                        }
-                        while ((p = strsep(&rshprog, " ")) != NULL) {
-                                if (*p == '\0')
-                                        continue;
-                                *ap++ = p;
-                        }
-                        if (ap != argv)         /* all spaces?!? */
-                                rshprog = argv[0];
-                        if ((p = strrchr(argv[0], '/')) != NULL)
-                                argv[0] = p + 1;
-                        *ap++ = "-l";
-                        *ap++ = (char *)remuser;
-                        *ap++ = *ahost;
-                        *ap++ = (char *)cmd;
-                        *ap++ = NULL;
-                        execvp(rshprog, argv);
-                }
-                (void) fprintf(stderr, "rcmdsh: execvp %s failed: %s\n",
-                               rshprog, strerror(errno));
-                _exit(255);
-        } else {
-                /* Parent. close sp[1], return sp[0]. */
-                (void) close(sp[1]);
-                /* Reap child. */
-                while (waitpid(cpid, NULL, 0) == -1 && errno == EINTR)
-                        ;
-                return(sp[0]);
-        }
-        /* NOTREACHED */
-}
-DEF_WEAK(rcmdsh);
diff --git a/src/lib/libc/net/recv.c b/src/lib/libc/net/recv.c
deleted file mode 100644
index 365d0e2e19..0000000000
--- a/src/lib/libc/net/recv.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*      $OpenBSD: recv.c,v 1.6 2015/10/04 07:17:27 guenther Exp $ */
-/*
- * Copyright (c) 1988, 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 <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-recv(int s, void *buf, size_t len, int flags)
-{
-        return (recvfrom(s, buf, len, flags, NULL, 0));
-}
-DEF_WEAK(recv);
diff --git a/src/lib/libc/net/res_comp.c b/src/lib/libc/net/res_comp.c
deleted file mode 100644
index e637f4a958..0000000000
--- a/src/lib/libc/net/res_comp.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/*      $OpenBSD: res_comp.c,v 1.20 2016/05/01 15:17:29 millert Exp $   */
-
-/*
- * ++Copyright++ 1985, 1993
- * -
- * Copyright (c) 1985, 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * 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, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION 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.
- * -
- * --Copyright--
- */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <resolv.h>
-#include <ctype.h>
-
-#include <unistd.h>
-#include <limits.h>
-#include <string.h>
-
-static int dn_find(u_char *, u_char *, u_char **, u_char **);
-
-/*
- * Expand compressed domain name 'comp_dn' to full domain name.
- * 'msg' is a pointer to the beginning of the message,
- * 'eomorig' points to the first location after the message,
- * 'exp_dn' is a pointer to a buffer of size 'length' for the result.
- * Return size of compressed name or -1 if there was an error.
- */
-int
-dn_expand(const u_char *msg, const u_char *eomorig, const u_char *comp_dn,
-    char *exp_dn, int length)
-{
-        const u_char *cp;
-        char *dn;
-        int n, c;
-        char *eom;
-        int len = -1, checked = 0;
-
-        dn = exp_dn;
-        cp = comp_dn;
-        if (length > HOST_NAME_MAX)
-                length = HOST_NAME_MAX;
-        eom = exp_dn + length;
-        /*
-         * fetch next label in domain name
-         */
-        while ((n = *cp++)) {
-                /*
-                 * Check for indirection
-                 */
-                switch (n & INDIR_MASK) {
-                case 0:
-                        if (dn != exp_dn) {
-                                if (dn >= eom)
-                                        return (-1);
-                                *dn++ = '.';
-                        }
-                        if (dn+n >= eom)
-                                return (-1);
-                        checked += n + 1;
-                        while (--n >= 0) {
-                                if (((c = *cp++) == '.') || (c == '\\')) {
-                                        if (dn + n + 2 >= eom)
-                                                return (-1);
-                                        *dn++ = '\\';
-                                }
-                                *dn++ = c;
-                                if (cp >= eomorig)      /* out of range */
-                                        return (-1);
-                        }
-                        break;
-
-                case INDIR_MASK:
-                        if (len < 0)
-                                len = cp - comp_dn + 1;
-                        cp = msg + (((n & 0x3f) << 8) | (*cp & 0xff));
-                        if (cp < msg || cp >= eomorig)  /* out of range */
-                                return (-1);
-                        checked += 2;
-                        /*
-                         * Check for loops in the compressed name;
-                         * if we've looked at the whole message,
-                         * there must be a loop.
-                         */
-                        if (checked >= eomorig - msg)
-                                return (-1);
-                        break;
-
-                default:
-                        return (-1);                    /* flag error */
-                }
-        }
-        *dn = '\0';
-        if (len < 0)
-                len = cp - comp_dn;
-        return (len);
-}
-DEF_WEAK(dn_expand);
-
-/*
- * Compress domain name 'exp_dn' into 'comp_dn'.
- * Return the size of the compressed name or -1.
- * 'length' is the size of the array pointed to by 'comp_dn'.
- * 'dnptrs' is a list of pointers to previous compressed names. dnptrs[0]
- * is a pointer to the beginning of the message. The list ends with NULL.
- * 'lastdnptr' is a pointer to the end of the arrary pointed to
- * by 'dnptrs'. Side effect is to update the list of pointers for
- * labels inserted into the message as we compress the name.
- * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
- * is NULL, we don't update the list.
- */
-int
-dn_comp(const char *exp_dn, u_char *comp_dn, int length, u_char **dnptrs,
-    u_char **lastdnptr)
-{
-        u_char *cp, *dn;
-        int c, l;
-        u_char **cpp, **lpp, *sp, *eob;
-        u_char *msg;
-
-        dn = (u_char *)exp_dn;
-        cp = comp_dn;
-        eob = cp + length;
-        lpp = cpp = NULL;
-        if (dnptrs != NULL) {
-                if ((msg = *dnptrs++) != NULL) {
-                        for (cpp = dnptrs; *cpp != NULL; cpp++)
-                                ;
-                        lpp = cpp;      /* end of list to search */
-                }
-        } else
-                msg = NULL;
-        for (c = *dn++; c != '\0'; ) {
-                /* look to see if we can use pointers */
-                if (msg != NULL) {
-                        if ((l = dn_find(dn-1, msg, dnptrs, lpp)) >= 0) {
-                                if (cp+1 >= eob)
-                                        return (-1);
-                                *cp++ = (l >> 8) | INDIR_MASK;
-                                *cp++ = l % 256;
-                                return (cp - comp_dn);
-                        }
-                        /* not found, save it */
-                        if (lastdnptr != NULL && cpp < lastdnptr-1) {
-                                *cpp++ = cp;
-                                *cpp = NULL;
-                        }
-                }
-                sp = cp++;      /* save ptr to length byte */
-                do {
-                        if (c == '.') {
-                                c = *dn++;
-                                break;
-                        }
-                        if (c == '\\') {
-                                if ((c = *dn++) == '\0')
-                                        break;
-                        }
-                        if (cp >= eob) {
-                                if (msg != NULL)
-                                        *lpp = NULL;
-                                return (-1);
-                        }
-                        *cp++ = c;
-                } while ((c = *dn++) != '\0');
-                /* catch trailing '.'s but not '..' */
-                if ((l = cp - sp - 1) == 0 && c == '\0') {
-                        cp--;
-                        break;
-                }
-                if (l <= 0 || l > MAXLABEL) {
-                        if (msg != NULL)
-                                *lpp = NULL;
-                        return (-1);
-                }
-                *sp = l;
-        }
-        if (cp >= eob) {
-                if (msg != NULL)
-                        *lpp = NULL;
-                return (-1);
-        }
-        *cp++ = '\0';
-        return (cp - comp_dn);
-}
-
-/*
- * Skip over a compressed domain name. Return the size or -1.
- */
-int
-__dn_skipname(const u_char *comp_dn, const u_char *eom)
-{
-        const u_char *cp;
-        int n;
-
-        cp = comp_dn;
-        while (cp < eom && (n = *cp++)) {
-                /*
-                 * check for indirection
-                 */
-                switch (n & INDIR_MASK) {
-                case 0:                 /* normal case, n == len */
-                        cp += n;
-                        continue;
-                case INDIR_MASK:        /* indirection */
-                        cp++;
-                        break;
-                default:                /* illegal type */
-                        return (-1);
-                }
-                break;
-        }
-        if (cp > eom)
-                return (-1);
-        return (cp - comp_dn);
-}
-
-static int
-mklower(int ch)
-{
-        if (isascii(ch) && isupper(ch))
-                return (tolower(ch));
-        return (ch);
-}
-
-/*
- * Search for expanded name from a list of previously compressed names.
- * Return the offset from msg if found or -1.
- * dnptrs is the pointer to the first name on the list,
- * not the pointer to the start of the message.
- */
-static int
-dn_find(u_char *exp_dn, u_char *msg, u_char **dnptrs, u_char **lastdnptr)
-{
-        u_char *dn, *cp, **cpp;
-        int n;
-        u_char *sp;
-
-        for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
-                dn = exp_dn;
-                sp = cp = *cpp;
-                while ((n = *cp++)) {
-                        /*
-                         * check for indirection
-                         */
-                        switch (n & INDIR_MASK) {
-                        case 0:         /* normal case, n == len */
-                                while (--n >= 0) {
-                                        if (*dn == '.')
-                                                goto next;
-                                        if (*dn == '\\')
-                                                dn++;
-                                        if (mklower(*dn++) != mklower(*cp++))
-                                                goto next;
-                                }
-                                if ((n = *dn++) == '\0' && *cp == '\0')
-                                        return (sp - msg);
-                                if (n == '.')
-                                        continue;
-                                goto next;
-
-                        case INDIR_MASK:        /* indirection */
-                                cp = msg + (((n & 0x3f) << 8) | *cp);
-                                break;
-
-                        default:        /* illegal type */
-                                return (-1);
-                        }
-                }
-                if (*dn == '\0')
-                        return (sp - msg);
-        next:   ;
-        }
-        return (-1);
-}
-
-/*
- * Verify that a domain name uses an acceptable character set.
- */
-
-/*
- * Note the conspicuous absence of ctype macros in these definitions.  On
- * non-ASCII hosts, we can't depend on string literals or ctype macros to
- * tell us anything about network-format data.  The rest of the BIND system
- * is not careful about this, but for some reason, we're doing it right here.
- */
-#define PERIOD 0x2e
-#define hyphenchar(c) ((c) == 0x2d)
-#define bslashchar(c) ((c) == 0x5c)
-#define underscorechar(c) ((c) == 0x5f)
-#define periodchar(c) ((c) == PERIOD)
-#define asterchar(c) ((c) == 0x2a)
-#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
-                   || ((c) >= 0x61 && (c) <= 0x7a))
-#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
-
-#define borderchar(c) (alphachar(c) || digitchar(c))
-#define middlechar(c) (borderchar(c) || hyphenchar(c) || underscorechar(c))
-#define domainchar(c) ((c) > 0x20 && (c) < 0x7f)
-
-int
-__res_hnok(const char *dn)
-{
-        int pch = PERIOD, ch = *dn++;
-
-        while (ch != '\0') {
-                int nch = *dn++;
-
-                if (periodchar(ch)) {
-                        ;
-                } else if (periodchar(pch)) {
-                        if (!borderchar(ch))
-                                return (0);
-                } else if (periodchar(nch) || nch == '\0') {
-                        if (!borderchar(ch))
-                                return (0);
-                } else {
-                        if (!middlechar(ch))
-                                return (0);
-                }
-                pch = ch, ch = nch;
-        }
-        return (1);
-}
-DEF_STRONG(__res_hnok);
-
-/*
- * hostname-like (A, MX, WKS) owners can have "*" as their first label
- * but must otherwise be as a host name.
- */
-int
-res_ownok(const char *dn)
-{
-        if (asterchar(dn[0])) {
-                if (periodchar(dn[1]))
-                        return (res_hnok(dn+2));
-                if (dn[1] == '\0')
-                        return (1);
-        }
-        return (res_hnok(dn));
-}
-
-/*
- * SOA RNAMEs and RP RNAMEs can have any printable character in their first
- * label, but the rest of the name has to look like a host name.
- */
-int
-res_mailok(const char *dn)
-{
-        int ch, escaped = 0;
-
-        /* "." is a valid missing representation */
-        if (*dn == '\0')
-                return(1);
-
-        /* otherwise <label>.<hostname> */
-        while ((ch = *dn++) != '\0') {
-                if (!domainchar(ch))
-                        return (0);
-                if (!escaped && periodchar(ch))
-                        break;
-                if (escaped)
-                        escaped = 0;
-                else if (bslashchar(ch))
-                        escaped = 1;
-        }
-        if (periodchar(ch))
-                return (res_hnok(dn));
-        return(0);
-}
-
-/*
- * This function is quite liberal, since RFC 1034's character sets are only
- * recommendations.
- */
-int
-res_dnok(const char *dn)
-{
-        int ch;
-
-        while ((ch = *dn++) != '\0')
-                if (!domainchar(ch))
-                        return (0);
-        return (1);
-}
-
-/*
- * Routines to insert/extract short/long's.
- */
-
-u_int16_t
-_getshort(const u_char *msgp)
-{
-        u_int16_t u;
-
-        GETSHORT(u, msgp);
-        return (u);
-}
-DEF_STRONG(_getshort);
-
-u_int32_t
-_getlong(const u_char *msgp)
-{
-        u_int32_t u;
-
-        GETLONG(u, msgp);
-        return (u);
-}
-DEF_STRONG(_getlong);
-
-void
-__putshort(u_int16_t s, u_char *msgp)
-{
-        PUTSHORT(s, msgp);
-}
-
-void
-__putlong(u_int32_t l, u_char *msgp)
-{
-        PUTLONG(l, msgp);
-}
diff --git a/src/lib/libc/net/res_data.c b/src/lib/libc/net/res_data.c
deleted file mode 100644
index 6e81b584a9..0000000000
--- a/src/lib/libc/net/res_data.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*      $OpenBSD: res_data.c,v 1.4 2015/01/16 16:48:51 deraadt Exp $    */
-
-/*
- * ++Copyright++ 1995
- * -
- * Copyright (c) 1995
- *    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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * 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, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION 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.
- * -
- * --Copyright--
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-const char *_res_opcodes[] = {
-        "QUERY",
-        "IQUERY",
-        "CQUERYM",
-        "CQUERYU",      /* experimental */
-        "NOTIFY",       /* experimental */
-        "5",
-        "6",
-        "7",
-        "8",
-        "UPDATEA",
-        "UPDATED",
-        "UPDATEDA",
-        "UPDATEM",
-        "UPDATEMA",
-        "ZONEINIT",
-        "ZONEREF",
-};
-
-const char *_res_resultcodes[] = {
-        "NOERROR",
-        "FORMERR",
-        "SERVFAIL",
-        "NXDOMAIN",
-        "NOTIMP",
-        "REFUSED",
-        "6",
-        "7",
-        "8",
-        "9",
-        "10",
-        "11",
-        "12",
-        "13",
-        "14",
-        "NOCHANGE",
-};
diff --git a/src/lib/libc/net/res_debug_syms.c b/src/lib/libc/net/res_debug_syms.c
deleted file mode 100644
index fc26f03e74..0000000000
--- a/src/lib/libc/net/res_debug_syms.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*      $OpenBSD: res_debug_syms.c,v 1.2 2015/10/05 02:57:16 guenther Exp $     */
-
-/*
- * ++Copyright++ 1985, 1990, 1993
- * -
- * Copyright (c) 1985, 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * 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, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION 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.
- * -
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- * --Copyright--
- */
-
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <resolv.h>
-#include <stdio.h>
-
-/*
- * Names of RR classes and qclasses.  Classes and qclasses are the same, except
- * that C_ANY is a qclass but not a class.  (You can ask for records of class
- * C_ANY, but you can't have any records of that class in the database.)
- */
-const struct res_sym __p_class_syms[] = {
-        {C_IN,          "IN"},
-        {C_CHAOS,       "CHAOS"},
-        {C_HS,          "HS"},
-        {C_HS,          "HESIOD"},
-        {C_ANY,         "ANY"},
-        {C_IN,          (char *)0}
-};
-
-/*
- * Names of RR types and qtypes.  Types and qtypes are the same, except
- * that T_ANY is a qtype but not a type.  (You can ask for records of type
- * T_ANY, but you can't have any records of that type in the database.)
- */
-const struct res_sym __p_type_syms[] = {
-        {T_A,           "A",            "address"},
-        {T_NS,          "NS",           "name server"},
-        {T_MD,          "MD",           "mail destination (deprecated)"},
-        {T_MF,          "MF",           "mail forwarder (deprecated)"},
-        {T_CNAME,       "CNAME",        "canonical name"},
-        {T_SOA,         "SOA",          "start of authority"},
-        {T_MB,          "MB",           "mailbox"},
-        {T_MG,          "MG",           "mail group member"},
-        {T_MR,          "MR",           "mail rename"},
-        {T_NULL,        "NULL",         "null"},
-        {T_WKS,         "WKS",          "well-known service (deprecated)"},
-        {T_PTR,         "PTR",          "domain name pointer"},
-        {T_HINFO,       "HINFO",        "host information"},
-        {T_MINFO,       "MINFO",        "mailbox information"},
-        {T_MX,          "MX",           "mail exchanger"},
-        {T_TXT,         "TXT",          "text"},
-        {T_RP,          "RP",           "responsible person"},
-        {T_AFSDB,       "AFSDB",        "DCE or AFS server"},
-        {T_X25,         "X25",          "X25 address"},
-        {T_ISDN,        "ISDN",         "ISDN address"},
-        {T_RT,          "RT",           "router"},
-        {T_NSAP,        "NSAP",         "nsap address"},
-        {T_NSAP_PTR,    "NSAP_PTR",     "domain name pointer"},
-        {T_SIG,         "SIG",          "signature"},
-        {T_KEY,         "KEY",          "key"},
-        {T_PX,          "PX",           "mapping information"},
-        {T_GPOS,        "GPOS",         "geographical position (withdrawn)"},
-        {T_AAAA,        "AAAA",         "IPv6 address"},
-        {T_LOC,         "LOC",          "location"},
-        {T_NXT,         "NXT",          "next valid name (unimplemented)"},
-        {T_EID,         "EID",          "endpoint identifier (unimplemented)"},
-        {T_NIMLOC,      "NIMLOC",       "NIMROD locator (unimplemented)"},
-        {T_SRV,         "SRV",          "server selection"},
-        {T_ATMA,        "ATMA",         "ATM address (unimplemented)"},
-        {T_IXFR,        "IXFR",         "incremental zone transfer"},
-        {T_AXFR,        "AXFR",         "zone transfer"},
-        {T_MAILB,       "MAILB",        "mailbox-related data (deprecated)"},
-        {T_MAILA,       "MAILA",        "mail agent (deprecated)"},
-        {T_UINFO,       "UINFO",        "user information (nonstandard)"},
-        {T_UID,         "UID",          "user ID (nonstandard)"},
-        {T_GID,         "GID",          "group ID (nonstandard)"},
-        {T_NAPTR,       "NAPTR",        "URN Naming Authority"},
-#ifdef ALLOW_T_UNSPEC
-        {T_UNSPEC,      "UNSPEC",       "unspecified data (nonstandard)"},
-#endif /* ALLOW_T_UNSPEC */
-        {T_ANY,         "ANY",          "\"any\""},
-        {0,             NULL,           NULL}
-};
-
-const char *
-__sym_ntos(const struct res_sym *syms, int number, int *success)
-{
-        static char unname[20];
-
-        for (; syms->name != 0; syms++) {
-                if (number == syms->number) {
-                        if (success)
-                                *success = 1;
-                        return (syms->name);
-                }
-        }
-
-        snprintf(unname, sizeof unname, "%d", number);
-        if (success)
-                *success = 0;
-        return (unname);
-}
-DEF_STRONG(__sym_ntos);
-
-/*
- * Return a string for the type
- */
-const char *
-__p_type(int type)
-{
-        return (__sym_ntos (__p_type_syms, type, (int *)0));
-}
-DEF_STRONG(__p_type);
-
-/*
- * Return a mnemonic for class
- */
-const char *
-__p_class(int class)
-{
-        return (__sym_ntos (__p_class_syms, class, (int *)0));
-}
-DEF_STRONG(__p_class);
-
diff --git a/src/lib/libc/net/res_init.3 b/src/lib/libc/net/res_init.3
deleted file mode 100644
index 4a4d0950a5..0000000000
--- a/src/lib/libc/net/res_init.3
+++ /dev/null
@@ -1,416 +0,0 @@
-.\"     $OpenBSD: res_init.3,v 1.4 2020/04/25 21:06:17 jca Exp $
-.\"
-.\" Copyright (c) 1985, 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.
-.\"
-.Dd $Mdocdate: April 25 2020 $
-.Dt RES_INIT 3
-.Os
-.Sh NAME
-.Nm res_query ,
-.Nm res_search ,
-.Nm res_mkquery ,
-.Nm res_send ,
-.Nm res_init ,
-.Nm dn_comp ,
-.Nm dn_expand
-.Nd resolver routines
-.Sh SYNOPSIS
-.In sys/types.h
-.In netinet/in.h
-.In arpa/nameser.h
-.In resolv.h
-.Ft int
-.Fo res_query
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "unsigned char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_search
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "unsigned char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_mkquery
-.Fa "int op"
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "const unsigned char *data"
-.Fa "int datalen"
-.Fa "const unsigned char *newrr"
-.Fa "unsigned char *buf"
-.Fa "int buflen"
-.Fc
-.Ft int
-.Fo res_send
-.Fa "const unsigned char *msg"
-.Fa "int msglen"
-.Fa "unsigned char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fn res_init "void"
-.Ft int
-.Fo dn_comp
-.Fa "const char *exp_dn"
-.Fa "unsigned char *comp_dn"
-.Fa "int length"
-.Fa "unsigned char **dnptrs"
-.Fa "unsigned char **lastdnptr"
-.Fc
-.Ft int
-.Fo dn_expand
-.Fa "const unsigned char *msg"
-.Fa "const unsigned char *eomorig"
-.Fa "const unsigned char *comp_dn"
-.Fa "char *exp_dn"
-.Fa "int length"
-.Fc
-.Sh DESCRIPTION
-These routines are used for making, sending, and interpreting
-query and reply messages with Internet domain name servers.
-.Pp
-Global configuration and state information that is used by the
-resolver routines is kept in the structure
-.Va _res .
-Most of the values have reasonable defaults and can be ignored.
-Options stored in
-.Va _res.options
-are defined in
-.In resolv.h
-and are as follows.
-Options are stored as a simple bit mask containing the bitwise OR
-of the options enabled.
-.Bl -tag -width RES_USE_DNSSEC
-.It Dv RES_INIT
-True if the initial name server address and default domain name are
-initialized (i.e.\&
-.Fn res_init
-has been called).
-.It Dv RES_DEBUG
-Print debugging messages,
-if libc is compiled with
-.Dv DEBUG .
-By default on
-.Ox
-this option does nothing.
-.It Dv RES_AAONLY
-Accept authoritative answers only.
-With this option,
-.Fn res_send
-should continue until it finds an authoritative answer or finds an error.
-On
-.Ox
-this option does nothing.
-.It Dv RES_USEVC
-Use TCP connections for queries instead of UDP datagrams.
-.It Dv RES_PRIMARY
-Query the primary name server only.
-On
-.Ox
-this option does nothing.
-.It Dv RES_IGNTC
-Ignore truncation errors, i.e. don't retry with TCP.
-.It Dv RES_RECURSE
-Set the recursion-desired bit in queries.
-.Pf ( Fn res_send
-does not do iterative queries and expects the name server
-to handle recursion.)
-This option is enabled by default.
-.It Dv RES_DEFNAMES
-If set,
-.Fn res_search
-will append the default domain name to single-component names
-(those that do not contain a dot).
-This option is enabled by default.
-.It Dv RES_STAYOPEN
-Used with
-.Dv RES_USEVC
-to keep the TCP connection open between queries.
-This is useful only in programs that regularly do many queries.
-UDP should be the normal mode used.
-.It Dv RES_DNSRCH
-If this option is set,
-.Fn res_search
-will search for host names in the current domain and in parent domains; see
-.Xr hostname 7 .
-This is used by the standard host lookup routine
-.Xr gethostbyname 3 .
-This option is enabled by default.
-.It Dv RES_INSECURE_1
-Do not require the IP source address on the reply packet
-to be equal to the server's address.
-.It Dv RES_INSECURE_2
-Do not check if the query section of the reply packet
-is equal to that of the query packet.
-.It Dv RES_NOALIASES
-This option has no effect.
-In the past, it turned off the legacy
-.Ev HOSTALIASES
-feature.
-.It Dv RES_USE_INET6
-With this option
-.Xr gethostbyname 3
-will return IPv6 addresses if available.
-This option is deprecated; software should use the
-.Xr getaddrinfo 3
-interface instead of modifying the behavior of
-.Xr gethostbyname 3 .
-On some operating systems this option also causes IPv4 addresses to be
-returned as IPv4-mapped IPv6 addresses.
-For example, 10.1.1.1 will be returned as ::ffff:10.1.1.1.
-IPv4-mapped IPv6 addresses are not supported on
-.Ox .
-.It Dv RES_USE_EDNS0
-Attach an OPT pseudo-RR for the EDNS0 extension,
-as specified in RFC 2671.
-This informs DNS servers of a client's receive buffer size,
-allowing them to take advantage of a non-default receive buffer size,
-and thus to send larger replies.
-DNS query packets with the EDNS0 extension are not compatible with
-non-EDNS0 DNS servers.
-.Ox
-uses 4096 bytes as input buffer size.
-.It Dv RES_USE_DNSSEC
-Request that the resolver uses
-Domain Name System Security Extensions (DNSSEC),
-as defined in RFCs 4033, 4034, and 4035.
-.It Dv RES_USE_CD
-Set the Checking Disabled flag on queries.
-.El
-.Pp
-The
-.Fn res_init
-routine reads the configuration file (if any; see
-.Xr resolv.conf 5 )
-to get the default domain name, search list, and the Internet address
-of the local name server(s).
-If no server is configured, the host running
-the resolver is tried.
-The current domain name is defined by the hostname
-if not specified in the configuration file;
-it can be overridden by the environment variable
-.Ev LOCALDOMAIN .
-This environment variable may contain several blank-separated
-tokens if you wish to override the search list on a per-process basis.
-This is similar to the
-.Ic search
-command in the configuration file.
-Another environment variable
-.Ev RES_OPTIONS
-can be set to override certain internal resolver options which
-are otherwise set by changing fields in the
-.Va _res
-structure or are inherited from the configuration file's
-.Ic options
-command.
-The syntax of the
-.Ev RES_OPTIONS
-environment variable is explained in
-.Xr resolv.conf 5 .
-Initialization normally occurs on the first call
-to one of the following routines.
-.Pp
-The
-.Fn res_query
-function provides an interface to the server query mechanism.
-It constructs a query, sends it to the local server,
-awaits a response, and makes preliminary checks on the reply.
-The query requests information of the specified
-.Fa type
-and
-.Fa class
-for the specified fully qualified domain name
-.Fa dname .
-The reply message is left in the
-.Fa answer
-buffer with length
-.Fa anslen
-supplied by the caller.
-Values for the
-.Fa class
-and
-.Fa type
-fields
-are defined in
-.In arpa/nameser.h .
-.Pp
-The
-.Fn res_search
-routine makes a query and awaits a response like
-.Fn res_query ,
-but in addition, it implements the default and search rules controlled by the
-.Dv RES_DEFNAMES
-and
-.Dv RES_DNSRCH
-options.
-It returns the first successful reply.
-.Pp
-The remaining routines are lower-level routines used by
-.Fn res_query .
-The
-.Fn res_mkquery
-function constructs a standard query message and places it in
-.Fa buf .
-It returns the size of the query, or \-1 if the query is larger than
-.Fa buflen .
-The query type
-.Fa op
-is usually
-.Dv QUERY ,
-but can be any of the query types defined in
-.In arpa/nameser.h .
-The domain name for the query is given by
-.Fa dname .
-.Fa newrr
-is currently unused but is intended for making update messages.
-.Pp
-The
-.Fn res_send
-routine sends a pre-formatted query and returns an answer.
-It will call
-.Fn res_init
-if
-.Dv RES_INIT
-is not set, send the query to the local name server, and
-handle timeouts and retries.
-The length of the reply message is returned, or \-1 if there were errors.
-.Pp
-The
-.Fn dn_comp
-function compresses the domain name
-.Fa exp_dn
-and stores it in
-.Fa comp_dn .
-The size of the compressed name is returned or \-1 if there were errors.
-The size of the array pointed to by
-.Fa comp_dn
-is given by
-.Fa length .
-The compression uses an array of pointers
-.Fa dnptrs
-to previously compressed names in the current message.
-The first pointer points
-to the beginning of the message and the list ends with
-.Dv NULL .
-The limit to the array is specified by
-.Fa lastdnptr .
-A side effect of
-.Fn dn_comp
-is to update the list of pointers for labels inserted into the message
-as the name is compressed.
-If
-.Fa dnptrs
-is
-.Dv NULL ,
-names are not compressed.
-If
-.Fa lastdnptr
-is
-.Dv NULL ,
-the list of labels is not updated.
-.Pp
-The
-.Fn dn_expand
-entry expands the compressed domain name
-.Fa comp_dn
-to a full domain name.
-The compressed name is contained in a query or reply message;
-.Fa msg
-is a pointer to the beginning of the message.
-The uncompressed name is placed in the buffer indicated by
-.Fa exp_dn
-which is of size
-.Fa length .
-The size of compressed name is returned or \-1 if there was an error.
-.Sh FILES
-.Bl -tag -width "/etc/resolv.confXX"
-.It Pa /etc/resolv.conf
-The configuration file.
-.El
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr resolv.conf 5 ,
-.Xr hostname 7
-.Sh STANDARDS
-.Rs
-.%A M. Stahl
-.%D November 1987
-.%R RFC 1032
-.%T Domain Administrators Guide
-.Re
-.Pp
-.Rs
-.%A M. Lottor
-.%D November 1987
-.%R RFC 1033
-.%T Domain Administrators Operations Guide
-.Re
-.Pp
-.Rs
-.%A P. Mockapetris
-.%D November 1987
-.%R RFC 1034
-.%T Domain Names \(en Concepts and Facilities
-.Re
-.Pp
-.Rs
-.%A P. Mockapetris
-.%D November 1987
-.%R RFC 1035
-.%T Domain Names \(en Implementation and Specification
-.Re
-.Pp
-.Rs
-.%A J. Klensin
-.%D October 2008
-.%R RFC 5321
-.%T Simple Mail Transfer Protocol
-.Re
-.Sh HISTORY
-The functions
-.Fn res_mkquery ,
-.Fn res_send ,
-.Fn res_init ,
-.Fn dn_comp ,
-and
-.Fn dn_expand
-appeared in
-.Bx 4.3 .
-The functions
-.Fn res_query
-and
-.Fn res_search
-appeared in
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/net/res_random.c b/src/lib/libc/net/res_random.c
deleted file mode 100644
index b7036815c9..0000000000
--- a/src/lib/libc/net/res_random.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/* $OpenBSD: res_random.c,v 1.25 2020/07/06 13:33:06 pirofti Exp $ */
-
-/*
- * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
- * Copyright 2008 Damien Miller <djm@openbsd.org>
- * All rights reserved.
- *
- * Theo de Raadt <deraadt@openbsd.org> came up with the idea of using
- * such a mathematical system to generate more random (yet non-repeating)
- * ids to solve the resolver/named problem.  But Niels designed the
- * actual system based on the constraints.
- *
- * Later modified by Damien Miller to wrap the LCG output in a 15-bit
- * permutation generator based on a Luby-Rackoff block cipher. This
- * ensures the output is non-repeating and preserves the MSB twiddle
- * trick, but makes it more resistant to LCG prediction.
- *
- * 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 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.
- */
-
-/* 
- * seed = random 15bit
- * n = prime, g0 = generator to n,
- * j = random so that gcd(j,n-1) == 1
- * g = g0^j mod n will be a generator again.
- *
- * X[0] = random seed.
- * X[n] = a*X[n-1]+b mod m is a Linear Congruential Generator
- * with a = 7^(even random) mod m, 
- *      b = random with gcd(b,m) == 1
- *      m = 31104 and a maximal period of m-1.
- *
- * The transaction id is determined by:
- * id[n] = seed xor (g^X[n] mod n)
- *
- * Effectivly the id is restricted to the lower 15 bits, thus
- * yielding two different cycles by toggling the msb on and off.
- * This avoids reuse issues caused by reseeding.
- *
- * The output of this generator is then randomly permuted though a
- * custom 15 bit Luby-Rackoff block cipher.
- */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <sys/time.h>
-#include <resolv.h>
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "thread_private.h"
-
-#define RU_OUT          180     /* Time after wich will be reseeded */
-#define RU_MAX          30000   /* Uniq cycle, avoid blackjack prediction */
-#define RU_GEN          2       /* Starting generator */
-#define RU_N            32749   /* RU_N-1 = 2*2*3*2729 */
-#define RU_AGEN         7       /* determine ru_a as RU_AGEN^(2*rand) */
-#define RU_M            31104   /* RU_M = 2^7*3^5 - don't change */
-#define RU_ROUNDS       11      /* Number of rounds for permute (odd) */
-
-struct prf_ctx {
-        /* PRF lookup table for odd rounds (7 bits input to 8 bits output) */
-        u_char prf7[(RU_ROUNDS / 2) * (1 << 7)];
-
-        /* PRF lookup table for even rounds (8 bits input to 7 bits output) */
-        u_char prf8[((RU_ROUNDS + 1) / 2) * (1 << 8)];
-};
-
-#define PFAC_N 3
-static const u_int16_t pfacts[PFAC_N] = {
-        2, 
-        3,
-        2729
-};
-
-static u_int16_t ru_x;
-static u_int16_t ru_seed, ru_seed2;
-static u_int16_t ru_a, ru_b;
-static u_int16_t ru_g;
-static u_int16_t ru_counter = 0;
-static u_int16_t ru_msb = 0;
-static struct prf_ctx *ru_prf = NULL;
-static time_t ru_reseed;
-static pid_t ru_pid;
-
-static u_int16_t pmod(u_int16_t, u_int16_t, u_int16_t);
-static void res_initid(void);
-
-/*
- * Do a fast modular exponation, returned value will be in the range
- * of 0 - (mod-1)
- */
-static u_int16_t
-pmod(u_int16_t gen, u_int16_t exp, u_int16_t mod)
-{
-        u_int16_t s, t, u;
-
-        s = 1;
-        t = gen;
-        u = exp;
-
-        while (u) {
-                if (u & 1)
-                        s = (s * t) % mod;
-                u >>= 1;
-                t = (t * t) % mod;
-        }
-        return (s);
-}
-
-/*
- * 15-bit permutation based on Luby-Rackoff block cipher
- */
-static u_int
-permute15(u_int in)
-{
-        int i;
-        u_int left, right, tmp;
-
-        if (ru_prf == NULL)
-                return in;
-
-        left = (in >> 8) & 0x7f;
-        right = in & 0xff;
-
-        /*
-         * Each round swaps the width of left and right. Even rounds have
-         * a 7-bit left, odd rounds have an 8-bit left. Since this uses an
-         * odd number of rounds, left is always 8 bits wide at the end.
-         */
-        for (i = 0; i < RU_ROUNDS; i++) {
-                if ((i & 1) == 0)
-                        tmp = ru_prf->prf8[(i << (8 - 1)) | right] & 0x7f;
-                else
-                        tmp = ru_prf->prf7[((i - 1) << (7 - 1)) | right];
-                tmp ^= left;
-                left = right;
-                right = tmp;
-        }
-
-        return (right << 8) | left;
-}
-
-/* 
- * Initializes the seed and chooses a suitable generator. Also toggles 
- * the msb flag. The msb flag is used to generate two distinct
- * cycles of random numbers and thus avoiding reuse of ids.
- *
- * This function is called from res_randomid() when needed, an 
- * application does not have to worry about it.
- */
-static void 
-res_initid(void)
-{
-        u_int16_t j, i;
-        u_int32_t tmp;
-        int noprime = 1;
-        struct timespec ts;
-
-        ru_x = arc4random_uniform(RU_M);
-
-        /* 15 bits of random seed */
-        tmp = arc4random();
-        ru_seed = (tmp >> 16) & 0x7FFF;
-        ru_seed2 = tmp & 0x7FFF;
-
-        /* Determine the LCG we use */
-        tmp = arc4random();
-        ru_b = (tmp & 0xfffe) | 1;
-        ru_a = pmod(RU_AGEN, (tmp >> 16) & 0xfffe, RU_M);
-        while (ru_b % 3 == 0)
-                ru_b += 2;
-        
-        j = arc4random_uniform(RU_N);
-
-        /* 
-         * Do a fast gcd(j,RU_N-1), so we can find a j with
-         * gcd(j, RU_N-1) == 1, giving a new generator for
-         * RU_GEN^j mod RU_N
-         */
-
-        while (noprime) {
-                for (i = 0; i < PFAC_N; i++)
-                        if (j % pfacts[i] == 0)
-                                break;
-
-                if (i >= PFAC_N)
-                        noprime = 0;
-                else 
-                        j = (j + 1) % RU_N;
-        }
-
-        ru_g = pmod(RU_GEN, j, RU_N);
-        ru_counter = 0;
-
-        /* Initialise PRF for Luby-Rackoff permutation */
-        if (ru_prf == NULL)
-                ru_prf = malloc(sizeof(*ru_prf));
-        if (ru_prf != NULL)
-                arc4random_buf(ru_prf, sizeof(*ru_prf));
-
-        WRAP(clock_gettime)(CLOCK_MONOTONIC, &ts);
-        ru_reseed = ts.tv_sec + RU_OUT;
-        ru_msb = ru_msb == 0x8000 ? 0 : 0x8000; 
-}
-
-u_int
-__res_randomid(void)
-{
-        struct timespec ts;
-        pid_t pid;
-        u_int r;
-        static void *randomid_mutex;
-
-        WRAP(clock_gettime)(CLOCK_MONOTONIC, &ts);
-        pid = getpid();
-
-        _MUTEX_LOCK(&randomid_mutex);
-
-        if (ru_counter >= RU_MAX || ts.tv_sec > ru_reseed || pid != ru_pid) {
-                res_initid();
-                ru_pid = pid;
-        }
-
-        /* Linear Congruential Generator */
-        ru_x = (ru_a * ru_x + ru_b) % RU_M;
-        ru_counter++;
-
-        r = permute15(ru_seed ^ pmod(ru_g, ru_seed2 + ru_x, RU_N)) | ru_msb;
-
-        _MUTEX_UNLOCK(&randomid_mutex);
-
-        return (r);
-}
-DEF_STRONG(__res_randomid);
-
-#if 0
-int
-main(int argc, char **argv)
-{
-        int i, n;
-        u_int16_t wert;
-
-        res_initid();
-
-        printf("Generator: %u\n", ru_g);
-        printf("Seed: %u\n", ru_seed);
-        printf("Reseed at %ld\n", ru_reseed);
-        printf("Ru_X: %u\n", ru_x);
-        printf("Ru_A: %u\n", ru_a);
-        printf("Ru_B: %u\n", ru_b);
-
-        n = argc > 1 ? atoi(argv[1]) : 60001;
-        for (i=0;i<n;i++) {
-                wert = res_randomid();
-                printf("%u\n", wert);
-        }
-        return 0;
-}
-#endif
-
diff --git a/src/lib/libc/net/rresvport.c b/src/lib/libc/net/rresvport.c
deleted file mode 100644
index 72c27c3a3f..0000000000
--- a/src/lib/libc/net/rresvport.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* $OpenBSD: rresvport.c,v 1.12 2019/06/28 13:32:42 deraadt Exp $ */
-/*
- * Copyright (c) 1995, 1996, 1998 Theo de Raadt.  All rights reserved.
- * Copyright (c) 1983, 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. 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 <sys/socket.h>
-#include <sys/stat.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <signal.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <syslog.h>
-#include <stdlib.h>
-#include <netgroup.h>
-
-int
-rresvport(int *alport)
-{
-        return rresvport_af(alport, AF_INET);
-}
-
-
-int
-rresvport_af(int *alport, int af)
-{
-        struct sockaddr_storage ss;
-        struct sockaddr *sa;
-        u_int16_t *portp;
-        int s;
-
-        bzero(&ss, sizeof ss);
-        sa = (struct sockaddr *)&ss;
-
-        switch (af) {
-        case AF_INET:
-                sa->sa_len = sizeof(struct sockaddr_in);
-                portp = &((struct sockaddr_in *)sa)->sin_port;
-                break;
-        case AF_INET6:
-                sa->sa_len = sizeof(struct sockaddr_in6);
-                portp = &((struct sockaddr_in6 *)sa)->sin6_port;
-                break;
-        default:
-                errno = EPFNOSUPPORT;
-                return (-1);
-        }
-        sa->sa_family = af;
-        
-        s = socket(af, SOCK_STREAM, 0);
-        if (s == -1)
-                return (-1);
-
-        *portp = htons(*alport);
-        if (*alport < IPPORT_RESERVED - 1) {
-                if (bind(s, sa, sa->sa_len) != -1)
-                        return (s);
-                if (errno != EADDRINUSE) {
-                        (void)close(s);
-                        return (-1);
-                }
-        }
-
-        *portp = 0;
-        sa->sa_family = af;
-        if (bindresvport_sa(s, sa) == -1) {
-                (void)close(s);
-                return (-1);
-        }
-        *alport = ntohs(*portp);
-        return (s);
-}
-DEF_WEAK(rresvport_af);
diff --git a/src/lib/libc/net/rthdr.c b/src/lib/libc/net/rthdr.c
deleted file mode 100644
index 934a55155a..0000000000
--- a/src/lib/libc/net/rthdr.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*      $OpenBSD: rthdr.c,v 1.12 2016/09/21 04:38:56 guenther Exp $     */
-/*      $KAME: rthdr.c,v 1.22 2006/02/09 08:18:58 keiichi Exp $ */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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 project 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 PROJECT 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 PROJECT 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 <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/ip6.h>
-
-#include <string.h>
-#include <stdio.h>
-
-/*
- * RFC3542 (2292bis) API
- */
-
-socklen_t
-inet6_rth_space(int type, int segments)
-{
-        switch (type) {
-        case IPV6_RTHDR_TYPE_0:
-                return (((segments * 2) + 1) << 3);
-        default:
-                return (0);     /* type not suppported */
-        }
-}
-DEF_WEAK(inet6_rth_space);
-
-void *
-inet6_rth_init(void *bp, socklen_t bp_len, int type, int segments)
-{
-        struct ip6_rthdr *rth = (struct ip6_rthdr *)bp;
-        struct ip6_rthdr0 *rth0;
-
-        switch (type) {
-        case IPV6_RTHDR_TYPE_0:
-                /* length validation */
-                if (bp_len < inet6_rth_space(IPV6_RTHDR_TYPE_0, segments))
-                        return (NULL);
-
-                memset(bp, 0, bp_len);
-                rth0 = (struct ip6_rthdr0 *)rth;
-                rth0->ip6r0_len = segments * 2;
-                rth0->ip6r0_type = IPV6_RTHDR_TYPE_0;
-                rth0->ip6r0_segleft = 0;
-                rth0->ip6r0_reserved = 0;
-                break;
-        default:
-                return (NULL);  /* type not supported */
-        }
-
-        return (bp);
-}
-
-int
-inet6_rth_add(void *bp, const struct in6_addr *addr)
-{
-        struct ip6_rthdr *rth = (struct ip6_rthdr *)bp;
-        struct ip6_rthdr0 *rth0;
-        struct in6_addr *nextaddr;
-
-        switch (rth->ip6r_type) {
-        case IPV6_RTHDR_TYPE_0:
-                rth0 = (struct ip6_rthdr0 *)rth;
-                nextaddr = (struct in6_addr *)(rth0 + 1) + rth0->ip6r0_segleft;
-                *nextaddr = *addr;
-                rth0->ip6r0_segleft++;
-                break;
-        default:
-                return (-1);    /* type not supported */
-        }
-
-        return (0);
-}
-
-int
-inet6_rth_reverse(const void *in, void *out)
-{
-        struct ip6_rthdr *rth_in = (struct ip6_rthdr *)in;
-        struct ip6_rthdr0 *rth0_in, *rth0_out;
-        int i, segments;
-
-        switch (rth_in->ip6r_type) {
-        case IPV6_RTHDR_TYPE_0:
-                rth0_in = (struct ip6_rthdr0 *)in;
-                rth0_out = (struct ip6_rthdr0 *)out;
-
-                /* parameter validation XXX too paranoid? */
-                if (rth0_in->ip6r0_len % 2)
-                        return (-1);
-                segments = rth0_in->ip6r0_len / 2;
-
-                /* we can't use memcpy here, since in and out may overlap */
-                memmove(rth0_out, rth0_in, ((rth0_in->ip6r0_len) + 1) << 3);
-                rth0_out->ip6r0_segleft = segments;
-
-                /* reverse the addresses */
-                for (i = 0; i < segments / 2; i++) {
-                        struct in6_addr addr_tmp, *addr1, *addr2;
-
-                        addr1 = (struct in6_addr *)(rth0_out + 1) + i;
-                        addr2 = (struct in6_addr *)(rth0_out + 1) +
-                            (segments - i - 1);
-                        addr_tmp = *addr1;
-                        *addr1 = *addr2;
-                        *addr2 = addr_tmp;
-                }
-                
-                break;
-        default:
-                return (-1);    /* type not supported */
-        }
-
-        return (0);
-}
-
-int
-inet6_rth_segments(const void *bp)
-{
-        struct ip6_rthdr *rh = (struct ip6_rthdr *)bp;
-        struct ip6_rthdr0 *rh0;
-        int addrs;
-
-        switch (rh->ip6r_type) {
-        case IPV6_RTHDR_TYPE_0:
-                rh0 = (struct ip6_rthdr0 *)bp;
-
-                /*
-                 * Validation for a type-0 routing header.
-                 * Is this too strict?
-                 */
-                if ((rh0->ip6r0_len % 2) != 0 ||
-                    (addrs = (rh0->ip6r0_len >> 1)) < rh0->ip6r0_segleft)
-                        return (-1);
-
-                return (addrs);
-        default:
-                return (-1);    /* unknown type */
-        }
-}
-
-struct in6_addr *
-inet6_rth_getaddr(const void *bp, int idx)
-{
-        struct ip6_rthdr *rh = (struct ip6_rthdr *)bp;
-        struct ip6_rthdr0 *rh0;
-        int addrs;
-
-        switch (rh->ip6r_type) {
-        case IPV6_RTHDR_TYPE_0:
-                 rh0 = (struct ip6_rthdr0 *)bp;
-                 
-                /*
-                 * Validation for a type-0 routing header.
-                 * Is this too strict?
-                 */
-                if ((rh0->ip6r0_len % 2) != 0 ||
-                    (addrs = (rh0->ip6r0_len >> 1)) < rh0->ip6r0_segleft)
-                        return (NULL);
-
-                if (idx < 0 || addrs <= idx)
-                        return (NULL);
-
-                return (((struct in6_addr *)(rh0 + 1)) + idx);
-        default:
-                return (NULL);  /* unknown type */
-                break;
-        }
-}
diff --git a/src/lib/libc/net/ruserok.c b/src/lib/libc/net/ruserok.c
deleted file mode 100644
index a399c013e2..0000000000
--- a/src/lib/libc/net/ruserok.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1998 Theo de Raadt.  All rights reserved.
- * Copyright (c) 1983, 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. 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 <sys/socket.h>
-#include <sys/stat.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <netdb.h>
-#include <netgroup.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-
-static int __ivaliduser_sa(FILE *, struct sockaddr *, socklen_t,
-            const char *, const char *);
-static int __icheckhost(struct sockaddr *, socklen_t, const char *);
-static char *__gethostloop(struct sockaddr *, socklen_t);
-static int iruserok_sa(const void *, int, int, const char *, const char *);
-
-int
-ruserok(const char *rhost, int superuser, const char *ruser, const char *luser)
-{
-        struct addrinfo hints, *res, *r;
-        int error;
-
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = PF_UNSPEC;
-        hints.ai_socktype = SOCK_DGRAM; /*dummy*/
-        error = getaddrinfo(rhost, "0", &hints, &res);
-        if (error)
-                return (-1);
-
-        for (r = res; r; r = r->ai_next) {
-                if (iruserok_sa(r->ai_addr, r->ai_addrlen, superuser, ruser,
-                    luser) == 0) {
-                        freeaddrinfo(res);
-                        return (0);
-                }
-        }
-        freeaddrinfo(res);
-        return (-1);
-}
-
-int
-iruserok_sa(const void *raddr, int rlen, int superuser, const char *ruser,
-    const char *luser)
-{
-        struct sockaddr *sa;
-        char *cp;
-        struct stat sbuf;
-        struct passwd pwstore, *pwd;
-        FILE *hostf;
-        uid_t uid;
-        int first;
-        char pbuf[PATH_MAX], pwbuf[_PW_BUF_LEN];
-
-        sa = (struct sockaddr *)raddr;
-        first = 1;
-        hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "re");
-again:
-        if (hostf) {
-                if (__ivaliduser_sa(hostf, sa, rlen, luser, ruser) == 0) {
-                        (void)fclose(hostf);
-                        return (0);
-                }
-                (void)fclose(hostf);
-        }
-        if (first == 1) {
-                int len;
-
-                first = 0;
-                pwd = NULL;
-                getpwnam_r(luser, &pwstore, pwbuf, sizeof(pwbuf), &pwd);
-                if (pwd == NULL)
-                        return (-1);
-                len = snprintf(pbuf, sizeof pbuf, "%s/.rhosts", pwd->pw_dir);
-                if (len < 0 || len >= sizeof pbuf)
-                        return (-1);
-
-                /*
-                 * Change effective uid while opening .rhosts.  If root and
-                 * reading an NFS mounted file system, can't read files that
-                 * are protected read/write owner only.
-                 */
-                uid = geteuid();
-                (void)seteuid(pwd->pw_uid);
-                hostf = fopen(pbuf, "re");
-                (void)seteuid(uid);
-
-                if (hostf == NULL)
-                        return (-1);
-                /*
-                 * If not a regular file, or is owned by someone other than
-                 * user or root or if writeable by anyone but the owner, quit.
-                 */
-                cp = NULL;
-                if (lstat(pbuf, &sbuf) == -1)
-                        cp = ".rhosts lstat failed";
-                else if (!S_ISREG(sbuf.st_mode))
-                        cp = ".rhosts not regular file";
-                else if (fstat(fileno(hostf), &sbuf) == -1)
-                        cp = ".rhosts fstat failed";
-                else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
-                        cp = "bad .rhosts owner";
-                else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
-                        cp = ".rhosts writable by other than owner";
-                /* If there were any problems, quit. */
-                if (cp) {
-                        (void)fclose(hostf);
-                        return (-1);
-                }
-                goto again;
-        }
-        return (-1);
-}
-
-int
-__ivaliduser_sa(FILE *hostf, struct sockaddr *raddr, socklen_t salen,
-    const char *luser, const char *ruser)
-{
-        char *user, *p;
-        char *buf;
-        const char *auser, *ahost;
-        int hostok, userok;
-        char *rhost = (char *)-1;
-        char domain[HOST_NAME_MAX+1];
-        size_t buflen;
-
-        getdomainname(domain, sizeof(domain));
-
-        while ((buf = fgetln(hostf, &buflen))) {
-                p = buf;
-                if (*p == '#')
-                        continue;
-                while (p < buf + buflen && *p != '\n' && *p != ' ' && *p != '\t') {
-                        if (!isprint((unsigned char)*p))
-                                goto bail;
-                        *p = isupper((unsigned char)*p) ?
-                            tolower((unsigned char)*p) : *p;
-                        p++;
-                }
-                if (p >= buf + buflen)
-                        continue;
-                if (*p == ' ' || *p == '\t') {
-                        *p++ = '\0';
-                        while (p < buf + buflen && (*p == ' ' || *p == '\t'))
-                                p++;
-                        if (p >= buf + buflen)
-                                continue;
-                        user = p;
-                        while (p < buf + buflen && *p != '\n' && *p != ' ' &&
-                            *p != '\t') {
-                                if (!isprint((unsigned char)*p))
-                                        goto bail;
-                                p++;
-                        }
-                } else
-                        user = p;
-                *p = '\0';
-
-                if (p == buf)
-                        continue;
-
-                auser = *user ? user : luser;
-                ahost = buf;
-
-                if (strlen(ahost) > HOST_NAME_MAX)
-                        continue;
-
-                /*
-                 * innetgr() must lookup a hostname (we do not attempt
-                 * to change the semantics so that netgroups may have
-                 * #.#.#.# addresses in the list.)
-                 */
-                if (ahost[0] == '+')
-                        switch (ahost[1]) {
-                        case '\0':
-                                hostok = 1;
-                                break;
-                        case '@':
-                                if (rhost == (char *)-1)
-                                        rhost = __gethostloop(raddr, salen);
-                                hostok = 0;
-                                if (rhost)
-                                        hostok = innetgr(&ahost[2], rhost,
-                                            NULL, domain);
-                                break;
-                        default:
-                                hostok = __icheckhost(raddr, salen, &ahost[1]);
-                                break;
-                        }
-                else if (ahost[0] == '-')
-                        switch (ahost[1]) {
-                        case '\0':
-                                hostok = -1;
-                                break;
-                        case '@':
-                                if (rhost == (char *)-1)
-                                        rhost = __gethostloop(raddr, salen);
-                                hostok = 0;
-                                if (rhost)
-                                        hostok = -innetgr(&ahost[2], rhost,
-                                            NULL, domain);
-                                break;
-                        default:
-                                hostok = -__icheckhost(raddr, salen, &ahost[1]);
-                                break;
-                        }
-                else
-                        hostok = __icheckhost(raddr, salen, ahost);
-
-
-                if (auser[0] == '+')
-                        switch (auser[1]) {
-                        case '\0':
-                                userok = 1;
-                                break;
-                        case '@':
-                                userok = innetgr(&auser[2], NULL, ruser,
-                                    domain);
-                                break;
-                        default:
-                                userok = strcmp(ruser, &auser[1]) ? 0 : 1;
-                                break;
-                        }
-                else if (auser[0] == '-')
-                        switch (auser[1]) {
-                        case '\0':
-                                userok = -1;
-                                break;
-                        case '@':
-                                userok = -innetgr(&auser[2], NULL, ruser,
-                                    domain);
-                                break;
-                        default:
-                                userok = strcmp(ruser, &auser[1]) ? 0 : -1;
-                                break;
-                        }
-                else
-                        userok = strcmp(ruser, auser) ? 0 : 1;
-
-                /* Check if one component did not match */
-                if (hostok == 0 || userok == 0)
-                        continue;
-
-                /* Check if we got a forbidden pair */
-                if (userok <= -1 || hostok <= -1)
-                        return (-1);
-
-                /* Check if we got a valid pair */
-                if (hostok >= 1 && userok >= 1)
-                        return (0);
-        }
-bail:
-        return (-1);
-}
-
-/*
- * Returns "true" if match, 0 if no match.  If we do not find any
- * semblance of an A->PTR->A loop, allow a simple #.#.#.# match to work.
- */
-static int
-__icheckhost(struct sockaddr *raddr, socklen_t salen, const char *lhost)
-{
-        struct addrinfo hints, *res, *r;
-        char h1[NI_MAXHOST], h2[NI_MAXHOST];
-        int error;
-        const int niflags = NI_NUMERICHOST;
-
-        h1[0] = '\0';
-        if (getnameinfo(raddr, salen, h1, sizeof(h1), NULL, 0,
-            niflags) != 0)
-                return (0);
-
-        /* Resolve laddr into sockaddr */
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = raddr->sa_family;
-        hints.ai_socktype = SOCK_DGRAM; /*dummy*/
-        res = NULL;
-        error = getaddrinfo(lhost, "0", &hints, &res);
-        if (error)
-                return (0);
-
-        /*
-         * Try string comparisons between raddr and laddr.
-         */
-        for (r = res; r; r = r->ai_next) {
-                h2[0] = '\0';
-                if (getnameinfo(r->ai_addr, r->ai_addrlen, h2, sizeof(h2),
-                    NULL, 0, niflags) != 0)
-                        continue;
-                if (strcmp(h1, h2) == 0) {
-                        freeaddrinfo(res);
-                        return (1);
-                }
-        }
-
-        /* No match. */
-        freeaddrinfo(res);
-        return (0);
-}
-
-/*
- * Return the hostname associated with the supplied address.
- * Do a reverse lookup as well for security. If a loop cannot
- * be found, pack the result of inet_ntoa() into the string.
- */
-static char *
-__gethostloop(struct sockaddr *raddr, socklen_t salen)
-{
-        static char remotehost[NI_MAXHOST];
-        char h1[NI_MAXHOST], h2[NI_MAXHOST];
-        struct addrinfo hints, *res, *r;
-        int error;
-        const int niflags = NI_NUMERICHOST;
-
-        h1[0] = remotehost[0] = '\0';
-        if (getnameinfo(raddr, salen, remotehost, sizeof(remotehost),
-            NULL, 0, NI_NAMEREQD) != 0)
-                return (NULL);
-        if (getnameinfo(raddr, salen, h1, sizeof(h1), NULL, 0,
-            niflags) != 0)
-                return (NULL);
-
-        /*
-         * Look up the name and check that the supplied
-         * address is in the list
-         */
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = raddr->sa_family;
-        hints.ai_socktype = SOCK_DGRAM; /*dummy*/
-        hints.ai_flags = AI_CANONNAME;
-        res = NULL;
-        error = getaddrinfo(remotehost, "0", &hints, &res);
-        if (error)
-                return (NULL);
-
-        for (r = res; r; r = r->ai_next) {
-                h2[0] = '\0';
-                if (getnameinfo(r->ai_addr, r->ai_addrlen, h2, sizeof(h2),
-                    NULL, 0, niflags) != 0)
-                        continue;
-                if (strcmp(h1, h2) == 0) {
-                        freeaddrinfo(res);
-                        return (remotehost);
-                }
-        }
-
-        /*
-         * either the DNS adminstrator has made a configuration
-         * mistake, or someone has attempted to spoof us
-         */
-        freeaddrinfo(res);
-        return (NULL);
-}
diff --git a/src/lib/libc/net/send.c b/src/lib/libc/net/send.c
deleted file mode 100644
index 1fad3bd171..0000000000
--- a/src/lib/libc/net/send.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*      $OpenBSD: send.c,v 1.6 2015/10/04 07:17:27 guenther Exp $ */
-/*
- * Copyright (c) 1988, 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 <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-send(int s, const void *msg, size_t len, int flags)
-{
-        return (sendto(s, msg, len, flags, NULL, 0));
-}
-DEF_WEAK(send);
diff --git a/src/lib/libc/net/sockatmark.3 b/src/lib/libc/net/sockatmark.3
deleted file mode 100644
index 524536c12b..0000000000
--- a/src/lib/libc/net/sockatmark.3
+++ /dev/null
@@ -1,122 +0,0 @@
-.\" Copyright (c) 2002 William C. Fenner.  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 BY THE 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 FreeBSD: r108087 2002-12-19 01:40:28 -0800
-.\" $OpenBSD: sockatmark.3,v 1.2 2019/06/20 14:19:25 deraadt Exp $
-.\"
-.Dd $Mdocdate: June 20 2019 $
-.Dt SOCKATMARK 3
-.Os
-.Sh NAME
-.Nm sockatmark
-.Nd determine whether the read pointer is at the out-of-band data mark
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn sockatmark "int s"
-.Sh DESCRIPTION
-The
-.Fn sockatmark
-function returns 1 if the read pointer for the socket
-.Fa s
-is currently at the out-of-band data mark.
-Otherwise, it returns 0 if the socket doesn't have an out-of-band
-data mark or if there is normal data to be received before the mark.
-.Sh RETURN VALUES
-Upon successful completion, the
-.Fn sockatmark
-function returns the value 1 if the read pointer is pointing at
-the out-of-band data mark, 0 if it is not.
-Otherwise the value \-1 is returned
-and the global variable
-.Va errno
-is set to
-indicate the error.
-.Sh EXAMPLES
-The routine used in the historical remote login process to flush
-output on receipt of an interrupt or quit signal is shown below.
-It reads the normal data up to the mark (to discard it),
-then reads the out-of-band byte.
-.Bd -literal -offset indent
-#include <sys/socket.h>
-\&...
-oob()
-{
-        int mark;
-        char waste[BUFSIZ];
-
-        for (;;) {
-                if ((mark = sockatmark(rem)) == -1) {
-                        perror("sockatmark");
-                        break;
-                }
-                if (mark)
-                        break;
-                (void) read(rem, waste, sizeof (waste));
-        }
-        if (recv(rem, &mark, 1, MSG_OOB) == -1) {
-                perror("recv");
-                ...
-        }
-        ...
-}
-.Ed
-.Sh ERRORS
-The
-.Fn sockatmark
-call fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTTY
-.Fa s
-is valid but does not refer to a socket.
-.El
-.Sh SEE ALSO
-.Xr recv 2 ,
-.Xr send 2
-.Sh STANDARDS
-The
-.Fn sockatmark
-function conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn sockatmark
-function was introduced by
-.St -p1003.1-2001
-to standardize the historical
-.Dv SIOCATMARK
-.Xr ioctl 2 .
-The
-.Fn sockatmark
-function appeared in
-.Ox 5.7 .
-.Pp
-The
-.Er ENOTTY
-error is returned instead of the usual
-.Er ENOTSOCK
-error to match the historical behavior of
-.Dv SIOCATMARK .
diff --git a/src/lib/libc/net/sockatmark.c b/src/lib/libc/net/sockatmark.c
deleted file mode 100644
index a43e7af3aa..0000000000
--- a/src/lib/libc/net/sockatmark.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2002 William C. Fenner.  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 BY THE 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.
- *
- * $FreeBSD$
- */
-
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/ioctl.h>
-
-int
-sockatmark(int s)
-{
-        int atmark;
-
-        if (ioctl(s, SIOCATMARK, &atmark) == -1)
-                return (-1);
-        return (atmark);
-}
diff --git a/src/lib/libc/net/vars6.c b/src/lib/libc/net/vars6.c
deleted file mode 100644
index a12932a26e..0000000000
--- a/src/lib/libc/net/vars6.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*      $OpenBSD: vars6.c,v 1.3 2014/08/31 19:20:44 bluhm Exp $ */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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 project 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 PROJECT 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 PROJECT 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 <sys/types.h>
-#include <netinet/in.h>
-
-/*
- * Definitions of some constant IPv6 addresses.
- */
-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
-const struct in6_addr in6addr_intfacelocal_allnodes = IN6ADDR_INTFACELOCAL_ALLNODES_INIT;
-const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;
-const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;
diff --git a/src/lib/libc/stdlib/Makefile.inc b/src/lib/libc/stdlib/Makefile.inc
deleted file mode 100644
index 55b8018522..0000000000
--- a/src/lib/libc/stdlib/Makefile.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-#       $OpenBSD: Makefile.inc,v 1.64 2017/12/16 20:06:55 guenther Exp $
-
-# stdlib sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/stdlib ${LIBCSRCDIR}/stdlib
-
-SRCS+=  a64l.c abort.c atexit.c atoi.c atof.c atol.c atoll.c bsearch.c \
-        exit.c ecvt.c gcvt.c getenv.c getopt_long.c \
-        getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c insque.c \
-        l64a.c llabs.c lldiv.c lsearch.c malloc.c reallocarray.c \
-        merge.c posix_pty.c qsort.c radixsort.c rand.c random.c \
-        realpath.c remque.c setenv.c strtoimax.c \
-        strtol.c strtoll.c strtonum.c strtoul.c strtoull.c strtoumax.c \
-        system.c \
-        tfind.c thread_atexit.c tsearch.c \
-        _rand48.c drand48.c erand48.c jrand48.c \
-        lcong48.c lrand48.c mrand48.c nrand48.c seed48.c srand48.c \
-        _Exit.c icdb.c
-
-.if (${MACHINE_CPU} == "i386")
-SRCS+=  abs.S div.S labs.S ldiv.S
-.elif (${MACHINE_CPU} == "alpha")
-# XXX should be .S's
-SRCS+=  abs.c div.c labs.c ldiv.c
-.else
-SRCS+=  abs.c div.c labs.c ldiv.c
-.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 posix_memalign.3 posix_openpt.3 ptsname.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
diff --git a/src/lib/libc/stdlib/_Exit.c b/src/lib/libc/stdlib/_Exit.c
deleted file mode 100644
index ccf64c2e87..0000000000
--- a/src/lib/libc/stdlib/_Exit.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*      $OpenBSD: _Exit.c,v 1.3 2013/04/03 03:39:29 guenther 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 in C99.  Indeed, POSIX specifies that
- * _Exit() must *not* flush stdio buffers or remove temporary files, but
- * rather must behave exactly like _exit()
- */
-void
-_Exit(int status)
-{
-        _exit(status);
-}
diff --git a/src/lib/libc/stdlib/_rand48.c b/src/lib/libc/stdlib/_rand48.c
deleted file mode 100644
index 7c950f7cee..0000000000
--- a/src/lib/libc/stdlib/_rand48.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*      $OpenBSD: _rand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.
- */
-
-#include "rand48.h"
-
-unsigned short __rand48_seed[3] = {
-        RAND48_SEED_0,
-        RAND48_SEED_1,
-        RAND48_SEED_2
-};
-unsigned short __rand48_mult[3] = {
-        RAND48_MULT_0,
-        RAND48_MULT_1,
-        RAND48_MULT_2
-};
-unsigned short __rand48_add = RAND48_ADD;
-
-void
-__dorand48(unsigned short xseed[3])
-{
-        unsigned long accu;
-        unsigned short temp[2];
-
-        accu = (unsigned long) __rand48_mult[0] * (unsigned long) xseed[0] +
-         (unsigned long) __rand48_add;
-        temp[0] = (unsigned short) accu;        /* lower 16 bits */
-        accu >>= sizeof(unsigned short) * 8;
-        accu += (unsigned long) __rand48_mult[0] * (unsigned long) xseed[1] +
-         (unsigned long) __rand48_mult[1] * (unsigned long) xseed[0];
-        temp[1] = (unsigned short) accu;        /* middle 16 bits */
-        accu >>= sizeof(unsigned short) * 8;
-        accu += __rand48_mult[0] * xseed[2] + __rand48_mult[1] * xseed[1] + __rand48_mult[2] * xseed[0];
-        xseed[0] = temp[0];
-        xseed[1] = temp[1];
-        xseed[2] = (unsigned short) accu;
-}
diff --git a/src/lib/libc/stdlib/a64l.3 b/src/lib/libc/stdlib/a64l.3
deleted file mode 100644
index c34af99c88..0000000000
--- a/src/lib/libc/stdlib/a64l.3
+++ /dev/null
@@ -1,133 +0,0 @@
-.\" $OpenBSD: a64l.3,v 1.13 2019/01/25 00:19:25 millert Exp $
-.\"
-.\" Copyright (c) 1997 Todd C. Miller <millert@openbsd.org>
-.\"
-.\" 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 $Mdocdate: January 25 2019 $
-.Dt A64L 3
-.Os
-.Sh NAME
-.Nm a64l ,
-.Nm l64a
-.Nd convert between 32-bit integer and radix-64 ASCII string
-.Sh SYNOPSIS
-.In 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 STANDARDS
-The
-.Fn a64l
-and
-.Fn l64a
-functions conform to
-.St -xpg4.2 .
-.Sh CAVEATS
-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.
diff --git a/src/lib/libc/stdlib/a64l.c b/src/lib/libc/stdlib/a64l.c
deleted file mode 100644
index 5312929c6f..0000000000
--- a/src/lib/libc/stdlib/a64l.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*      $OpenBSD: a64l.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-#include <errno.h>
-#include <stdlib.h>
-
-long
-a64l(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 >= '.' && *s <= '/')
-                        digit = *s - '.';
-                else if (*s >= '0' && *s <= '9')
-                        digit = *s - '0' + 2;
-                else if (*s >= 'A' && *s <= 'Z')
-                        digit = *s - 'A' + 12;
-                else if (*s >= 'a' && *s <= 'z')
-                        digit = *s - 'a' + 38;
-                else {
-                        errno = EINVAL;
-                        return(-1L);
-                }
-
-                value |= digit << shift;
-                shift += 6;
-        }
-
-        return(value);
-}
diff --git a/src/lib/libc/stdlib/abort.3 b/src/lib/libc/stdlib/abort.3
deleted file mode 100644
index 2f15cd827c..0000000000
--- a/src/lib/libc/stdlib/abort.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1990, 1991 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
-.\" 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: abort.3,v 1.11 2014/05/14 21:54:20 tedu Exp $
-.\"
-.Dd $Mdocdate: May 14 2014 $
-.Dt ABORT 3
-.Os
-.Sh NAME
-.Nm abort
-.Nd cause abnormal program termination
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn abort void
-.Sh DESCRIPTION
-The
-.Fn abort
-function causes abnormal program termination to occur, unless the signal
-.Dv SIGABRT
-is being caught and the signal handler does not return.
-.Pp
-Some implementations may flush output streams before terminating.
-This implementation does not.
-.Sh RETURN VALUES
-The
-.Fn abort
-function never returns.
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr exit 3
-.Sh STANDARDS
-The
-.Fn abort
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn abort
-function first appeared in
-.At v5 .
-.Pp
-Historically, previous standards required
-.Fn abort
-to flush and close output streams, but this conflicted with the requirement
-that
-.Fn abort
-be async signal safe.
-As a result, the flushing requirement was dropped.
diff --git a/src/lib/libc/stdlib/abort.c b/src/lib/libc/stdlib/abort.c
deleted file mode 100644
index 6c22ecd2b0..0000000000
--- a/src/lib/libc/stdlib/abort.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*      $OpenBSD: abort.c,v 1.21 2017/08/12 22:59:52 guenther Exp $ */
-/*
- * Copyright (c) 1985 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 <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-
-void
-abort(void)
-{
-        sigset_t mask;
-        struct sigaction sa;
-
-        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, NULL);
-
-        (void)raise(SIGABRT);
-
-        /*
-         * if SIGABRT ignored, or caught and the handler returns, do
-         * it again, only harder.
-         */
-        memset(&sa, 0, sizeof(sa));
-        sa.sa_handler = SIG_DFL;
-        (void)sigaction(SIGABRT, &sa, NULL);
-        (void)sigprocmask(SIG_SETMASK, &mask, NULL);
-        (void)raise(SIGABRT);
-        _exit(1);
-}
-DEF_STRONG(abort);
diff --git a/src/lib/libc/stdlib/abs.3 b/src/lib/libc/stdlib/abs.3
deleted file mode 100644
index afacc985df..0000000000
--- a/src/lib/libc/stdlib/abs.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\" Copyright (c) 1990, 1991 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
-.\" 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: abs.3,v 1.12 2019/01/18 07:32:17 schwarze Exp $
-.\"
-.Dd $Mdocdate: January 18 2019 $
-.Dt ABS 3
-.Os
-.Sh NAME
-.Nm abs
-.Nd integer absolute value function
-.Sh SYNOPSIS
-.In limits.h
-.In stdlib.h
-.Ft int
-.Fn abs "int j"
-.Sh DESCRIPTION
-The
-.Fn abs
-function computes the absolute value of the integer
-.Fa j .
-.Sh RETURN VALUES
-The
-.Fn abs
-function returns the absolute value.
-.Sh SEE ALSO
-.Xr cabs 3 ,
-.Xr floor 3 ,
-.Xr hypot 3 ,
-.Xr imaxabs 3 ,
-.Xr labs 3
-.Sh STANDARDS
-The
-.Fn abs
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn abs
-function first appeared in
-.At v6 .
-.Sh CAVEATS
-The result of applying
-.Fn abs
-to
-.Dv INT_MIN
-is undefined.
diff --git a/src/lib/libc/stdlib/abs.c b/src/lib/libc/stdlib/abs.c
deleted file mode 100644
index 0e39cc5536..0000000000
--- a/src/lib/libc/stdlib/abs.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*      $OpenBSD: abs.c,v 1.6 2015/09/13 08:31:47 guenther 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 <stdlib.h>
-
-int
-abs(int j)
-{
-        return(j < 0 ? -j : j);
-}
-DEF_STRONG(abs);
diff --git a/src/lib/libc/stdlib/alloca.3 b/src/lib/libc/stdlib/alloca.3
deleted file mode 100644
index 5252ba586f..0000000000
--- a/src/lib/libc/stdlib/alloca.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\" Copyright (c) 1980, 1991 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.
-.\"
-.\"     $OpenBSD: alloca.3,v 1.14 2015/01/17 18:01:43 tedu Exp $
-.\"
-.Dd $Mdocdate: January 17 2015 $
-.Dt ALLOCA 3
-.Os
-.Sh NAME
-.Nm alloca
-.Nd memory allocator
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn alloca "size_t size"
-.Sh DESCRIPTION
-The
-.Fn alloca
-function allocates
-.Fa size
-bytes of space in the stack frame of the caller.
-This temporary space is automatically freed on return.
-.Sh RETURN VALUES
-The
-.Fn alloca
-function returns a pointer to the beginning of the allocated space.
-.Sh SEE ALSO
-.Xr pagesize 1 ,
-.Xr brk 2 ,
-.Xr malloc 3
-.\" .Sh HISTORY
-.\" The
-.\" .Fn alloca
-.\" function appeared in
-.\" .Bx ?? .
-.\" 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...
-.Sh CAVEATS
-The
-.Fn alloca
-function is 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
deleted file mode 100644
index a95a45b92e..0000000000
--- a/src/lib/libc/stdlib/atexit.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" 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: atexit.3,v 1.12 2019/06/27 16:30:39 schwarze Exp $
-.\"
-.Dd $Mdocdate: June 27 2019 $
-.Dt ATEXIT 3
-.Os
-.Sh NAME
-.Nm atexit
-.Nd register a function to be called on exit
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn atexit "void (*function)(void)"
-.Sh DESCRIPTION
-The
-.Fn atexit
-function registers the given
-.Fa function
-to be called at program exit, whether via
-.Xr exit 3
-or via return from the program's
-.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
-If a shared object is unloaded from process memory using
-.Xr dlclose 3 ,
-then any functions registered by calling
-.Fn atexit
-from that shared object will be called in reverse order and unregistered.
-Note that it is the source of the call to
-.Fn atexit
-that matters, not the source of the function that was registered.
-.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
-The
-.Nm
-function returns the value 0 if successful; otherwise a non-zero
-value is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-No memory was available to add the function to the list.
-The existing list of functions is unmodified.
-.El
-.Sh SEE ALSO
-.Xr dlclose 3 ,
-.Xr exit 3
-.Sh STANDARDS
-The
-.Fn atexit
-function conforms to
-.St -ansiC .
-.Pp
-Setting
-.Va errno
-on error and the behavior when a shared object is unloaded
-are extensions to that standard.
diff --git a/src/lib/libc/stdlib/atexit.c b/src/lib/libc/stdlib/atexit.c
deleted file mode 100644
index ea9dd129c1..0000000000
--- a/src/lib/libc/stdlib/atexit.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*      $OpenBSD: atexit.c,v 1.27 2017/12/16 20:06:56 guenther Exp $ */
-/*
- * 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:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - 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 BY THE COPYRIGHT HOLDERS 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
- * 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.
- *
- */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <stdlib.h>
-#include <string.h>
-#include <tib.h>
-#include <unistd.h>
-
-#include "atexit.h"
-#include "atfork.h"
-#include "thread_private.h"
-
-struct atexit *__atexit;
-static int restartloop;
-
-/* define and initialize the list */
-struct atfork_listhead _atfork_list = TAILQ_HEAD_INITIALIZER(_atfork_list);
-
-
-/*
- * 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 functions, all pages are mprotect()'ed
- * to prevent unintentional/malicious corruption.
- */
-
-/*
- * Register a function to be performed at exit or when a shared object
- * with the given dso handle is unloaded dynamically.  Also used as
- * the backend for atexit().  For more info on this API, see:
- *
- *      http://www.codesourcery.com/cxx-abi/abi.html#dso-dtor
- */
-int
-__cxa_atexit(void (*func)(void *), void *arg, void *dso)
-{
-        struct atexit *p = __atexit;
-        struct atexit_fn *fnp;
-        int pgsize = getpagesize();
-        int ret = -1;
-
-        if (pgsize < sizeof(*p))
-                return (-1);
-        _ATEXIT_LOCK();
-        p = __atexit;
-        if (p != NULL) {
-                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) {
-                        memset(&p->fns[0], 0, sizeof(p->fns[0]));
-                        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;
-        }
-        fnp = &p->fns[p->ind++];
-        fnp->fn_ptr = func;
-        fnp->fn_arg = arg;
-        fnp->fn_dso = dso;
-        if (mprotect(p, pgsize, PROT_READ))
-                goto unlock;
-        restartloop = 1;
-        ret = 0;
-unlock:
-        _ATEXIT_UNLOCK();
-        return (ret);
-}
-DEF_STRONG(__cxa_atexit);
-
-/*
- * Copy of atexit() used by libc and anything staticly linked into the
- * executable.  This passes NULL for the dso, so the callbacks are only
- * invoked by exit() and not dlclose()
- */
-int
-atexit(void (*fn)(void))
-{
-        return (__cxa_atexit((void (*)(void *))fn, NULL, NULL));
-}
-DEF_STRONG(atexit);
-
-void
-_thread_finalize(void)
-{
-        struct tib *tib = TIB_GET();
-
-        while (tib->tib_atexit) {
-                struct thread_atexit_fn *fnp = tib->tib_atexit;
-                tib->tib_atexit = fnp->next;
-                fnp->func(fnp->arg);
-                free(fnp);
-        }
-}
-
-/*
- * Call all handlers registered with __cxa_atexit() for the shared
- * object owning 'dso'.
- * Note: if 'dso' is NULL, then all remaining handlers are called.
- */
-void
-__cxa_finalize(void *dso)
-{
-        struct atexit *p, *q;
-        struct atexit_fn fn;
-        int n, pgsize = getpagesize();
-        static int call_depth;
-
-        if (dso == NULL)
-                _thread_finalize();
-
-        _ATEXIT_LOCK();
-        call_depth++;
-
-restart:
-        restartloop = 0;
-        for (p = __atexit; p != NULL; p = p->next) {
-                for (n = p->ind; --n >= 0;) {
-                        if (p->fns[n].fn_ptr == NULL)
-                                continue;       /* already called */
-                        if (dso != NULL && dso != p->fns[n].fn_dso)
-                                continue;       /* wrong DSO */
-
-                        /*
-                         * Mark handler as having been already called to avoid
-                         * dupes and loops, then call the appropriate function.
-                         */
-                        fn = p->fns[n];
-                        if (mprotect(p, pgsize, PROT_READ | PROT_WRITE) == 0) {
-                                p->fns[n].fn_ptr = NULL;
-                                mprotect(p, pgsize, PROT_READ);
-                        }
-                        _ATEXIT_UNLOCK();
-                        (*fn.fn_ptr)(fn.fn_arg);
-                        _ATEXIT_LOCK();
-                        if (restartloop)
-                                goto restart;
-                }
-        }
-
-        call_depth--;
-
-        /*
-         * If called via exit(), unmap the pages since we have now run
-         * all the handlers.  We defer this until calldepth == 0 so that
-         * we don't unmap things prematurely if called recursively.
-         */
-        if (dso == NULL && call_depth == 0) {
-                for (p = __atexit; p != NULL; ) {
-                        q = p;
-                        p = p->next;
-                        munmap(q, pgsize);
-                }
-                __atexit = NULL;
-        }
-        _ATEXIT_UNLOCK();
-
-        /*
-         * If unloading a DSO, unregister any atfork handlers registered
-         * by it.  Skip the locking if the list is currently empty.
-         */
-        if (dso != NULL && TAILQ_FIRST(&_atfork_list) != NULL) {
-                struct atfork_fn *af, *afnext;
-
-                _ATFORK_LOCK();
-                TAILQ_FOREACH_SAFE(af, &_atfork_list, fn_next, afnext)
-                        if (af->fn_dso == dso) {
-                                TAILQ_REMOVE(&_atfork_list, af, fn_next);
-                                free(af);
-                        }
-                _ATFORK_UNLOCK();
-
-        }
-}
-DEF_STRONG(__cxa_finalize);
-
-/*
- * Register the cleanup function
- */
-void
-__atexit_register_cleanup(void (*func)(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;
-        } else {
-                if (mprotect(p, pgsize, PROT_READ | PROT_WRITE))
-                        goto unlock;
-        }
-        p->fns[0].fn_ptr = (void (*)(void *))func;
-        p->fns[0].fn_arg = NULL;
-        p->fns[0].fn_dso = NULL;
-        mprotect(p, pgsize, PROT_READ);
-        restartloop = 1;
-unlock:
-        _ATEXIT_UNLOCK();
-}
diff --git a/src/lib/libc/stdlib/atexit.h b/src/lib/libc/stdlib/atexit.h
deleted file mode 100644
index f2fa7bd83f..0000000000
--- a/src/lib/libc/stdlib/atexit.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*      $OpenBSD: atexit.h,v 1.12 2017/12/16 20:06:56 guenther Exp $ */
-
-/*
- * 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:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - 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 BY THE COPYRIGHT HOLDERS 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
- * 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.
- *
- */
-
-struct atexit {
-        struct atexit *next;            /* next in list */
-        int ind;                        /* next index in this table */
-        int max;                        /* max entries >= ATEXIT_SIZE */
-        struct atexit_fn {
-                void (*fn_ptr)(void *);
-                void *fn_arg;           /* argument for CXA callback */
-                void *fn_dso;           /* shared module handle */
-        } fns[1];                       /* the table itself */
-};
-
-/* a chain of these are hung off each thread's TIB's tib_atexit member */
-struct thread_atexit_fn {
-        void (*func)(void *);
-        void *arg;
-        struct thread_atexit_fn *next;
-};
-
-__BEGIN_HIDDEN_DECLS
-extern struct atexit *__atexit;         /* points to head of LIFO stack */
-__END_HIDDEN_DECLS
-
-int     __cxa_atexit(void (*)(void *), void *, void *);
-int     __cxa_thread_atexit(void (*)(void *), void *, void *);
-void    __cxa_finalize(void *);
-
-PROTO_NORMAL(__cxa_atexit);
-PROTO_STD_DEPRECATED(__cxa_thread_atexit);
-PROTO_NORMAL(__cxa_finalize);
diff --git a/src/lib/libc/stdlib/atof.3 b/src/lib/libc/stdlib/atof.3
deleted file mode 100644
index 183f22d358..0000000000
--- a/src/lib/libc/stdlib/atof.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Copyright (c) 1991 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
-.\" 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: atof.3,v 1.9 2019/01/16 12:55:49 schwarze Exp $
-.\"
-.Dd $Mdocdate: January 16 2019 $
-.Dt ATOF 3
-.Os
-.Sh NAME
-.Nm atof
-.Nd convert ASCII string to double
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft double
-.Fn atof "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atof
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Li double
-representation.
-.Pp
-It is equivalent to:
-.Bd -literal -offset indent
-strtod(nptr, (char **)NULL);
-.Ed
-.Sh SEE ALSO
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn atof
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-An
-.Fn atof
-function first appeared in
-.At v1 .
-.Sh CAVEATS
-On systems other than
-.Ox ,
-the
-.Dv LC_NUMERIC
-.Xr locale 1
-category can cause parsing failures; see CAVEATS in
-.Xr setlocale 3
-for details.
diff --git a/src/lib/libc/stdlib/atof.c b/src/lib/libc/stdlib/atof.c
deleted file mode 100644
index d14b58b070..0000000000
--- a/src/lib/libc/stdlib/atof.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*      $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.
- *
- * 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>
-
-double
-atof(const char *ascii)
-{
-        return(strtod(ascii, (char **)NULL));
-}
diff --git a/src/lib/libc/stdlib/atoi.3 b/src/lib/libc/stdlib/atoi.3
deleted file mode 100644
index 0cd90ccffb..0000000000
--- a/src/lib/libc/stdlib/atoi.3
+++ /dev/null
@@ -1,89 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"    The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" 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: atoi.3,v 1.12 2015/09/10 15:16:43 schwarze Exp $
-.\"
-.Dd $Mdocdate: September 10 2015 $
-.Dt ATOI 3
-.Os
-.Sh NAME
-.Nm atoi
-.Nd convert ASCII string to integer
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn atoi "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atoi
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Li integer
-representation.
-.Pp
-It is equivalent to:
-.Bd -literal -offset indent
-(int)strtol(nptr, (char **)NULL, 10);
-.Ed
-.Sh SEE ALSO
-.Xr atof 3 ,
-.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 HISTORY
-An
-.Fn atoi
-function first appeared in
-.At v1 .
-.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
deleted file mode 100644
index 7c9eb1331b..0000000000
--- a/src/lib/libc/stdlib/atoi.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*      $OpenBSD: atoi.c,v 1.6 2015/09/13 08:31:47 guenther 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>
-
-int
-atoi(const char *str)
-{
-        return((int)strtol(str, (char **)NULL, 10));
-}
-DEF_STRONG(atoi);
diff --git a/src/lib/libc/stdlib/atol.3 b/src/lib/libc/stdlib/atol.3
deleted file mode 100644
index c80f61f754..0000000000
--- a/src/lib/libc/stdlib/atol.3
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" Copyright (c) 1990, 1991 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
-.\" 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: atol.3,v 1.10 2015/09/10 15:16:43 schwarze Exp $
-.\"
-.Dd $Mdocdate: September 10 2015 $
-.Dt ATOL 3
-.Os
-.Sh NAME
-.Nm atol
-.Nd convert ASCII string to long integer
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long
-.Fn atol "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atol
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Li long integer
-representation.
-.Pp
-It is equivalent to:
-.Bd -literal -offset indent
-strtol(nptr, (char **)NULL, 10);
-.Ed
-.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 conforms to
-.St -isoC-99 .
diff --git a/src/lib/libc/stdlib/atol.c b/src/lib/libc/stdlib/atol.c
deleted file mode 100644
index 1970804401..0000000000
--- a/src/lib/libc/stdlib/atol.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*      $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.
- *
- * 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
-atol(const char *str)
-{
-        return(strtol(str, (char **)NULL, 10));
-}
diff --git a/src/lib/libc/stdlib/atoll.3 b/src/lib/libc/stdlib/atoll.3
deleted file mode 100644
index 0cf8e40f8e..0000000000
--- a/src/lib/libc/stdlib/atoll.3
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" Copyright (c) 1990, 1991 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
-.\" 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: atoll.3,v 1.8 2015/09/10 15:16:43 schwarze Exp $
-.\"
-.Dd $Mdocdate: September 10 2015 $
-.Dt ATOLL 3
-.Os
-.Sh NAME
-.Nm atoll
-.Nd convert ASCII string to long long integer
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long long
-.Fn atoll "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atoll
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Li long long integer
-representation.
-.Pp
-It is equivalent to:
-.Bd -literal -offset indent
-strtoll(nptr, (char **)NULL, 10);
-.Ed
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn atoll
-function conforms to
-.St -isoC-99 .
diff --git a/src/lib/libc/stdlib/atoll.c b/src/lib/libc/stdlib/atoll.c
deleted file mode 100644
index a65e682cfb..0000000000
--- a/src/lib/libc/stdlib/atoll.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*      $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
deleted file mode 100644
index 9c66eac0fe..0000000000
--- a/src/lib/libc/stdlib/bsearch.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993, 1994
-.\"    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
-.\" 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: bsearch.3,v 1.10 2015/11/30 17:03:05 jmc Exp $
-.\"
-.Dd $Mdocdate: November 30 2015 $
-.Dt BSEARCH 3
-.Os
-.Sh NAME
-.Nm bsearch
-.Nd binary search of a sorted table
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn bsearch "const void *key" "const void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
-.Sh DESCRIPTION
-The
-.Fn bsearch
-function searches an array of
-.Fa nmemb
-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
-.Fa size .
-.Pp
-The contents of the array should be in ascending sorted order according
-to the comparison function referenced by
-.Fa compar .
-The
-.Fa compar
-routine is expected to have 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
-.Fa key
-object is found, respectively, to be less than, to match, or be
-greater than the array member.
-.Sh RETURN VALUES
-The
-.Fn bsearch
-function returns a pointer to a matching member of the array, or a null
-pointer if no match is found.
-If two members compare as equal, which member is matched is unspecified.
-.Sh SEE ALSO
-.Xr dbopen 3 ,
-.Xr lsearch 3 ,
-.Xr qsort 3 ,
-.Xr tsearch 3
-.Sh STANDARDS
-The
-.Fn bsearch
-function conforms to
-.St -ansiC .
diff --git a/src/lib/libc/stdlib/bsearch.c b/src/lib/libc/stdlib/bsearch.c
deleted file mode 100644
index 59d478e7eb..0000000000
--- a/src/lib/libc/stdlib/bsearch.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*      $OpenBSD: bsearch.c,v 1.8 2016/10/22 19:19:34 tb Exp $ */
-/*
- * Copyright (c) 1990 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>
-
-/*
- * Perform a binary search.
- *
- * The code below is a bit sneaky.  After a comparison fails, we
- * divide the work in half by moving either left or right. If lim
- * is odd, moving left simply involves halving lim: e.g., when lim
- * is 5 we look at item 2, so we change lim to 2 so that we will
- * look at items 0 & 1.  If lim is even, the same applies.  If lim
- * is odd, moving right again involves halving lim, this time moving
- * the base up one item past p: e.g., when lim is 5 we change base
- * to item 3 and make lim 2 so that we will look at items 3 and 4.
- * If lim is even, however, we have to shrink it by one before
- * halving: e.g., when lim is 4, we still looked at item 2, so we
- * have to make lim 3, then halve, obtaining 1, so that we will only
- * look at item 3.
- */
-void *
-bsearch(const void *key, const void *base0, size_t nmemb, size_t size,
-    int (*compar)(const void *, const void *))
-{
-        const char *base = base0;
-        int lim, cmp;
-        const void *p;
-
-        for (lim = nmemb; lim != 0; lim >>= 1) {
-                p = base + (lim >> 1) * size;
-                cmp = (*compar)(key, p);
-                if (cmp == 0)
-                        return ((void *)p);
-                if (cmp > 0) {  /* key > p: move right */
-                        base = (char *)p + size;
-                        lim--;
-                } /* else move left */
-        }
-        return (NULL);
-}
diff --git a/src/lib/libc/stdlib/div.3 b/src/lib/libc/stdlib/div.3
deleted file mode 100644
index 421400a294..0000000000
--- a/src/lib/libc/stdlib/div.3
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" 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.
-.\" 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: div.3,v 1.12 2016/08/14 23:18:03 guenther Exp $
-.\"
-.Dd $Mdocdate: August 14 2016 $
-.Dt DIV 3
-.Os
-.Sh NAME
-.Nm div
-.Nd return quotient and remainder from division
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft div_t
-.Fn div "int num" "int denom"
-.Sh DESCRIPTION
-The
-.Fn div
-function computes the value
-.Fa num Ns / Ns Fa denom
-and returns the quotient and remainder in a structure named
-.Fa div_t
-that contains two
-.Li int
-members named
-.Fa quot
-and
-.Fa rem .
-.Sh SEE ALSO
-.Xr imaxdiv 3 ,
-.Xr ldiv 3 ,
-.Xr lldiv 3
-.Sh STANDARDS
-The
-.Fn div
-function conforms to
-.St -ansiC .
diff --git a/src/lib/libc/stdlib/div.c b/src/lib/libc/stdlib/div.c
deleted file mode 100644
index beaa428c7a..0000000000
--- a/src/lib/libc/stdlib/div.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*      $OpenBSD: div.c,v 1.6 2015/09/13 08:31:47 guenther 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>             /* div_t */
-
-div_t
-div(int num, int denom)
-{
-        div_t r;
-
-        r.quot = num / denom;
-        r.rem = num % denom;
-        /*
-         * The ANSI standard says that |r.quot| <= |n/d|, where
-         * n/d is to be computed in infinite precision.  In other
-         * words, we should always truncate the quotient towards
-         * 0, never -infinity.
-         *
-         * Machine division and remainer may work either way when
-         * one or both of n or d is negative.  If only one is
-         * negative and r.quot has been truncated towards -inf,
-         * r.rem will have the same sign as denom and the opposite
-         * sign of num; if both are negative and r.quot has been
-         * truncated towards -inf, r.rem will be positive (will
-         * have the opposite sign of num).  These are considered
-         * `wrong'.
-         *
-         * If both are num and denom are positive, r will always
-         * be positive.
-         *
-         * This all boils down to:
-         *      if num >= 0, but r.rem < 0, we got the wrong answer.
-         * In that case, to get the right answer, add 1 to r.quot and
-         * subtract denom from r.rem.
-         */
-        if (num >= 0 && r.rem < 0) {
-                r.quot++;
-                r.rem -= denom;
-        }
-        return (r);
-}
-DEF_STRONG(div);
diff --git a/src/lib/libc/stdlib/drand48.c b/src/lib/libc/stdlib/drand48.c
deleted file mode 100644
index 429e4cf378..0000000000
--- a/src/lib/libc/stdlib/drand48.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*      $OpenBSD: drand48.c,v 1.7 2015/09/14 13:30:17 guenther Exp $ */
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.
- */
-
-#include <math.h>
-#include "rand48.h"
-
-double
-drand48(void)
-{
-        if (__rand48_deterministic == 0) {
-                unsigned short rseed[3];
-
-                arc4random_buf(rseed, sizeof rseed);
-                return ldexp((double) rseed[0], -48) +
-                       ldexp((double) rseed[1], -32) +
-                       ldexp((double) rseed[2], -16);
-        }
-        return erand48(__rand48_seed);
-}
diff --git a/src/lib/libc/stdlib/ecvt.3 b/src/lib/libc/stdlib/ecvt.3
deleted file mode 100644
index f478f8e4b0..0000000000
--- a/src/lib/libc/stdlib/ecvt.3
+++ /dev/null
@@ -1,166 +0,0 @@
-.\" $OpenBSD: ecvt.3,v 1.13 2019/01/25 00:19:25 millert Exp $
-.\"
-.\" Copyright (c) 2002 Todd C. Miller <millert@openbsd.org>
-.\"
-.\" 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 $Mdocdate: January 25 2019 $
-.Dt ECVT 3
-.Os
-.Sh NAME
-.Nm ecvt ,
-.Nm fcvt ,
-.Nm gcvt
-.Nd convert double to ASCII string
-.Sh SYNOPSIS
-.In 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 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 ;
-as of
-.St -p1003.1-2008
-they are no longer a part of the standard.
-.Sh CAVEATS
-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.
diff --git a/src/lib/libc/stdlib/ecvt.c b/src/lib/libc/stdlib/ecvt.c
deleted file mode 100644
index a6b1d748fe..0000000000
--- a/src/lib/libc/stdlib/ecvt.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*      $OpenBSD: ecvt.c,v 1.11 2019/01/25 00:19:25 millert Exp $       */
-
-/*
- * Copyright (c) 2002, 2006 Todd C. Miller <millert@openbsd.org>
- *
- * 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>
-#include "gdtoa.h"
-
-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, c;
-        size_t siz;
-
-        if (ndigit == 0) {
-                *sign = value < 0.0;
-                *decpt = 0;
-                return ("");
-        }
-
-        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 = malloc(siz)) == NULL)
-                        return(NULL);
-                *rve++ = '0';
-                *rve = '\0';
-        } else {
-                p = __dtoa(value, fmode + 2, ndigit, decpt, sign, &rve);
-                if (p == NULL)
-                        return (NULL);
-                if (*decpt == 9999) {
-                        /* Infinity or Nan, convert to inf or nan like printf */
-                        *decpt = 0;
-                        c = *p;
-                        __freedtoa(p);
-                        return(c == 'I' ? "inf" : "nan");
-                }
-                /* Make a local copy and adjust rve to be in terms of s */
-                if (pad && fmode)
-                        siz += *decpt;
-                if ((s = malloc(siz)) == NULL) {
-                        __freedtoa(p);
-                        return(NULL);
-                }
-                (void) strlcpy(s, p, siz);
-                rve = s + (rve - p);
-                __freedtoa(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
deleted file mode 100644
index db0529f4a0..0000000000
--- a/src/lib/libc/stdlib/erand48.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*      $OpenBSD: erand48.c,v 1.5 2015/09/14 13:30:17 guenther Exp $ */
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.
- */
-
-#include <math.h>
-#include "rand48.h"
-
-double
-erand48(unsigned short xseed[3])
-{
-        __dorand48(xseed);
-        return ldexp((double) xseed[0], -48) +
-               ldexp((double) xseed[1], -32) +
-               ldexp((double) xseed[2], -16);
-}
-DEF_WEAK(erand48);
diff --git a/src/lib/libc/stdlib/exit.3 b/src/lib/libc/stdlib/exit.3
deleted file mode 100644
index a1c43780d6..0000000000
--- a/src/lib/libc/stdlib/exit.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" Copyright (c) 1990, 1991 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
-.\" 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: exit.3,v 1.16 2014/11/30 21:21:59 schwarze Exp $
-.\"
-.Dd $Mdocdate: November 30 2014 $
-.Dt EXIT 3
-.Os
-.Sh NAME
-.Nm exit
-.Nd perform normal program termination
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn exit "int status"
-.Sh DESCRIPTION
-The
-.Fn exit
-function terminates a process.
-.Pp
-Before termination it performs the following functions in the
-order listed:
-.Bl -enum -offset indent
-.It
-Call the functions registered with the
-.Xr atexit 3
-function, in the reverse order of their registration.
-.It
-Flush all open output streams.
-.It
-Close all open streams.
-.It
-Unlink all files created with the
-.Xr tmpfile 3
-function.
-.El
-.Pp
-Following this,
-.Fn exit
-calls
-.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 never returns.
-.Sh SEE ALSO
-.Xr _exit 2 ,
-.Xr atexit 3 ,
-.Xr intro 3 ,
-.Xr sysexits 3 ,
-.Xr tmpfile 3
-.Sh STANDARDS
-The
-.Fn exit
-function conforms to
-.St -isoC-99 .
-.Sh HISTORY
-An
-.Fn exit
-function first appeared as a system call in
-.At v1 .
-It has accepted the
-.Fa status
-argument since
-.At v2 .
-In
-.At v7 ,
-the bare system call was renamed to
-.Xr _exit 2 .
diff --git a/src/lib/libc/stdlib/exit.c b/src/lib/libc/stdlib/exit.c
deleted file mode 100644
index e93d4313e3..0000000000
--- a/src/lib/libc/stdlib/exit.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*      $OpenBSD: exit.c,v 1.14 2017/08/12 22:59:52 guenther 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 <stdlib.h>
-#include <unistd.h>
-#include "atexit.h"
-
-/*
- * 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(int status)
-{
-        /*
-         * Call functions registered by atexit() or _cxa_atexit()
-         * (including the stdio cleanup routine) and then _exit().
-         */
-        __cxa_finalize(NULL);
-        _exit(status);
-}
-DEF_STRONG(exit);
diff --git a/src/lib/libc/stdlib/gcvt.c b/src/lib/libc/stdlib/gcvt.c
deleted file mode 100644
index f9528e7e7a..0000000000
--- a/src/lib/libc/stdlib/gcvt.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*      $OpenBSD: gcvt.c,v 1.14 2019/01/25 00:19:25 millert Exp $       */
-
-/*
- * Copyright (c) 2002, 2003, 2006, 2010
- *      Todd C. Miller <millert@openbsd.org>
- *
- * 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>
-#include "gdtoa.h"
-
-#define DEFPREC 6
-
-char *
-gcvt(double value, int ndigit, char *buf)
-{
-        char *digits, *dst, *src;
-        int i, decpt, sign;
-        struct lconv *lconv;
-
-        lconv = localeconv();
-        if (ndigit <= 0) {
-                /* Match printf(3) behavior. */
-                ndigit = ndigit ? DEFPREC : 1;
-        }
-
-        digits = __dtoa(value, 2, ndigit, &decpt, &sign, NULL);
-        if (digits == NULL)
-                return (NULL);
-        if (decpt == 9999) {
-                /*
-                 * Infinity or NaN, convert to inf or nan with sign.
-                 * We can't infer buffer size based on ndigit.
-                 * We have to assume it is at least 5 chars.
-                 */
-                snprintf(buf, 5, "%s%s", sign ? "-" : "",
-                    *digits == 'I' ? "inf" : "nan");
-                __freedtoa(digits);
-                return (buf);
-        }
-
-        dst = buf;
-        if (sign)
-                *dst++ = '-';
-
-        /* Match printf(3) behavior for exponential vs. regular fomatting. */
-        if (decpt <= -4 || decpt > ndigit) {
-                /* exponential format (e.g. 1.2345e+13) */
-                if (--decpt < 0) {
-                        sign = 1;
-                        decpt = -decpt;
-                } else
-                        sign = 0;
-                src = digits;
-                *dst++ = *src++;
-                if (*src != '\0') {
-                        *dst++ = *lconv->decimal_point;
-                        do {
-                                *dst++ = *src++;
-                        } while (*src != '\0');
-                }
-                *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;
-                        while (decpt < 0) {
-                                *dst++ = '0';
-                                decpt++;
-                        }
-                        for (i = decpt; digits[i] != '\0'; i++) {
-                                *dst++ = digits[i];
-                        }
-                }
-                *dst = '\0';
-        }
-        __freedtoa(digits);
-        return (buf);
-}
diff --git a/src/lib/libc/stdlib/getenv.3 b/src/lib/libc/stdlib/getenv.3
deleted file mode 100644
index ce2ef43b6f..0000000000
--- a/src/lib/libc/stdlib/getenv.3
+++ /dev/null
@@ -1,185 +0,0 @@
-.\" Copyright (c) 1988, 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
-.\" 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: getenv.3,v 1.21 2014/07/11 09:24:03 tedu Exp $
-.\"
-.Dd $Mdocdate: July 11 2014 $
-.Dt GETENV 3
-.Os
-.Sh NAME
-.Nm getenv ,
-.Nm putenv ,
-.Nm setenv ,
-.Nm unsetenv
-.Nd environment variable functions
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft char *
-.Fn getenv "const char *name"
-.Ft int
-.Fn setenv "const char *name" "const char *value" "int overwrite"
-.Ft int
-.Fn putenv "char *string"
-.Ft int
-.Fn unsetenv "const char *name"
-.Sh DESCRIPTION
-These functions set, unset, and fetch environment variables from the host
-.Em environment list .
-.Pp
-The
-.Fn getenv
-function obtains the current value of the environment variable
-.Fa name .
-If the variable
-.Fa name
-is not in the current environment, a null pointer is returned.
-.Pp
-The
-.Fn setenv
-function inserts or resets the environment variable
-.Fa name
-in the current environment list.
-If the variable
-.Fa name
-does not exist in the list, it is inserted with the given
-.Fa value .
-If the variable does exist, the argument
-.Fa overwrite
-is tested; if
-.Fa overwrite
-is zero, the variable is not reset, otherwise it is reset to the given
-.Fa value .
-.Pp
-The
-.Fn putenv
-function takes an argument of the form
-.Ar name Ns = Ns Ar value .
-The memory pointed to by
-.Ar string
-becomes part of the environment and must not be deallocated by the caller.
-If the variable already exists, it will be overwritten.
-A common source of bugs is to pass a
-.Ar string
-argument that is a locally scoped string buffer.
-This will result in corruption of the environment after leaving
-the scope in which the variable is defined.
-For this reason, the
-.Fn setenv
-function is preferred over
-.Fn putenv .
-.Pp
-The
-.Fn unsetenv
-function deletes all instances of the variable name pointed to by
-.Fa name
-from the list.
-.Sh RETURN VALUES
-.Rv -std putenv setenv unsetenv
-.Pp
-The
-.Fn getenv
-function returns a pointer to the requested value, or
-.Dv NULL
-if it could not be found.
-If
-.Fn getenv
-is successful, the string returned should be considered read-only.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fn setenv
-or
-.Fn unsetenv
-function was passed an empty
-.Ar name
-or a NULL pointer, or was passed a
-.Ar name
-containing an
-.Sq =
-character.
-.Pp
-The
-.Fn putenv
-function was passed a
-.Ar string
-that did not contain an
-.Sq =
-character.
-.It Bq Er ENOMEM
-The
-.Fn setenv
-or
-.Fn putenv
-function failed because it was unable to allocate memory for the environment.
-.El
-.Sh SEE ALSO
-.Xr csh 1 ,
-.Xr sh 1 ,
-.Xr execve 2 ,
-.Xr issetugid 2 ,
-.Xr environ 7
-.Sh STANDARDS
-The
-.Fn getenv
-function conforms to
-.St -ansiC .
-The
-.Fn putenv ,
-.Fn setenv ,
-and
-.Fn unsetenv
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The function
-.Fn getenv
-appeared in
-.At v7
-and
-.Bx 3 .
-The functions
-.Fn setenv
-and
-.Fn unsetenv
-appeared in
-.Bx 4.3 Tahoe .
-The
-.Fn putenv
-function appeared in
-.Bx 4.3 Reno .
-.Sh CAVEATS
-Library code must be careful about using
-.Fn getenv
-to read untrusted environment variables in setuid programs.
-The
-.Fn issetugid
-function is provided for this purpose.
diff --git a/src/lib/libc/stdlib/getenv.c b/src/lib/libc/stdlib/getenv.c
deleted file mode 100644
index 054497b432..0000000000
--- a/src/lib/libc/stdlib/getenv.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*      $OpenBSD: getenv.c,v 1.12 2016/03/13 18:34:21 guenther Exp $ */
-/*
- * Copyright (c) 1987, 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 <stdlib.h>
-#include <string.h>
-
-
-/*
- * __findenv --
- *      Returns pointer to value associated with name, if any, else NULL.
- *      Starts searching within the environmental array at offset.
- *      Sets offset to be the offset of the name/value combination in the
- *      environmental array, for use by putenv(3), setenv(3) and unsetenv(3).
- *      Explicitly removes '=' in argument name.
- *
- *      This routine *should* be a static; don't use it.
- */
-char *
-__findenv(const char *name, int len, int *offset)
-{
-        int i;
-        const char *np;
-        char **p, *cp;
-
-        if (name == NULL || environ == NULL)
-                return (NULL);
-        for (p = environ + *offset; (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 = 0;
-        const char *np;
-
-        for (np = name; *np && *np != '='; ++np)
-                ;
-        return (__findenv(name, (int)(np - name), &offset));
-}
-DEF_STRONG(getenv);
diff --git a/src/lib/libc/stdlib/getopt.3 b/src/lib/libc/stdlib/getopt.3
deleted file mode 100644
index af43ca6660..0000000000
--- a/src/lib/libc/stdlib/getopt.3
+++ /dev/null
@@ -1,363 +0,0 @@
-.\" 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.
-.\"
-.\"     $OpenBSD: getopt.3,v 1.46 2016/01/04 19:43:13 tb Exp $
-.\"
-.Dd $Mdocdate: January 4 2016 $
-.Dt GETOPT 3
-.Os
-.Sh NAME
-.Nm getopt
-.Nd get option character from command line argument list
-.Sh SYNOPSIS
-.In unistd.h
-.Vt extern char *optarg;
-.Vt extern int   opterr;
-.Vt extern int   optind;
-.Vt extern int   optopt;
-.Vt extern int   optreset;
-.Ft int
-.Fn getopt "int argc" "char * const *argv" "const char *optstring"
-.Sh DESCRIPTION
-The
-.Fn getopt
-function incrementally parses a command line argument list
-.Fa argv
-and returns the next
-.Em known
-option character.
-An option character is
-.Em known
-if it has been specified in the string of accepted option characters,
-.Fa optstring .
-.Pp
-The option string
-.Fa optstring
-may contain the following elements: individual characters,
-characters followed by a colon, and characters followed by two colons.
-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
-.Qq x
-recognizes an option
-.Fl x ,
-and an option string
-.Qq Li x:
-recognizes an option and argument
-.Fl x Ar argument .
-It does not matter to
-.Fn getopt
-if a following argument has leading whitespace; except in the case where
-the argument is optional, denoted with two colons, no leading whitespace
-is permitted.
-.Pp
-On return from
-.Fn getopt ,
-.Va optarg
-points to an option argument, if it is anticipated,
-and the variable
-.Va optind
-contains the index to the next
-.Fa argv
-argument for a subsequent call
-to
-.Fn getopt .
-.Pp
-The variables
-.Va opterr
-and
-.Va optind
-are both initialized to 1.
-The
-.Va optind
-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
-.Fa argv
-entries.
-An
-.Va optind
-value of 0 is reserved for compatibility with GNU
-.Fn getopt .
-.Pp
-In order to use
-.Fn getopt
-to evaluate multiple sets of arguments, or to evaluate a single set of
-arguments multiple times,
-the variable
-.Va optreset
-must be set to 1 before the second and each additional set of calls to
-.Fn getopt ,
-and the variable
-.Va optind
-must be reinitialized.
-.Pp
-The
-.Fn getopt
-function returns \-1 when the argument list is exhausted.
-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 return \-1.
-When all options have been processed (i.e., up to the first non-option
-argument),
-.Fn getopt
-returns \-1.
-.Sh RETURN VALUES
-The
-.Fn getopt
-function returns the next known option character in
-.Fa optstring .
-If
-.Fn getopt
-encounters a character not found in
-.Fa optstring
-or if it detects a missing option argument,
-it returns
-.Sq \&?
-(question mark).
-If
-.Fa optstring
-has a leading
-.Sq \&:
-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
-.Fn getopt
-function returns \-1 when the argument list is exhausted.
-.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) {
-        switch (ch) {
-        case 'b':
-                bflag = 1;
-                break;
-        case 'f':
-                if ((fd = open(optarg, O_RDONLY, 0)) == -1)
-                        err(1, "%s", optarg);
-                break;
-        default:
-                usage();
-        }
-}
-argc -= optind;
-argv += optind;
-.Ed
-.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 implements a superset of the functionality specified by
-.St -p1003.1 .
-.Pp
-The following extensions are supported:
-.Bl -bullet
-.It
-The
-.Va optreset
-variable was added to make it possible to call the
-.Fn getopt
-function multiple times.
-.It
-If the
-.Va optind
-variable is set to 0,
-.Fn getopt
-will behave as if the
-.Va optreset
-variable has been set.
-This is for compatibility with
-.Tn GNU
-.Fn getopt .
-New code should use
-.Va optreset
-instead.
-.It
-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
-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
-A single dash
-.Pq Ql -
-may be specified as a character in
-.Fa optstring ,
-however it should
-.Em never
-have an argument associated with it.
-This allows
-.Fn getopt
-to be used with programs that expect
-.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.
-.El
-.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
-.In stdio.h .
-.Pp
-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
-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 and can handle mixed
-number and letter arguments.
-.Bd -literal -offset indent
-int aflag = 0, bflag = 0, ch, lastch = '\e0';
-int length = -1, newarg = 1, prevoptind = 1;
-
-while ((ch = getopt(argc, argv, "0123456789ab")) != -1) {
-        switch (ch) {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-                if (newarg || !isdigit(lastch))
-                        length = 0;
-                else if (length > INT_MAX / 10)
-                        usage();
-                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_long.3 b/src/lib/libc/stdlib/getopt_long.3
deleted file mode 100644
index 706619203f..0000000000
--- a/src/lib/libc/stdlib/getopt_long.3
+++ /dev/null
@@ -1,460 +0,0 @@
-.\"     $OpenBSD: getopt_long.3,v 1.22 2020/01/13 18:05:10 stsp 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 $Mdocdate: January 13 2020 $
-.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
-.In 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
-Abbreviated long option names are accepted when
-.Fn getopt_long
-processes long options if the abbreviation is unique.
-An exact match is always preferred for a defined long option.
-.Pp
-By default,
-.Fn getopt_long
-permutes
-.Ar argv
-such that all option arguments are evaluated before any non-options arguments.
-If the first character of
-.Fa optstring
-is a plus sign
-.Pq Ql +
-or if the environment variable
-.Ev POSIXLY_CORRECT
-is set, then
-.Ar argv
-is processed in order and option processing stops as soon as the first
-non-option argument is encountered.
-.Pp
-The
-.Fn getopt_long
-call requires an array to be initialized describing the long
-options.
-Each element of the array is a structure:
-.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 IMPLEMENTATION DIFFERENCES
-This section describes differences to the GNU implementation
-found in glibc-2.1.3:
-.Bl -bullet
-.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 +
-in the
-.Ar optstring
-is ignored.
-.El
-.Sh EXAMPLES
-.Bd -literal
-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();
-        }
-argc -= optind;
-argv += optind;
-.Ed
-.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
deleted file mode 100644
index 0de50457c2..0000000000
--- a/src/lib/libc/stdlib/getopt_long.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/*      $OpenBSD: getopt_long.c,v 1.32 2020/05/27 22:25:09 schwarze Exp $       */
-/*      $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $      */
-
-/*
- * Copyright (c) 2002 Todd C. Miller <millert@openbsd.org>
- *
- * 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.
- *
- * 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>
-
-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 */
-
-#if 0
-/* DEF_* only work on initialized (non-COMMON) variables */
-DEF_WEAK(opterr);
-DEF_WEAK(optind);
-DEF_WEAK(optopt);
-#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, 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];
-                        ((char **)nargv)[pos] = nargv[cstart];
-                        ((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, int flags)
-{
-        char *current_argv, *has_equal;
-        size_t current_argv_len;
-        int i, match, exact_match, second_partial_match;
-
-        current_argv = place;
-        match = -1;
-        exact_match = 0;
-        second_partial_match = 0;
-
-        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;
-                        exact_match = 1;
-                        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)        /* first partial match */
-                        match = i;
-                else if ((flags & FLAG_LONGONLY) ||
-                    long_options[i].has_arg != long_options[match].has_arg ||
-                    long_options[i].flag != long_options[match].flag ||
-                    long_options[i].val != long_options[match].val)
-                        second_partial_match = 1;
-        }
-        if (!exact_match && second_partial_match) {
-                /* 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);
-
-        /*
-         * 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;
-
-        /*
-         * Disable GNU extensions if POSIXLY_CORRECT is set or options
-         * string begins with a '+'.
-         */
-        if (posixly_correct == -1 || optreset)
-                posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
-        if (*options == '-')
-                flags |= FLAG_ALLARGS;
-        else if (posixly_correct || *options == '+')
-                flags &= ~FLAG_PERMUTE;
-        if (*options == '+' || *options == '-')
-                options++;
-
-        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, flags);
-                if (optchar != -1) {
-                        place = EMSG;
-                        return (optchar);
-                }
-        }
-
-        if ((optchar = (int)*place++) == (int)':' ||
-            (oli = strchr(options, optchar)) == NULL) {
-                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, flags);
-                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;
-                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];
-                }
-                place = EMSG;
-                ++optind;
-        }
-        /* dump back option letter */
-        return (optchar);
-}
-
-/*
- * getopt --
- *      Parse argc/argv argument vector.
- */
-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));
-}
-
-/*
- * 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
deleted file mode 100644
index 335a4b9c07..0000000000
--- a/src/lib/libc/stdlib/getsubopt.3
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" $OpenBSD: getsubopt.3,v 1.14 2014/11/15 14:41:02 bentley 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 $Mdocdate: November 15 2014 $
-.Dt GETSUBOPT 3
-.Os
-.Sh NAME
-.Nm getsubopt
-.Nd get sub options from an argument
-.Sh SYNOPSIS
-.In 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
deleted file mode 100644
index 735c85ba8a..0000000000
--- a/src/lib/libc/stdlib/getsubopt.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*      $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
deleted file mode 100644
index 90bde1995f..0000000000
--- a/src/lib/libc/stdlib/hcreate.3
+++ /dev/null
@@ -1,234 +0,0 @@
-.\"     $OpenBSD: hcreate.3,v 1.8 2018/01/30 11:37:58 jmc Exp $
-.\"     $NetBSD: hcreate.3,v 1.8 2010/05/01 06:18:03 jruoho 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.
-.\"
-.\" 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 $Mdocdate: January 30 2018 $
-.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 the hash table.
-It returns a pointer into the
-hash table indicating the address of an item.
-The
-.Fa item
-argument is of type
-.Vt ENTRY ,
-defined in the
-.In search.h
-header.
-This is a structure type that contains two pointers:
-.Pp
-.Bl -tag -compact -offset indent -width "void *data "
-.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
-.Vt 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
-.Pp
-Note that the comparison
-.Fa key
-must be allocated using
-.Xr malloc 3
-or
-.Xr calloc 3
-if action is
-.Dv ENTER
-and
-.Fn hdestroy
-will be called.
-This is because
-.Fn hdestroy
-will call
-.Xr free 3
-for each comparison
-.Fa key
-(but not
-.Fa data ) .
-Typically the comparison
-.Fa key
-is allocated by using
-.Xr strdup 3 .
-.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
-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
-The
-.Fn hcreate ,
-.Fn hdestroy
-and
-.Fn hsearch
-functions conform to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Fn hcreate ,
-.Fn hdestroy
-and
-.Fn hsearch
-functions first appeared in
-.At V .
-.Sh CAVEATS
-At least the following limitations can be mentioned:
-.Bl -bullet
-.It
-The interface permits the use of only one hash table at a time.
-.It
-Individual hash table entries can be added, but not deleted.
-.It
-The standard is indecipherable about the
-internal memory usage of the functions,
-mentioning only that
-.Do
-.Fn hcreate
-and
-.Fn hsearch
-functions may use
-.Fn malloc
-to allocate space
-.Dc .
-This limits the portability of the functions,
-given that other implementations may not
-.Xr free 3
-the buffer pointed by
-.Fa key .
-.El
diff --git a/src/lib/libc/stdlib/hcreate.c b/src/lib/libc/stdlib/hcreate.c
deleted file mode 100644
index b31108a90e..0000000000
--- a/src/lib/libc/stdlib/hcreate.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*      $OpenBSD: hcreate.c,v 1.7 2016/05/29 20:47:49 guenther 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 <assert.h>
-#include <errno.h>
-#include <stdint.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/queue.h>
-
-#include <db.h>         /* for __default_hash */
-
-#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)
-
-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 = calloc(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
deleted file mode 100644
index f1db2205b0..0000000000
--- a/src/lib/libc/stdlib/heapsort.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*      $OpenBSD: heapsort.c,v 1.11 2017/05/20 12:48:56 millert Exp $ */
-/*-
- * Copyright (c) 1991, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ronnie Kon at Mindcraft Inc., Kevin Lew and Elmer Yglesias.
- *
- * 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 <sys/types.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/*
- * Swap two areas of size number of bytes.  Although qsort(3) permits random
- * blocks of memory to be sorted, sorting pointers is almost certainly the
- * common case (and, were it not, could easily be made so).  Regardless, it
- * isn't worth optimizing; the SWAP's get sped up by the cache, and pointer
- * arithmetic gets lost in the time required for comparison function calls.
- */
-#define SWAP(a, b, count, size, tmp) { \
-        count = size; \
-        do { \
-                tmp = *a; \
-                *a++ = *b; \
-                *b++ = tmp; \
-        } while (--count); \
-}
-
-/* Copy one block of size size to another. */
-#define COPY(a, b, count, size, tmp1, tmp2) { \
-        count = size; \
-        tmp1 = a; \
-        tmp2 = b; \
-        do { \
-                *tmp1++ = *tmp2++; \
-        } while (--count); \
-}
-
-/*
- * 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 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) { \
-        for (par_i = initval; (child_i = par_i * 2) <= nmemb; \
-            par_i = child_i) { \
-                child = base + child_i * size; \
-                if (child_i < nmemb && compar(child, child + size) < 0) { \
-                        child += size; \
-                        ++child_i; \
-                } \
-                par = base + par_i * size; \
-                if (compar(child, par) <= 0) \
-                        break; \
-                SWAP(par, child, count, size, tmp); \
-        } \
-}
-
-/*
- * 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
- * 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 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
- * average case. See Knuth, Vol. 3, page 158, problem 18.
- *
- * XXX Don't break the #define SELECT line, below.  Reiser cpp gets upset.
- */
-#define SELECT(par_i, child_i, nmemb, par, child, size, k, count, tmp1, tmp2) { \
-        for (par_i = 1; (child_i = par_i * 2) <= nmemb; par_i = child_i) { \
-                child = base + child_i * size; \
-                if (child_i < nmemb && compar(child, child + size) < 0) { \
-                        child += size; \
-                        ++child_i; \
-                } \
-                par = base + par_i * size; \
-                COPY(par, child, count, size, tmp1, tmp2); \
-        } \
-        for (;;) { \
-                child_i = par_i; \
-                par_i = child_i / 2; \
-                child = base + child_i * size; \
-                par = base + par_i * size; \
-                if (child_i == 1 || compar(k, par) < 0) { \
-                        COPY(child, k, count, size, tmp1, tmp2); \
-                        break; \
-                } \
-                COPY(child, par, count, size, tmp1, tmp2); \
-        } \
-}
-
-/*
- * Heapsort -- Knuth, Vol. 3, page 145.  Runs in O (N lg N), both average
- * and worst.  While heapsort is faster than the worst case of quicksort,
- * the BSD quicksort does median selection so that the chance of finding
- * a data set that will trigger the worst case is nonexistent.  Heapsort's
- * only advantage over quicksort is that it requires little additional memory.
- */
-int
-heapsort(void *vbase, size_t nmemb, size_t size,
-    int (*compar)(const void *, const void *))
-{
-        size_t cnt, i, j, l;
-        char tmp, *tmp1, *tmp2;
-        char *base, *k, *p, *t;
-
-        if (nmemb <= 1)
-                return (0);
-
-        if (!size) {
-                errno = EINVAL;
-                return (-1);
-        }
-
-        if ((k = malloc(size)) == NULL)
-                return (-1);
-
-        /*
-         * Items are numbered from 1 to nmemb, so offset from size bytes
-         * below the starting address.
-         */
-        base = (char *)vbase - size;
-
-        for (l = nmemb / 2 + 1; --l;)
-                CREATE(l, nmemb, i, j, t, p, size, cnt, tmp);
-
-        /*
-         * For each element of the heap, save the largest element into its
-         * final slot, save the displaced element (k), then recreate the
-         * heap.
-         */
-        while (nmemb > 1) {
-                COPY(k, base + nmemb * size, cnt, size, tmp1, tmp2);
-                COPY(base + nmemb * size, base + size, cnt, size, tmp1, tmp2);
-                --nmemb;
-                SELECT(i, j, nmemb, t, p, size, k, cnt, tmp1, tmp2);
-        }
-        free(k);
-        return (0);
-}
-DEF_WEAK(heapsort);
diff --git a/src/lib/libc/stdlib/icdb.c b/src/lib/libc/stdlib/icdb.c
deleted file mode 100644
index 2ddd9db48c..0000000000
--- a/src/lib/libc/stdlib/icdb.c
+++ /dev/null
@@ -1,391 +0,0 @@
-/* $OpenBSD: icdb.c,v 1.8 2016/09/04 16:56:02 nicm Exp $ */
-/*
- * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
- *
- * 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 <fcntl.h>
-#include <icdb.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <sys/mman.h>
-#include <sys/stat.h>
-
-#include <siphash.h>
-
-/*
- * Creating a new icdb: icdb_new
- * Opening existing icdb: icdb_open
- *
- * Adding new entries: icdb_add
- * Adding entries does not update the disk or indices.
- *
- * Save to disk: icdb_save
- * Update indices: icdb_rehash
- * icdb_save will call rehash.
- *
- * Change an existing entry: icdb_update
- * Changing entries does write to disk.
- *
- * Find an entry: icdb_lookup
- * Looking up an entry is only defined when the indices are synced.
- *
- * Close and free resources: icdb_close
- */
-
-/*
- * There are two major modes of operation.
- *
- * Existing databases use the mmap codepath. The entire database is mapped
- * into the address space for quick access. Individual entries may be updated,
- * but no new entries added.
- *
- * New databases use malloc backed memory instead. The database may be saved
- * with icdb_save. It should be saved to a new file to avoid corrupting any
- * open databases in other processes.
- */
-
-/*
- * An icdb has the following format:
- *   struct icbinfo header
- *   indexes [ uint32_t * indexsize * nkeys ]
- *   entries [ entrysize * nentries ]
- *
- * To find an entry in the file, the user specifies which key to use.
- * The key is hashed and looked up in the index. The index contains the
- * position of the entry in the entries array. -1 identifies not found.
- * Chaining is done by rehashing the hash. All keys are fixed size byte arrays.
- */
-
-/*
- * Header info for icdb. This struct is stored on disk.
- */
-struct icdbinfo {
-        uint32_t magic;         /* magic */
-        uint32_t version;       /* user specified version */
-        uint32_t nentries;      /* number of entries stored */
-        uint32_t entrysize;     /* size of each entry */
-        uint32_t indexsize;     /* number of entries in hash index */
-        uint32_t nkeys;         /* number of keys defined */
-        uint32_t keysize[8];    /* size of each key */
-        uint32_t keyoffset[8];  /* offset of each key in entry */
-        SIPHASH_KEY siphashkey; /* random hash key */
-};
-
-/*
- * In memory representation with auxiliary data.
- * idxdata and entries will be written to disk after info.
- */
-struct icdb {
-        struct icdbinfo *info;
-        void *idxdata[8];
-        void *entries;
-        size_t maplen;
-        uint32_t allocated;
-        int fd;
-};
-
-static const uint32_t magic = 0x1ca9d0b7;
-
-static uint32_t
-roundup(uint32_t num)
-{
-        uint32_t r = 2;
-
-        while (r < num * 3 / 2)
-                r *= 2;
-        return r;
-}
-
-struct icdb *
-icdb_new(uint32_t version, uint32_t nentries, uint32_t entrysize,
-    uint32_t nkeys, const uint32_t *keysizes, const uint32_t *keyoffsets)
-{
-        struct icdb *db;
-        struct icdbinfo *info;
-        int i;
-
-        if (entrysize == 0 || entrysize > 1048576 || nkeys > 8) {
-                errno = EINVAL;
-                return NULL;
-        }
-
-        if (!(db = calloc(1, sizeof(*db))))
-                return NULL;
-        if (!(info = calloc(1, sizeof(*info)))) {
-                free(db);
-                return NULL;
-        }
-        db->info = info;
-        db->fd = -1;
-        info->magic = magic;
-        info->version = version;
-        if (nentries)
-                if ((db->entries = reallocarray(NULL, nentries, entrysize)))
-                        db->allocated = nentries;
-        info->entrysize = entrysize;
-        info->nkeys = nkeys;
-        for (i = 0; i < nkeys; i++) {
-                info->keysize[i] = keysizes[i];
-                info->keyoffset[i] = keyoffsets[i];
-        }
-        return db;
-}
-DEF_WEAK(icdb_new);
-
-struct icdb *
-icdb_open(const char *name, int flags, uint32_t version)
-{
-        struct icdb *db = NULL;
-        struct icdbinfo *info;
-        struct stat sb;
-        uint8_t *ptr = MAP_FAILED;
-        uint32_t baseoff, indexsize, idxmask, idxlen;
-        int fd, i, saved_errno;
-
-        if ((fd = open(name, flags | O_CLOEXEC)) == -1)
-                return NULL;
-        if (fstat(fd, &sb) != 0)
-                goto fail;
-        if (sb.st_size < sizeof(struct icdbinfo))
-                goto fail;
-        ptr = mmap(NULL, sb.st_size, PROT_READ |
-            ((flags & O_RDWR) ? PROT_WRITE : 0), MAP_SHARED, fd, 0);
-        if (ptr == MAP_FAILED)
-                goto fail;
-        info = (struct icdbinfo *)ptr;
-        if (info->magic != magic || info->version != version) {
-                errno = ENOENT;
-                goto fail;
-        }
-
-        if (!(db = calloc(1, sizeof(*db))))
-                goto fail;
-        db->info = info;
-
-        indexsize = info->indexsize;
-        idxmask = indexsize - 1;
-        idxlen = indexsize * sizeof(uint32_t);
-        baseoff = sizeof(*info) + idxlen * info->nkeys;
-
-        for (i = 0; i < info->nkeys; i++)
-                db->idxdata[i] = ptr + sizeof(*info) + i * idxlen;
-        db->entries = ptr + baseoff;
-        db->maplen = sb.st_size;
-        db->fd = fd;
-        return db;
-
-fail:
-        saved_errno = errno;
-        if (ptr != MAP_FAILED)
-                munmap(ptr, sb.st_size);
-        if (fd != -1)
-                close(fd);
-        free(db);
-        errno = saved_errno;
-        return NULL;
-}
-DEF_WEAK(icdb_open);
-
-int
-icdb_get(struct icdb *db, void *entry, uint32_t idx)
-{
-        uint32_t entrysize = db->info->entrysize;
-
-        memcpy(entry, (uint8_t *)db->entries + idx * entrysize, entrysize);
-        return 0;
-}
-DEF_WEAK(icdb_get);
-
-int
-icdb_lookup(struct icdb *db, int keynum, const void *key, void *entry,
-    uint32_t *idxp)
-{
-        struct icdbinfo *info = db->info;
-        uint32_t offset;
-        uint64_t hash;
-        uint32_t indexsize, idxmask, idxlen;
-        uint32_t *idxdata;
-
-        indexsize = info->indexsize;
-        idxmask = indexsize - 1;
-        idxlen = indexsize * sizeof(uint32_t);
-
-        idxdata = db->idxdata[keynum];
-
-        hash = SipHash24(&info->siphashkey, key, info->keysize[keynum]);
-        while ((offset = idxdata[hash & idxmask]) != -1) {
-                if (icdb_get(db, entry, offset) != 0) {
-                        errno = ENOENT;
-                        return -1;
-                }
-                if (memcmp((uint8_t *)entry + info->keyoffset[keynum], key,
-                    info->keysize[keynum]) == 0) {
-                        if (idxp)
-                                *idxp = offset;
-                        return 0;
-                }
-                hash = SipHash24(&info->siphashkey, &hash, sizeof(hash));
-        }
-        return 1;
-}
-DEF_WEAK(icdb_lookup);
-
-int
-icdb_nentries(struct icdb *db)
-{
-        return db->info->nentries;
-}
-DEF_WEAK(icdb_nentries);
-
-const void *
-icdb_entries(struct icdb *db)
-{
-        return db->entries;
-}
-DEF_WEAK(icdb_entries);
-
-int
-icdb_update(struct icdb *db, const void *entry, int offset)
-{
-        struct icdbinfo *info = db->info;
-        uint32_t entrysize = info->entrysize;
-        uint32_t baseoff;
-        uint32_t indexsize, idxmask, idxlen;
-
-        indexsize = info->indexsize;
-        idxmask = indexsize - 1;
-        idxlen = indexsize * sizeof(uint32_t);
-        baseoff = sizeof(*info) + idxlen * info->nkeys;
-
-        memcpy((uint8_t *)db->entries + offset * entrysize, entry, entrysize);
-        if (db->fd != -1) {
-                msync((uint8_t *)db->entries + offset * entrysize, entrysize,
-                    MS_SYNC);
-        }
-        return 0;
-}
-DEF_WEAK(icdb_update);
-
-int
-icdb_add(struct icdb *db, const void *entry)
-{
-        struct icdbinfo *info = db->info;
-        size_t entrysize = info->entrysize;
-
-        if (db->allocated == info->nentries) {
-                void *p;
-                size_t amt = db->allocated ? db->allocated * 2 : 63;
-                if (!(p = reallocarray(db->entries, amt, entrysize)))
-                        return -1;
-                db->allocated = amt;
-                db->entries = p;
-        }
-        memcpy((uint8_t *)db->entries + info->nentries * entrysize,
-            entry, entrysize);
-        info->nentries++;
-        return 0;
-}
-DEF_WEAK(icdb_add);
-
-int
-icdb_rehash(struct icdb *db)
-{
-        struct icdbinfo *info = db->info;
-        uint32_t entrysize = info->entrysize;
-        uint32_t indexsize, idxmask, idxlen;
-        int i, j;
-
-        indexsize = info->indexsize = roundup(info->nentries);
-        idxmask = indexsize - 1;
-        idxlen = sizeof(uint32_t) * indexsize;
-
-        arc4random_buf(&info->siphashkey, sizeof(info->siphashkey));
-
-        for (i = 0; i < info->nkeys; i++) {
-                uint32_t *idxdata = reallocarray(db->idxdata[i],
-                    indexsize, sizeof(uint32_t));
-                if (!idxdata)
-                        return -1;
-                memset(idxdata, 0xff, idxlen);
-                db->idxdata[i] = idxdata;
-        }
-        for (j = 0; j < info->nentries; j++) {
-                for (i = 0; i < info->nkeys; i++) {
-                        uint32_t *idxdata = db->idxdata[i];
-                        uint64_t hash = SipHash24(&info->siphashkey,
-                            (uint8_t *)db->entries + j * entrysize +
-                            info->keyoffset[i], info->keysize[i]);
-                        while (idxdata[hash & idxmask] != -1)
-                                hash = SipHash24(&info->siphashkey, &hash, sizeof(hash));
-                        idxdata[hash & idxmask] = j;
-                }
-        }
-        return 0;
-}
-DEF_WEAK(icdb_rehash);
-
-int
-icdb_save(struct icdb *db, int fd)
-{
-        struct icdbinfo *info = db->info;
-        uint32_t entrysize = info->entrysize;
-        uint32_t indexsize, idxlen;
-        int i;
-
-        if (icdb_rehash(db) != 0)
-                return -1;
-
-        indexsize = info->indexsize;
-        idxlen = sizeof(uint32_t) * indexsize;
-
-        if (ftruncate(fd, 0) != 0)
-                return -1;
-        if (write(fd, info, sizeof(*info)) != sizeof(*info))
-                return -1;
-        for (i = 0; i < info->nkeys; i++) {
-                if (write(fd, db->idxdata[i], idxlen) != idxlen)
-                        return -1;
-        }
-        if (write(fd, db->entries, info->nentries * entrysize) !=
-            info->nentries * entrysize)
-                return -1;
-        return 0;
-}
-DEF_WEAK(icdb_save);
-
-int
-icdb_close(struct icdb *db)
-{
-        int i;
-
-        if (db->fd == -1) {
-                for (i = 0; i < db->info->nkeys; i++)
-                        free(db->idxdata[i]);
-                free(db->entries);
-                free(db->info);
-        } else {
-                munmap(db->info, db->maplen);
-                close(db->fd);
-        }
-        free(db);
-        return 0;
-}
-DEF_WEAK(icdb_close);
diff --git a/src/lib/libc/stdlib/icdb_new.3 b/src/lib/libc/stdlib/icdb_new.3
deleted file mode 100644
index 9fc07bda80..0000000000
--- a/src/lib/libc/stdlib/icdb_new.3
+++ /dev/null
@@ -1,68 +0,0 @@
-.\"     $OpenBSD: icdb_new.3,v 1.2 2016/09/04 19:05:09 jmc Exp $
-.\"
-.\" Copyright (c) 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 $Mdocdate: September 4 2016 $
-.Dt ICBB_NEW 3
-.Os
-.Sh NAME
-.Nm icdb_new ,
-.Nm icdb_open ,
-.Nm icdb_get ,
-.Nm icdb_lookup ,
-.Nm icdb_nentries ,
-.Nm icdb_entries ,
-.Nm icdb_update ,
-.Nm icdb_add ,
-.Nm icdb_rehash ,
-.Nm icdb_save ,
-.Nm icdb_close
-.Nd simple database
-.Sh SYNOPSIS
-.In icbd.h
-.Ft struct icdb *
-.Fn icdb_new "uint32_t version" "uint32_t nentries" "uint32_t entrysize"
-.Ft struct icdb *
-.Fn icdb_open "const char *name" "int flags" "uint32_t version"
-.Ft int
-.Fn icdb_get "struct icdb *db" "void *entry" "uint32_t idx"
-.Ft int
-.Fn icdb_lookup "struct icdb *db" "int keynum" "const void *key" "void *entry" "uint32_t *idxp"
-.Ft int
-.Fn icdb_nentries "struct icdb *db"
-.Ft const void *
-.Fn icdb_entries "struct icdb *db"
-.Ft int
-.Fn icdb_update "struct icdb *db" "const void *entry" "int offset"
-.Ft int
-.Fn icdb_add "struct icdb *db" "const void *entry"
-.Ft int
-.Fn icdb_rehash "struct icdb *db"
-.Ft int
-.Fn icdb_save "struct icdb *db" "int fd"
-.Ft int
-.Fn icdb_close "struct icdb *db"
-.Sh DESCRIPTION
-These functions provide access to a simple memory mapped database format.
-.Sh EXAMPLES
-Look how easy it is to use.
-.Sh STANDARDS
-These functions are not standardized.
-.Sh HISTORY
-The icdb functions were introduced in
-.Ox 6.0 .
-.Sh AUTHORS
-.An Ted Unangst Aq Mt tedu@openbsd.org
diff --git a/src/lib/libc/stdlib/imaxabs.3 b/src/lib/libc/stdlib/imaxabs.3
deleted file mode 100644
index 340be61b6e..0000000000
--- a/src/lib/libc/stdlib/imaxabs.3
+++ /dev/null
@@ -1,70 +0,0 @@
-.\" Copyright (c) 1990, 1991 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
-.\" 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: imaxabs.3,v 1.8 2019/01/18 07:32:17 schwarze Exp $
-.\"
-.Dd $Mdocdate: January 18 2019 $
-.Dt IMAXABS 3
-.Os
-.Sh NAME
-.Nm imaxabs
-.Nd integer absolute value function
-.Sh SYNOPSIS
-.In inttypes.h
-.In stdint.h
-.Ft intmax_t
-.Fn imaxabs "intmax_t j"
-.Sh DESCRIPTION
-The
-.Fn imaxabs
-function computes the absolute value of the intmax_t variable
-.Fa j .
-.Sh RETURN VALUES
-The
-.Fn imaxabs
-function returns the absolute value.
-.Sh SEE ALSO
-.Xr abs 3 ,
-.Xr cabs 3 ,
-.Xr floor 3 ,
-.Xr hypot 3 ,
-.Xr labs 3
-.Sh STANDARDS
-The
-.Fn imaxabs
-function conforms to
-.St -isoC-99 .
-.Sh CAVEATS
-The result of applying
-.Fn imaxabs
-to
-.Dv INTMAX_MIN
-is undefined.
diff --git a/src/lib/libc/stdlib/imaxabs.c b/src/lib/libc/stdlib/imaxabs.c
deleted file mode 100644
index b7e910eefd..0000000000
--- a/src/lib/libc/stdlib/imaxabs.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*      $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
deleted file mode 100644
index 0d4f765373..0000000000
--- a/src/lib/libc/stdlib/imaxdiv.3
+++ /dev/null
@@ -1,65 +0,0 @@
-.\" 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.7 2016/08/14 23:18:03 guenther Exp $
-.\"
-.Dd $Mdocdate: August 14 2016 $
-.Dt IMAXDIV 3
-.Os
-.Sh NAME
-.Nm imaxdiv
-.Nd return quotient and remainder from division
-.Sh SYNOPSIS
-.In 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
-.Sh STANDARDS
-The
-.Fn imaxdiv
-function conforms to
-.St -isoC-99 .
diff --git a/src/lib/libc/stdlib/imaxdiv.c b/src/lib/libc/stdlib/imaxdiv.c
deleted file mode 100644
index 0515a94b96..0000000000
--- a/src/lib/libc/stdlib/imaxdiv.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*      $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
deleted file mode 100644
index 136c08bad8..0000000000
--- a/src/lib/libc/stdlib/insque.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\"     $OpenBSD: insque.3,v 1.12 2020/04/26 16:36:14 schwarze 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 $Mdocdate: April 26 2020 $
-.Dt INSQUE 3
-.Os
-.Sh NAME
-.Nm insque ,
-.Nm remque
-.Nd legacy doubly linked lists
-.Sh SYNOPSIS
-.In search.h
-.Ft void
-.Fn insque "void *elem" "void *pred"
-.Ft void
-.Fn remque "void *elem"
-.Sh DESCRIPTION
-.Bf -symbolic
-These interfaces have been superseded by the
-.Xr queue 3
-macros and are provided for compatibility with legacy code.
-.Ef
-.Pp
-.Fn insque
-and
-.Fn remque
-manipulate a legacy variety of intrusive doubly linked lists.
-A list can be either circular or linear.
-Each element in the list 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 members of the struct must be pointers of the
-same type that point to the next and previous elements in
-the list, respectively.
-Any subsequent data in the struct is application-dependent.
-.Pp
-The
-.Fn insque
-function inserts
-.Fa elem
-into a list immediately after
-.Fa pred .
-.Pp
-The
-.Fn remque
-function removes
-.Fa elem
-from the list.
-.Pp
-These functions are not atomic.
-.Sh SEE ALSO
-.Xr queue 3
-.Sh STANDARDS
-The
-.Fn insque
-and
-.Fn remque
-functions conform to the X/Open System Interfaces option of the
-.St -p1003.1-2008
-specification.
-.Sh HISTORY
-The
-.Fn insque
-and
-.Fn remque
-functions are derived from the
-.Li insque
-and
-.Li remque
-instructions on the VAX.
-They first appeared in
-.Bx 4.2 .
diff --git a/src/lib/libc/stdlib/insque.c b/src/lib/libc/stdlib/insque.c
deleted file mode 100644
index 590ff837b8..0000000000
--- a/src/lib/libc/stdlib/insque.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*      $OpenBSD: insque.c,v 1.3 2014/08/15 04:14:36 guenther 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 <stdlib.h>
-#include <search.h>
-
-struct qelem {
-        struct qelem *q_forw;
-        struct qelem *q_back;
-};
-
-void
-insque(void *entry, void *pred)
-{
-        struct qelem *e = entry;
-        struct qelem *p = pred;
-
-        if (p == NULL)
-                e->q_forw = e->q_back = NULL;
-        else {
-                e->q_forw = p->q_forw;
-                e->q_back = p;
-                if (p->q_forw != NULL)
-                        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
deleted file mode 100644
index cb8c592750..0000000000
--- a/src/lib/libc/stdlib/jrand48.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*      $OpenBSD: jrand48.c,v 1.3 2005/08/08 08:05:36 espie Exp $ */
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.
- */
-
-#include "rand48.h"
-
-long
-jrand48(unsigned short xseed[3])
-{
-        __dorand48(xseed);
-        return ((long) xseed[2] << 16) + (long) xseed[1];
-}
diff --git a/src/lib/libc/stdlib/l64a.c b/src/lib/libc/stdlib/l64a.c
deleted file mode 100644
index 4f33df37b2..0000000000
--- a/src/lib/libc/stdlib/l64a.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*      $OpenBSD: l64a.c,v 1.5 2005/08/08 08:05:36 espie Exp $ */
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-#include <errno.h>
-#include <stdlib.h>
-
-char *
-l64a(long value)
-{
-        static char buf[8];
-        char *s = buf;
-        int digit;
-        int i;
-
-        if (value < 0) {
-                errno = EINVAL;
-                return(NULL);
-        }
-
-        for (i = 0; value != 0 && i < 6; i++) {
-                digit = value & 0x3f;
-
-                if (digit < 2) 
-                        *s = digit + '.';
-                else if (digit < 12)
-                        *s = digit + '0' - 2;
-                else if (digit < 38)
-                        *s = digit + 'A' - 12;
-                else
-                        *s = digit + 'a' - 38;
-
-                value >>= 6;
-                s++;
-        }
-
-        *s = '\0';
-
-        return(buf);
-}
diff --git a/src/lib/libc/stdlib/labs.3 b/src/lib/libc/stdlib/labs.3
deleted file mode 100644
index f3fd6fd528..0000000000
--- a/src/lib/libc/stdlib/labs.3
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" Copyright (c) 1990, 1991 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
-.\" 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: labs.3,v 1.17 2019/01/18 07:32:17 schwarze Exp $
-.\"
-.Dd $Mdocdate: January 18 2019 $
-.Dt LABS 3
-.Os
-.Sh NAME
-.Nm labs ,
-.Nm llabs ,
-.Nm qabs
-.Nd return the absolute value of a long integer
-.Sh SYNOPSIS
-.In limits.h
-.In stdlib.h
-.Ft long
-.Fn labs "long i"
-.Ft long long
-.Fn llabs "long long j"
-.Ft quad_t
-.Fn qabs "quad_t j"
-.Sh DESCRIPTION
-The
-.Fn labs
-function returns the absolute value of the long integer
-.Fa i .
-The
-.Fn llabs
-function returns the absolute value of the long long integer
-.Fa j .
-.Pp
-The
-.Fn qabs
-function is a deprecated equivalent of
-.Fn llabs .
-.Sh SEE ALSO
-.Xr abs 3 ,
-.Xr cabs 3 ,
-.Xr floor 3 ,
-.Xr imaxabs 3
-.Sh STANDARDS
-The
-.Fn labs
-and
-.Fn llabs
-functions conform to
-.St -isoC-99 .
-.Sh CAVEATS
-The results of applying
-.Fn labs
-to
-.Dv LONG_MIN
-and
-.Fn llabs
-to
-.Dv LLONG_MIN
-are undefined, and
-.Fn qabs
-is not portable in the first place.
diff --git a/src/lib/libc/stdlib/labs.c b/src/lib/libc/stdlib/labs.c
deleted file mode 100644
index ca60b9aba2..0000000000
--- a/src/lib/libc/stdlib/labs.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*      $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.
- *
- * 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
-labs(long j)
-{
-        return(j < 0 ? -j : j);
-}
diff --git a/src/lib/libc/stdlib/lcong48.c b/src/lib/libc/stdlib/lcong48.c
deleted file mode 100644
index f03083e3c8..0000000000
--- a/src/lib/libc/stdlib/lcong48.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*      $OpenBSD: lcong48.c,v 1.6 2015/09/13 08:31:47 guenther Exp $ */
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.
- */
-
-#include "rand48.h"
-
-void
-lcong48(unsigned short p[7])
-{
-        lcong48_deterministic(p);
-        __rand48_deterministic = 0;
-}
-
-void
-lcong48_deterministic(unsigned short p[7])
-{
-        __rand48_deterministic = 1;
-        __rand48_seed[0] = p[0];
-        __rand48_seed[1] = p[1];
-        __rand48_seed[2] = p[2];
-        __rand48_mult[0] = p[3];
-        __rand48_mult[1] = p[4];
-        __rand48_mult[2] = p[5];
-        __rand48_add = p[6];
-}
-DEF_WEAK(lcong48_deterministic);
diff --git a/src/lib/libc/stdlib/ldiv.3 b/src/lib/libc/stdlib/ldiv.3
deleted file mode 100644
index 1fa6f38c45..0000000000
--- a/src/lib/libc/stdlib/ldiv.3
+++ /dev/null
@@ -1,71 +0,0 @@
-.\" 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: ldiv.3,v 1.13 2016/08/14 23:18:03 guenther Exp $
-.\"
-.Dd $Mdocdate: August 14 2016 $
-.Dt LDIV 3
-.Os
-.Sh NAME
-.Nm ldiv
-.Nd return quotient and remainder from division
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft ldiv_t
-.Fn ldiv "long num" "long denom"
-.Sh DESCRIPTION
-The
-.Fn ldiv
-function computes the value
-.Fa num Ns / Ns Fa denom
-and returns the quotient and remainder in a structure named
-.Li ldiv_t
-that contains two
-.Li long integer
-members named
-.Fa quot
-and
-.Fa rem .
-.Sh SEE ALSO
-.Xr div 3 ,
-.Xr imaxdiv 3 ,
-.Xr lldiv 3
-.Sh STANDARDS
-The
-.Fn ldiv
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-An
-.Fn ldiv
-function with similar functionality, but a different calling convention,
-first appeared in
-.At v4 .
diff --git a/src/lib/libc/stdlib/ldiv.c b/src/lib/libc/stdlib/ldiv.c
deleted file mode 100644
index 775065f525..0000000000
--- a/src/lib/libc/stdlib/ldiv.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*      $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.
- *
- * 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>             /* ldiv_t */
-
-ldiv_t
-ldiv(long num, long denom)
-{
-        ldiv_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/llabs.c b/src/lib/libc/stdlib/llabs.c
deleted file mode 100644
index f4a260f4a8..0000000000
--- a/src/lib/libc/stdlib/llabs.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*      $OpenBSD: llabs.c,v 1.4 2016/08/14 23:18:03 guenther 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 <stdlib.h>
-
-long long
-llabs(long long j)
-{
-        return (j < 0 ? -j : j);
-}
-
-__weak_alias(qabs, llabs);
diff --git a/src/lib/libc/stdlib/lldiv.3 b/src/lib/libc/stdlib/lldiv.3
deleted file mode 100644
index 526da8d0c4..0000000000
--- a/src/lib/libc/stdlib/lldiv.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" 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: lldiv.3,v 1.8 2017/08/01 14:57:02 schwarze Exp $
-.\"
-.Dd $Mdocdate: August 1 2017 $
-.Dt LLDIV 3
-.Os
-.Sh NAME
-.Nm lldiv ,
-.Nm qdiv
-.Nd return quotient and remainder from division
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft lldiv_t
-.Fn lldiv "long long num" "long long denom"
-.Ft qdiv_t
-.Fn qdiv "quad_t num" "quad_t denom"
-.Sh DESCRIPTION
-The
-.Fn lldiv
-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 .
-.Pp
-The
-.Fn qdiv
-function is a deprecated equivalent of
-.Fn lldiv .
-.Sh SEE ALSO
-.Xr div 3 ,
-.Xr imaxdiv 3 ,
-.Xr ldiv 3
-.Sh STANDARDS
-The
-.Fn lldiv
-function conforms to
-.St -isoC-99 .
diff --git a/src/lib/libc/stdlib/lldiv.c b/src/lib/libc/stdlib/lldiv.c
deleted file mode 100644
index 59c37b878c..0000000000
--- a/src/lib/libc/stdlib/lldiv.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*      $OpenBSD: lldiv.c,v 1.2 2016/08/14 23:18:03 guenther 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);
-}
-
-__weak_alias(qdiv, lldiv);
diff --git a/src/lib/libc/stdlib/lrand48.c b/src/lib/libc/stdlib/lrand48.c
deleted file mode 100644
index 142cca7f78..0000000000
--- a/src/lib/libc/stdlib/lrand48.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*      $OpenBSD: lrand48.c,v 1.5 2015/08/27 04:33:31 guenther Exp $ */
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.
- */
-
-#include "rand48.h"
-
-long
-lrand48(void)
-{
-        if (__rand48_deterministic == 0)
-                return arc4random() & 0x7fffffff;
-        __dorand48(__rand48_seed);
-        return ((long) __rand48_seed[2] << 15) + ((long) __rand48_seed[1] >> 1);
-}
diff --git a/src/lib/libc/stdlib/lsearch.3 b/src/lib/libc/stdlib/lsearch.3
deleted file mode 100644
index d82c55c859..0000000000
--- a/src/lib/libc/stdlib/lsearch.3
+++ /dev/null
@@ -1,106 +0,0 @@
-.\"     $OpenBSD: lsearch.3,v 1.14 2015/11/30 17:03:05 jmc 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 $Mdocdate: November 30 2015 $
-.Dt LSEARCH 3
-.Os
-.Sh NAME
-.Nm lsearch ,
-.Nm lfind
-.Nd linear searching routines
-.Sh SYNOPSIS
-.In search.h
-.Ft void *
-.Fn lsearch "const void *key" "void *base" "size_t *nelp" \
-    "size_t width" "int (*compar)(const void *, const void *)"
-.Ft void *
-.Fn lfind "const void *key" "const void *base" "size_t *nelp" \
-    "size_t width" "int (*compar)(const void *, const 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 dbopen 3
-.Sh STANDARDS
-The
-.Fn lsearch
-and
-.Fn lfind
-functions conform to the X/Open System Interfaces option of the
-.St -p1003.1-2008
-specification.
diff --git a/src/lib/libc/stdlib/lsearch.c b/src/lib/libc/stdlib/lsearch.c
deleted file mode 100644
index 8cad05f510..0000000000
--- a/src/lib/libc/stdlib/lsearch.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*      $OpenBSD: lsearch.c,v 1.5 2014/07/18 04:16:09 matthew 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.
- */
-
-#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, 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
deleted file mode 100644
index dc3e691ece..0000000000
--- a/src/lib/libc/stdlib/malloc.3
+++ /dev/null
@@ -1,803 +0,0 @@
-.\"
-.\" 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
-.\" 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: malloc.3,v 1.128 2021/04/09 06:04:15 otto Exp $
-.\"
-.Dd $Mdocdate: April 9 2021 $
-.Dt MALLOC 3
-.Os
-.Sh NAME
-.Nm malloc ,
-.Nm calloc ,
-.Nm realloc ,
-.Nm free ,
-.Nm reallocarray ,
-.Nm recallocarray ,
-.Nm freezero ,
-.Nm aligned_alloc ,
-.Nm malloc_conceal ,
-.Nm calloc_conceal
-.Nd memory allocation and deallocation
-.Sh SYNOPSIS
-.In 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 reallocarray "void *ptr" "size_t nmemb" "size_t size"
-.Ft void *
-.Fn recallocarray "void *ptr" "size_t oldnmemb" "size_t nmemb" "size_t size"
-.Ft void
-.Fn freezero "void *ptr" "size_t size"
-.Ft void *
-.Fn aligned_alloc "size_t alignment" "size_t size"
-.Ft void *
-.Fn malloc_conceal "size_t size"
-.Ft void *
-.Fn calloc_conceal "size_t nmemb" "size_t size"
-.Vt char *malloc_options ;
-.Sh DESCRIPTION
-The standard functions
-.Fn malloc ,
-.Fn calloc ,
-and
-.Fn realloc
-allocate
-.Em objects ,
-regions of memory to store values.
-The
-.Fn malloc
-function allocates uninitialized space for an object of
-the specified
-.Fa size .
-.Fn malloc
-maintains multiple lists of free objects according to size, allocating
-from the appropriate list or requesting memory from the kernel.
-The allocated space is suitably aligned (after possible pointer coercion) for
-storage of any type of object.
-.Pp
-The
-.Fn calloc
-function allocates space for an array of
-.Fa nmemb
-objects, each of the specified
-.Fa size .
-The space is initialized to zero.
-.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.
-If
-.Fa ptr
-is not
-.Dv NULL ,
-it must be a pointer returned by an earlier call to an allocation or
-reallocation function that was not freed in between.
-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 the space cannot be allocated, the object
-pointed to by
-.Fa ptr
-is unchanged.
-If
-.Fa ptr
-is
-.Dv NULL ,
-.Fn realloc
-behaves like
-.Fn malloc
-and allocates a new object.
-.Pp
-The
-.Fn free
-function causes the space pointed to by
-.Fa ptr
-to be either placed on a list of free blocks to make it available for future
-allocation or, when appropriate, to be returned to the kernel using
-.Xr munmap 2 .
-If
-.Fa ptr
-is
-.Dv NULL ,
-no action occurs.
-If
-.Fa ptr
-was previously freed by
-.Fn free
-or a reallocation function,
-the behavior is undefined and the double free is a security concern.
-.Pp
-Designed for safe allocation of arrays,
-the
-.Fn reallocarray
-function is similar to
-.Fn realloc
-except it operates on
-.Fa nmemb
-members of size
-.Fa size
-and checks for integer overflow in the calculation
-.Fa nmemb
-*
-.Fa size .
-.Pp
-Used for the allocation of memory holding sensitive data,
-the
-.Fn recallocarray
-and
-.Fn freezero
-functions guarantee that memory becoming unallocated is explicitly
-.Em discarded ,
-meaning pages of memory are disposed via
-.Xr munmap 2
-and cached free objects are cleared with
-.Xr explicit_bzero 3 .
-.Pp
-The
-.Fn recallocarray
-function is similar to
-.Fn reallocarray
-except it ensures newly allocated memory is cleared similar to
-.Fn calloc .
-If
-.Fa ptr
-is
-.Dv NULL ,
-.Fa oldnmemb
-is ignored and the call is equivalent to
-.Fn calloc .
-If
-.Fa ptr
-is not
-.Dv NULL ,
-.Fa oldnmemb
-must be a value such that
-.Fa oldnmemb
-*
-.Fa size
-is the size of the earlier allocation that returned
-.Fa ptr ,
-otherwise the behavior is undefined.
-.Pp
-The
-.Fn freezero
-function is similar to the
-.Fn free
-function except it ensures memory is explicitly discarded.
-If
-.Fa ptr
-is
-.Dv NULL ,
-no action occurs.
-If
-.Fa ptr
-is not
-.Dv NULL ,
-the
-.Fa size
-argument must be equal to or smaller than the size of the earlier allocation
-that returned
-.Fa ptr .
-.Fn freezero
-guarantees the memory range starting at
-.Fa ptr
-with length
-.Fa size
-is discarded while deallocating the whole object originally allocated.
-.Pp
-The
-.Fn aligned_alloc
-function allocates
-.Fa size
-bytes of memory such that the allocation's base address is a multiple of
-.Fa alignment .
-The requested
-.Fa alignment
-must be a power of 2.
-If
-.Fa size
-is not a multiple of
-.Fa alignment ,
-behavior is undefined.
-.Pp
-The
-.Fn malloc_conceal
-and
-.Fn calloc_conceal
-functions behave the same as
-.Fn malloc
-and
-.Fn calloc
-respectively,
-with the exception that the allocation returned is marked with the
-.Dv MAP_CONCEAL
-.Xr mmap 2
-flag and calling
-.Fn free
-on the allocation will discard the contents explicitly.
-A reallocation of a concealed allocation will leave these properties intact.
-.Sh MALLOC OPTIONS
-Upon the first call to the
-.Fn malloc
-family of functions, an initialization sequence inspects the
-value of the
-.Va vm.malloc_conf
-.Xr sysctl 2 ,
-next checks the environment for a variable called
-.Ev MALLOC_OPTIONS ,
-and finally looks at the global variable
-.Va malloc_options
-in the program.
-Each is scanned for the flags documented below.
-Unless otherwise noted uppercase means on, lowercase means off.
-During initialization, flags occurring later modify the behaviour
-that was requested by flags processed earlier.
-.Bl -tag -width indent
-.It Cm C
-.Dq Canaries .
-Add canaries at the end of allocations in order to detect
-heap overflows.
-The canary's content is checked when
-.Nm free
-is called.
-If it has been corrupted, the process is aborted.
-.It Cm D
-.Dq Dump .
-.Fn malloc
-will dump statistics to the file
-.Pa ./malloc.out ,
-if it already exists,
-at exit.
-This option requires the library to have been compiled with -DMALLOC_STATS in
-order to have any effect.
-.It Cm F
-.Dq Freecheck .
-Enable more extensive double free and use after free detection.
-All chunks in the delayed free list will be checked for double frees.
-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.
-Each page size or larger allocation is followed by a guard page that will
-cause a segmentation fault upon any access.
-.It Cm J
-.Dq More junking .
-Increase the junk level by one if it is smaller than 2.
-.It Cm j
-.Dq Less junking .
-Decrease the junk level by one if it is larger than 0.
-Junking writes some junk bytes into the area allocated.
-Junk is bytes of 0xdb when allocating;
-freed chunks are filled with 0xdf.
-By default the junk level is 1: after free,
-small chunks are completely junked;
-for pages the first part is junked.
-After a delay,
-the filling pattern is validated and the process is aborted if the pattern
-was modified.
-For junk level 2, junking is done on allocation as well and without size
-restrictions.
-If the junk level is zero, no junking is performed.
-.It Cm R
-.Dq realloc .
-Always reallocate when
-.Fn realloc
-is called, even if the initial allocation was big enough.
-.\".Pp
-.\".It Cm U
-.\".Dq utrace .
-.\"Generate entries for
-.\".Xr ktrace 1
-.\"for all operations.
-.\"Consult the source for this one.
-.It Cm S
-.\" Malloc option S is vaguely documented on purpose.
-Enable all options suitable for security auditing.
-.It Cm U
-.Dq Free unmap .
-Enable use after free protection for larger allocations.
-Unused pages on the freelist are read and write protected to
-cause a segmentation fault upon access.
-.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
-.Pp
-Note that this will cause code that is supposed to handle
-out-of-memory conditions gracefully to abort instead.
-.It Cm <
-.Dq Halve 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
-If a program changes behavior if any of these options (except
-.Cm X )
-are used,
-it is buggy.
-.Pp
-The default size of the cache is 64 single page allocations.
-It also caches a number of larger regions.
-Multi-threaded programs use multiple pools.
-.Sh RETURN VALUES
-Upon successful completion, the allocation functions
-return a pointer to the allocated space; otherwise,
-.Dv NULL
-is returned and
-.Va errno
-is set to
-.Er ENOMEM .
-The function
-.Fn aligned_alloc
-returns
-.Dv NULL
-and sets
-.Va errno
-to
-.Er EINVAL
-if
-.Fa alignment
-is not a power of 2.
-.Pp
-If
-.Fa nmemb
-or
-.Fa size
-is equal to 0, a unique pointer to an access protected,
-zero sized object is returned.
-Access via this pointer will generate a
-.Dv SIGSEGV
-exception.
-.Pp
-If multiplying
-.Fa nmemb
-and
-.Fa size
-results in integer overflow,
-.Fn calloc ,
-.Fn reallocarray
-and
-.Fn recallocarray
-return
-.Dv NULL
-and set
-.Va errno
-to
-.Er ENOMEM .
-.Pp
-If
-.Fa ptr
-is not
-.Dv NULL
-and multiplying
-.Fa oldnmemb
-and
-.Fa size
-results in integer overflow
-.Fn recallocarray
-returns
-.Dv NULL
-and sets
-.Va errno
-to
-.Er EINVAL .
-.Sh IDIOMS
-Consider
-.Fn calloc
-or the extensions
-.Fn reallocarray
-and
-.Fn recallocarray
-when there is multiplication in the
-.Fa size
-argument of
-.Fn malloc
-or
-.Fn realloc .
-For example, avoid this common idiom as it may lead to integer overflow:
-.Bd -literal -offset indent
-if ((p = malloc(num * size)) == NULL)
-        err(1, NULL);
-.Ed
-.Pp
-A drop-in replacement is the
-.Ox
-extension
-.Fn reallocarray :
-.Bd -literal -offset indent
-if ((p = reallocarray(NULL, num, size)) == NULL)
-        err(1, NULL);
-.Ed
-.Pp
-Alternatively,
-.Fn calloc
-may be used at the cost of initialization overhead.
-.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
-Instead, use
-.Fn reallocarray :
-.Bd -literal -offset indent
-if ((newp = reallocarray(p, num, size)) == NULL) {
-        ...
-.Ed
-.Pp
-Calling
-.Fn realloc
-with a
-.Dv NULL
-.Fa ptr
-is equivalent to calling
-.Fn malloc .
-Instead of this idiom:
-.Bd -literal -offset indent
-if (p == NULL)
-        newp = malloc(newsize);
-else
-        newp = realloc(p, newsize);
-.Ed
-.Pp
-Use the following:
-.Bd -literal -offset indent
-newp = realloc(p, newsize);
-.Ed
-.Pp
-The
-.Fn recallocarray
-function should be used for resizing objects containing sensitive data like
-keys.
-To avoid leaking information,
-it guarantees memory is cleared before placing it on the internal free list.
-Deallocation of such an object should be done by calling
-.Fn freezero .
-.Sh ENVIRONMENT
-.Bl -tag -width "MALLOC_OPTIONS"
-.It Ev MALLOC_OPTIONS
-String of option flags.
-.El
-.Sh EXAMPLES
-If
-.Fn malloc
-must be used with multiplication, be sure to test for overflow:
-.Bd -literal -offset indent
-size_t num, size;
-\&...
-
-/* Check for size_t overflow */
-if (size && num > SIZE_MAX / size)
-        errc(1, EOVERFLOW, "overflow");
-
-if ((p = malloc(num * size)) == NULL)
-        err(1, NULL);
-.Ed
-.Pp
-The above test is not sufficient in all cases.
-For example, multiplying ints requires a different set of checks:
-.Bd -literal -offset indent
-int num, size;
-\&...
-
-/* Avoid invalid requests */
-if (size < 0 || num < 0)
-        errc(1, EOVERFLOW, "overflow");
-
-/* Check for signed int overflow */
-if (size && num > INT_MAX / size)
-        errc(1, EOVERFLOW, "overflow");
-
-if ((p = malloc(num * size)) == NULL)
-        err(1, NULL);
-.Ed
-.Pp
-Assuming the implementation checks for integer overflow as
-.Ox
-does, it is much easier to use
-.Fn calloc ,
-.Fn reallocarray ,
-or
-.Fn recallocarray .
-.Pp
-The above examples could be simplified to:
-.Bd -literal -offset indent
-if ((p = reallocarray(NULL, num, size)) == NULL)
-        err(1, NULL);
-.Ed
-.Pp
-or at the cost of initialization:
-.Bd -literal -offset indent
-if ((p = calloc(num, size)) == NULL)
-        err(1, NULL);
-.Ed
-.Pp
-Set a systemwide reduction of the cache to a quarter of the
-default size and use guard pages:
-.Pp
-.Dl # sysctl vm.malloc_conf='G<<'
-.Sh DIAGNOSTICS
-If any of the functions detect an error condition,
-a message will be printed to file descriptor
-2 (not using stdio).
-Errors will result in the process being aborted.
-.Pp
-Here is a brief description of the error messages and what they mean:
-.Bl -tag -width Ds
-.It Dq out of memory
-If the
-.Cm X
-option is specified it is an error for the allocation functions
-to return
-.Dv NULL .
-.It Dq bogus pointer (double free?)
-An attempt to
-.Fn free
-or
-reallocate an unallocated pointer was made.
-.It Dq chunk is already free
-There was an attempt to free a chunk that had already been freed.
-.It Dq write after free
-A chunk has been modified after it was freed.
-.It Dq modified chunk-pointer
-The pointer passed to
-.Fn free
-or a reallocation function has been modified.
-.It Dq chunk canary corrupted address offset@length
-A byte after the requested size has been overwritten,
-indicating a heap overflow.
-The offset at which corruption was detected is printed before the @,
-and the requested length of the allocation after the @.
-.It Dq recorded old size oldsize != size
-.Fn recallocarray
-has detected that the given old size does not equal the recorded size in its
-meta data.
-Enabling option
-.Cm C
-allows
-.Fn recallocarray
-to catch more of these cases.
-.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.
-.It any other error
-.Fn malloc
-detected an internal error;
-consult sources and/or wizards.
-.El
-.Sh SEE ALSO
-.Xr brk 2 ,
-.Xr mmap 2 ,
-.Xr munmap 2 ,
-.Xr sysctl 2 ,
-.Xr alloca 3 ,
-.Xr getpagesize 3 ,
-.Xr posix_memalign 3
-.Sh STANDARDS
-The
-.Fn malloc ,
-.Fn calloc ,
-.Fn realloc ,
-and
-.Fn free
-functions conform to
-.St -ansiC .
-The
-.Fn aligned_alloc
-function conforms to
-.St -isoC-2011 .
-.Pp
-If
-.Fa nmemb
-or
-.Fa size
-are 0, the return value is implementation defined;
-other conforming implementations may return
-.Dv NULL
-in this case.
-.Pp
-The
-.Ev MALLOC_OPTIONS
-environment variable, the
-.Va vm.malloc_conf
-sysctl and the
-.Sx DIAGNOSTICS
-output are extensions to the standard.
-.Sh HISTORY
-A
-.Fn free
-internal kernel function and a predecessor to
-.Fn malloc ,
-.Fn alloc ,
-first appeared in
-.At v1 .
-C library functions
-.Fn alloc
-and
-.Fn free
-appeared in
-.At v6 .
-The functions
-.Fn malloc ,
-.Fn calloc ,
-and
-.Fn realloc
-first appeared in
-.At v7 .
-.Pp
-A new implementation by Chris Kingsley was introduced in
-.Bx 4.2 ,
-followed by a complete rewrite by Poul-Henning Kamp which appeared in
-.Fx 2.2
-and was included in
-.Ox 2.0 .
-These implementations were all
-.Xr sbrk 2
-based.
-In
-.Ox 3.8 ,
-Thierry Deval rewrote
-.Nm
-to use the
-.Xr mmap 2
-system call,
-making the page addresses returned by
-.Nm
-random.
-A rewrite by Otto Moerbeek introducing a new central data structure and more
-randomization appeared in
-.Ox 4.4 .
-.Pp
-The
-.Fn reallocarray
-function appeared in
-.Ox 5.6 .
-The
-.Fn recallocarray
-function appeared in
-.Ox 6.1 .
-The
-.Fn freezero
-function appeared in
-.Ox 6.2 .
-The
-.Fn aligned_alloc
-function appeared in
-.Ox 6.5 .
-The
-.Fn malloc_conceal
-and
-.Fn calloc_conceal
-functions appeared in
-.Ox 6.6 .
-.Sh CAVEATS
-When using
-.Fn malloc ,
-be wary of signed integer and
-.Vt size_t
-overflow especially when there is multiplication in the
-.Fa size
-argument.
-.Pp
-Signed integer overflow will cause undefined behavior which compilers
-typically handle by wrapping back around to negative numbers.
-Depending on the input, this can result in allocating more or less
-memory than intended.
-.Pp
-An unsigned overflow has defined behavior which will wrap back around and
-return less memory than intended.
-.Pp
-A signed or unsigned integer overflow is a
-.Em security
-risk if less memory is returned than intended.
-Subsequent code may corrupt the heap by writing beyond the memory that was
-allocated.
-An attacker may be able to leverage this heap corruption to execute arbitrary
-code.
-.Pp
-Consider using
-.Fn calloc ,
-.Fn reallocarray
-or
-.Fn recallocarray
-instead of using multiplication in
-.Fn malloc
-and
-.Fn realloc
-to avoid these problems on
-.Ox .
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
deleted file mode 100644
index 618554d293..0000000000
--- a/src/lib/libc/stdlib/malloc.c
+++ /dev/null
@@ -1,2325 +0,0 @@
-/*      $OpenBSD: malloc.c,v 1.271 2021/07/23 18:04:28 otto Exp $       */
-/*
- * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
- * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
- * Copyright (c) 2008 Damien Miller <djm@openbsd.org>
- * Copyright (c) 2000 Poul-Henning Kamp <phk@FreeBSD.org>
- *
- * 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.
- */
-
-/*
- * If we meet some day, and you think this stuff is worth it, you
- * can buy me a beer in return. Poul-Henning Kamp
- */
-
-/* #define MALLOC_STATS */
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/mman.h>
-#include <sys/sysctl.h>
-#include <uvm/uvmexp.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef MALLOC_STATS
-#include <sys/tree.h>
-#include <fcntl.h>
-#endif
-
-#include "thread_private.h"
-#include <tib.h>
-
-#define MALLOC_PAGESHIFT        _MAX_PAGE_SHIFT
-
-#define MALLOC_MINSHIFT         4
-#define MALLOC_MAXSHIFT         (MALLOC_PAGESHIFT - 1)
-#define MALLOC_PAGESIZE         (1UL << MALLOC_PAGESHIFT)
-#define MALLOC_MINSIZE          (1UL << MALLOC_MINSHIFT)
-#define MALLOC_PAGEMASK         (MALLOC_PAGESIZE - 1)
-#define MASK_POINTER(p)         ((void *)(((uintptr_t)(p)) & ~MALLOC_PAGEMASK))
-
-#define MALLOC_MAXCHUNK         (1 << MALLOC_MAXSHIFT)
-#define MALLOC_MAXCACHE         256
-#define MALLOC_DELAYED_CHUNK_MASK       15
-#ifdef MALLOC_STATS
-#define MALLOC_INITIAL_REGIONS  512
-#else
-#define MALLOC_INITIAL_REGIONS  (MALLOC_PAGESIZE / sizeof(struct region_info))
-#endif
-#define MALLOC_DEFAULT_CACHE    64
-#define MALLOC_CHUNK_LISTS      4
-#define CHUNK_CHECK_LENGTH      32
-
-/*
- * We move allocations between half a page and a whole page towards the end,
- * subject to alignment constraints. This is the extra headroom we allow.
- * Set to zero to be the most strict.
- */
-#define MALLOC_LEEWAY           0
-#define MALLOC_MOVE_COND(sz)    ((sz) - mopts.malloc_guard <            \
-                                    MALLOC_PAGESIZE - MALLOC_LEEWAY)
-#define MALLOC_MOVE(p, sz)      (((char *)(p)) +                        \
-                                    ((MALLOC_PAGESIZE - MALLOC_LEEWAY - \
-                                    ((sz) - mopts.malloc_guard)) &      \
-                                    ~(MALLOC_MINSIZE - 1)))
-
-#define PAGEROUND(x)  (((x) + (MALLOC_PAGEMASK)) & ~MALLOC_PAGEMASK)
-
-/*
- * What to use for Junk.  This is the byte value we use to fill with
- * when the 'J' option is enabled. Use SOME_JUNK right after alloc,
- * and SOME_FREEJUNK right before free.
- */
-#define SOME_JUNK               0xdb    /* deadbeef */
-#define SOME_FREEJUNK           0xdf    /* dead, free */
-#define SOME_FREEJUNK_ULL       0xdfdfdfdfdfdfdfdfULL
-
-#define MMAP(sz,f)      mmap(NULL, (sz), PROT_READ | PROT_WRITE, \
-    MAP_ANON | MAP_PRIVATE | (f), -1, 0)
-
-#define MMAPNONE(sz,f)  mmap(NULL, (sz), PROT_NONE, \
-    MAP_ANON | MAP_PRIVATE | (f), -1, 0)
-
-#define MMAPA(a,sz,f)   mmap((a), (sz), PROT_READ | PROT_WRITE, \
-    MAP_ANON | MAP_PRIVATE | (f), -1, 0)
-
-#define MQUERY(a,sz,f)  mquery((a), (sz), PROT_READ | PROT_WRITE, \
-    MAP_ANON | MAP_PRIVATE | MAP_FIXED | (f), -1, 0)
-
-struct region_info {
-        void *p;                /* page; low bits used to mark chunks */
-        uintptr_t size;         /* size for pages, or chunk_info pointer */
-#ifdef MALLOC_STATS
-        void *f;                /* where allocated from */
-#endif
-};
-
-LIST_HEAD(chunk_head, chunk_info);
-
-#define MAX_CACHEABLE_SIZE      32
-struct cache {
-        void *pages[MALLOC_MAXCACHE];
-        ushort length;
-        ushort max;
-};
-
-struct dir_info {
-        u_int32_t canary1;
-        int active;                     /* status of malloc */
-        struct region_info *r;          /* region slots */
-        size_t regions_total;           /* number of region slots */
-        size_t regions_free;            /* number of free slots */
-        size_t rbytesused;              /* random bytes used */
-        char *func;                     /* current function */
-        int malloc_junk;                /* junk fill? */
-        int mmap_flag;                  /* extra flag for mmap */
-        int mutex;
-                                        /* lists of free chunk info structs */
-        struct chunk_head chunk_info_list[MALLOC_MAXSHIFT + 1];
-                                        /* lists of chunks with free slots */
-        struct chunk_head chunk_dir[MALLOC_MAXSHIFT + 1][MALLOC_CHUNK_LISTS];
-                                        /* delayed free chunk slots */
-        void *delayed_chunks[MALLOC_DELAYED_CHUNK_MASK + 1];
-        u_char rbytes[32];              /* random bytes */
-                                        /* free pages cache */
-        struct cache cache[MAX_CACHEABLE_SIZE];
-#ifdef MALLOC_STATS
-        size_t inserts;
-        size_t insert_collisions;
-        size_t finds;
-        size_t find_collisions;
-        size_t deletes;
-        size_t delete_moves;
-        size_t cheap_realloc_tries;
-        size_t cheap_reallocs;
-        size_t malloc_used;             /* bytes allocated */
-        size_t malloc_guarded;          /* bytes used for guards */
-        size_t pool_searches;           /* searches for pool */
-        size_t other_pool;              /* searches in other pool */
-#define STATS_ADD(x,y)  ((x) += (y))
-#define STATS_SUB(x,y)  ((x) -= (y))
-#define STATS_INC(x)    ((x)++)
-#define STATS_ZERO(x)   ((x) = 0)
-#define STATS_SETF(x,y) ((x)->f = (y))
-#else
-#define STATS_ADD(x,y)  /* nothing */
-#define STATS_SUB(x,y)  /* nothing */
-#define STATS_INC(x)    /* nothing */
-#define STATS_ZERO(x)   /* nothing */
-#define STATS_SETF(x,y) /* nothing */
-#endif /* MALLOC_STATS */
-        u_int32_t canary2;
-};
-#define DIR_INFO_RSZ    ((sizeof(struct dir_info) + MALLOC_PAGEMASK) & \
-                        ~MALLOC_PAGEMASK)
-
-static void unmap(struct dir_info *d, void *p, size_t sz, size_t clear);
-
-/*
- * This structure describes a page worth of chunks.
- *
- * How many bits per u_short in the bitmap
- */
-#define MALLOC_BITS             (NBBY * sizeof(u_short))
-struct chunk_info {
-        LIST_ENTRY(chunk_info) entries;
-        void *page;                     /* pointer to the page */
-        u_short canary;
-        u_short size;                   /* size of this page's chunks */
-        u_short shift;                  /* how far to shift for this size */
-        u_short free;                   /* how many free chunks */
-        u_short total;                  /* how many chunks */
-        u_short offset;                 /* requested size table offset */
-        u_short bits[1];                /* which chunks are free */
-};
-
-struct malloc_readonly {
-                                        /* Main bookkeeping information */
-        struct dir_info *malloc_pool[_MALLOC_MUTEXES];
-        u_int   malloc_mutexes;         /* how much in actual use? */
-        int     malloc_mt;              /* multi-threaded mode? */
-        int     malloc_freecheck;       /* Extensive double free check */
-        int     malloc_freeunmap;       /* mprotect free pages PROT_NONE? */
-        int     def_malloc_junk;        /* junk fill? */
-        int     malloc_realloc;         /* always realloc? */
-        int     malloc_xmalloc;         /* xmalloc behaviour? */
-        u_int   chunk_canaries;         /* use canaries after chunks? */
-        int     internal_funcs;         /* use better recallocarray/freezero? */
-        u_int   def_maxcache;           /* free pages we cache */
-        size_t  malloc_guard;           /* use guard pages after allocations? */
-#ifdef MALLOC_STATS
-        int     malloc_stats;           /* dump statistics at end */
-#endif
-        u_int32_t malloc_canary;        /* Matched against ones in malloc_pool */
-};
-
-/* This object is mapped PROT_READ after initialisation to prevent tampering */
-static union {
-        struct malloc_readonly mopts;
-        u_char _pad[MALLOC_PAGESIZE];
-} malloc_readonly __attribute__((aligned(MALLOC_PAGESIZE)));
-#define mopts   malloc_readonly.mopts
-
-char            *malloc_options;        /* compile-time options */
-
-static __dead void wrterror(struct dir_info *d, char *msg, ...)
-    __attribute__((__format__ (printf, 2, 3)));
-
-#ifdef MALLOC_STATS
-void malloc_dump(int, int, struct dir_info *);
-PROTO_NORMAL(malloc_dump);
-void malloc_gdump(int);
-PROTO_NORMAL(malloc_gdump);
-static void malloc_exit(void);
-#define CALLER  __builtin_return_address(0)
-#else
-#define CALLER  NULL
-#endif
-
-/* low bits of r->p determine size: 0 means >= page size and r->size holding
- * real size, otherwise low bits are a shift count, or 1 for malloc(0)
- */
-#define REALSIZE(sz, r)                                         \
-        (sz) = (uintptr_t)(r)->p & MALLOC_PAGEMASK,             \
-        (sz) = ((sz) == 0 ? (r)->size : ((sz) == 1 ? 0 : (1 << ((sz)-1))))
-
-static inline void
-_MALLOC_LEAVE(struct dir_info *d)
-{
-        if (mopts.malloc_mt) {
-                d->active--;
-                _MALLOC_UNLOCK(d->mutex);
-        }
-}
-
-static inline void
-_MALLOC_ENTER(struct dir_info *d)
-{
-        if (mopts.malloc_mt) {
-                _MALLOC_LOCK(d->mutex);
-                d->active++;
-        }
-}
-
-static inline size_t
-hash(void *p)
-{
-        size_t sum;
-        uintptr_t u;
-
-        u = (uintptr_t)p >> MALLOC_PAGESHIFT;
-        sum = u;
-        sum = (sum << 7) - sum + (u >> 16);
-#ifdef __LP64__
-        sum = (sum << 7) - sum + (u >> 32);
-        sum = (sum << 7) - sum + (u >> 48);
-#endif
-        return sum;
-}
-
-static inline struct dir_info *
-getpool(void)
-{
-        if (!mopts.malloc_mt)
-                return mopts.malloc_pool[1];
-        else    /* first one reserved for special pool */
-                return mopts.malloc_pool[1 + TIB_GET()->tib_tid %
-                    (mopts.malloc_mutexes - 1)];
-}
-
-static __dead void
-wrterror(struct dir_info *d, char *msg, ...)
-{
-        int             saved_errno = errno;
-        va_list         ap;
-
-        dprintf(STDERR_FILENO, "%s(%d) in %s(): ", __progname,
-            getpid(), (d != NULL && d->func) ? d->func : "unknown");
-        va_start(ap, msg);
-        vdprintf(STDERR_FILENO, msg, ap);
-        va_end(ap);
-        dprintf(STDERR_FILENO, "\n");
-
-#ifdef MALLOC_STATS
-        if (mopts.malloc_stats)
-                malloc_gdump(STDERR_FILENO);
-#endif /* MALLOC_STATS */
-
-        errno = saved_errno;
-
-        abort();
-}
-
-static void
-rbytes_init(struct dir_info *d)
-{
-        arc4random_buf(d->rbytes, sizeof(d->rbytes));
-        /* add 1 to account for using d->rbytes[0] */
-        d->rbytesused = 1 + d->rbytes[0] % (sizeof(d->rbytes) / 2);
-}
-
-static inline u_char
-getrbyte(struct dir_info *d)
-{
-        u_char x;
-
-        if (d->rbytesused >= sizeof(d->rbytes))
-                rbytes_init(d);
-        x = d->rbytes[d->rbytesused++];
-        return x;
-}
-
-static void
-omalloc_parseopt(char opt)
-{
-        switch (opt) {
-        case '+':
-                mopts.malloc_mutexes <<= 1;
-                if (mopts.malloc_mutexes > _MALLOC_MUTEXES)
-                        mopts.malloc_mutexes = _MALLOC_MUTEXES;
-                break;
-        case '-':
-                mopts.malloc_mutexes >>= 1;
-                if (mopts.malloc_mutexes < 2)
-                        mopts.malloc_mutexes = 2;
-                break;
-        case '>':
-                mopts.def_maxcache <<= 1;
-                if (mopts.def_maxcache > MALLOC_MAXCACHE)
-                        mopts.def_maxcache = MALLOC_MAXCACHE;
-                break;
-        case '<':
-                mopts.def_maxcache >>= 1;
-                break;
-        case 'c':
-                mopts.chunk_canaries = 0;
-                break;
-        case 'C':
-                mopts.chunk_canaries = 1;
-                break;
-#ifdef MALLOC_STATS
-        case 'd':
-                mopts.malloc_stats = 0;
-                break;
-        case 'D':
-                mopts.malloc_stats = 1;
-                break;
-#endif /* MALLOC_STATS */
-        case 'f':
-                mopts.malloc_freecheck = 0;
-                mopts.malloc_freeunmap = 0;
-                break;
-        case 'F':
-                mopts.malloc_freecheck = 1;
-                mopts.malloc_freeunmap = 1;
-                break;
-        case 'g':
-                mopts.malloc_guard = 0;
-                break;
-        case 'G':
-                mopts.malloc_guard = MALLOC_PAGESIZE;
-                break;
-        case 'j':
-                if (mopts.def_malloc_junk > 0)
-                        mopts.def_malloc_junk--;
-                break;
-        case 'J':
-                if (mopts.def_malloc_junk < 2)
-                        mopts.def_malloc_junk++;
-                break;
-        case 'r':
-                mopts.malloc_realloc = 0;
-                break;
-        case 'R':
-                mopts.malloc_realloc = 1;
-                break;
-        case 'u':
-                mopts.malloc_freeunmap = 0;
-                break;
-        case 'U':
-                mopts.malloc_freeunmap = 1;
-                break;
-        case 'x':
-                mopts.malloc_xmalloc = 0;
-                break;
-        case 'X':
-                mopts.malloc_xmalloc = 1;
-                break;
-        default:
-                dprintf(STDERR_FILENO, "malloc() warning: "
-                    "unknown char in MALLOC_OPTIONS\n");
-                break;
-        }
-}
-
-static void
-omalloc_init(void)
-{
-        char *p, *q, b[16];
-        int i, j;
-        const int mib[2] = { CTL_VM, VM_MALLOC_CONF };
-        size_t sb;
-
-        /*
-         * Default options
-         */
-        mopts.malloc_mutexes = 8;
-        mopts.def_malloc_junk = 1;
-        mopts.def_maxcache = MALLOC_DEFAULT_CACHE;
-
-        for (i = 0; i < 3; i++) {
-                switch (i) {
-                case 0:
-                        sb = sizeof(b);
-                        j = sysctl(mib, 2, b, &sb, NULL, 0);
-                        if (j != 0)
-                                continue;
-                        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 'S':
-                                for (q = "CFGJ"; *q != '\0'; q++)
-                                        omalloc_parseopt(*q);
-                                mopts.def_maxcache = 0;
-                                break;
-                        case 's':
-                                for (q = "cfgj"; *q != '\0'; q++)
-                                        omalloc_parseopt(*q);
-                                mopts.def_maxcache = MALLOC_DEFAULT_CACHE;
-                                break;
-                        default:
-                                omalloc_parseopt(*p);
-                                break;
-                        }
-                }
-        }
-
-#ifdef MALLOC_STATS
-        if (mopts.malloc_stats && (atexit(malloc_exit) == -1)) {
-                dprintf(STDERR_FILENO, "malloc() warning: atexit(2) failed."
-                    " Will not be able to dump stats on exit\n");
-        }
-#endif /* MALLOC_STATS */
-
-        while ((mopts.malloc_canary = arc4random()) == 0)
-                ;
-        if (mopts.chunk_canaries)
-                do {
-                        mopts.chunk_canaries = arc4random();
-                } while ((u_char)mopts.chunk_canaries == 0 ||
-                    (u_char)mopts.chunk_canaries == SOME_FREEJUNK); 
-}
-
-static void
-omalloc_poolinit(struct dir_info **dp, int mmap_flag)
-{
-        char *p;
-        size_t d_avail, regioninfo_size;
-        struct dir_info *d;
-        int i, j;
-
-        /*
-         * Allocate dir_info with a guard page on either side. Also
-         * randomise offset inside the page at which the dir_info
-         * lies (subject to alignment by 1 << MALLOC_MINSHIFT)
-         */
-        if ((p = MMAPNONE(DIR_INFO_RSZ + (MALLOC_PAGESIZE * 2), mmap_flag)) ==
-            MAP_FAILED)
-                wrterror(NULL, "malloc init mmap failed");
-        mprotect(p + MALLOC_PAGESIZE, DIR_INFO_RSZ, PROT_READ | PROT_WRITE);
-        d_avail = (DIR_INFO_RSZ - sizeof(*d)) >> MALLOC_MINSHIFT;
-        d = (struct dir_info *)(p + MALLOC_PAGESIZE +
-            (arc4random_uniform(d_avail) << MALLOC_MINSHIFT));
-
-        rbytes_init(d);
-        d->regions_free = d->regions_total = MALLOC_INITIAL_REGIONS;
-        regioninfo_size = d->regions_total * sizeof(struct region_info);
-        d->r = MMAP(regioninfo_size, mmap_flag);
-        if (d->r == MAP_FAILED) {
-                d->regions_total = 0;
-                wrterror(NULL, "malloc init mmap failed");
-        }
-        for (i = 0; i <= MALLOC_MAXSHIFT; i++) {
-                LIST_INIT(&d->chunk_info_list[i]);
-                for (j = 0; j < MALLOC_CHUNK_LISTS; j++)
-                        LIST_INIT(&d->chunk_dir[i][j]);
-        }
-        STATS_ADD(d->malloc_used, regioninfo_size + 3 * MALLOC_PAGESIZE);
-        d->mmap_flag = mmap_flag;
-        d->malloc_junk = mopts.def_malloc_junk;
-        d->canary1 = mopts.malloc_canary ^ (u_int32_t)(uintptr_t)d;
-        d->canary2 = ~d->canary1;
-
-        *dp = d;
-}
-
-static int
-omalloc_grow(struct dir_info *d)
-{
-        size_t newtotal;
-        size_t newsize;
-        size_t mask;
-        size_t i, oldpsz;
-        struct region_info *p;
-
-        if (d->regions_total > SIZE_MAX / sizeof(struct region_info) / 2)
-                return 1;
-
-        newtotal = d->regions_total * 2;
-        newsize = PAGEROUND(newtotal * sizeof(struct region_info));
-        mask = newtotal - 1;
-
-        /* Don't use cache here, we don't want user uaf touch this */
-        p = MMAP(newsize, d->mmap_flag);
-        if (p == MAP_FAILED)
-                return 1;
-
-        STATS_ADD(d->malloc_used, newsize);
-        STATS_ZERO(d->inserts);
-        STATS_ZERO(d->insert_collisions);
-        for (i = 0; i < d->regions_total; i++) {
-                void *q = d->r[i].p;
-                if (q != NULL) {
-                        size_t index = hash(q) & mask;
-                        STATS_INC(d->inserts);
-                        while (p[index].p != NULL) {
-                                index = (index - 1) & mask;
-                                STATS_INC(d->insert_collisions);
-                        }
-                        p[index] = d->r[i];
-                }
-        }
-
-        oldpsz = PAGEROUND(d->regions_total * sizeof(struct region_info));
-        /* clear to avoid meta info ending up in the cache */
-        unmap(d, d->r, oldpsz, oldpsz);
-        d->regions_free += d->regions_total;
-        d->regions_total = newtotal;
-        d->r = p;
-        return 0;
-}
-
-/*
- * The hashtable uses the assumption that p is never NULL. This holds since
- * non-MAP_FIXED mappings with hint 0 start at BRKSIZ.
- */
-static int
-insert(struct dir_info *d, void *p, size_t sz, void *f)
-{
-        size_t index;
-        size_t mask;
-        void *q;
-
-        if (d->regions_free * 4 < d->regions_total) {
-                if (omalloc_grow(d))
-                        return 1;
-        }
-        mask = d->regions_total - 1;
-        index = hash(p) & mask;
-        q = d->r[index].p;
-        STATS_INC(d->inserts);
-        while (q != NULL) {
-                index = (index - 1) & mask;
-                q = d->r[index].p;
-                STATS_INC(d->insert_collisions);
-        }
-        d->r[index].p = p;
-        d->r[index].size = sz;
-#ifdef MALLOC_STATS
-        d->r[index].f = f;
-#endif
-        d->regions_free--;
-        return 0;
-}
-
-static struct region_info *
-find(struct dir_info *d, void *p)
-{
-        size_t index;
-        size_t mask = d->regions_total - 1;
-        void *q, *r;
-
-        if (mopts.malloc_canary != (d->canary1 ^ (u_int32_t)(uintptr_t)d) ||
-            d->canary1 != ~d->canary2)
-                wrterror(d, "internal struct corrupt");
-        p = MASK_POINTER(p);
-        index = hash(p) & mask;
-        r = d->r[index].p;
-        q = MASK_POINTER(r);
-        STATS_INC(d->finds);
-        while (q != p && r != NULL) {
-                index = (index - 1) & mask;
-                r = d->r[index].p;
-                q = MASK_POINTER(r);
-                STATS_INC(d->find_collisions);
-        }
-        return (q == p && r != NULL) ? &d->r[index] : NULL;
-}
-
-static void
-delete(struct dir_info *d, struct region_info *ri)
-{
-        /* algorithm R, Knuth Vol III section 6.4 */
-        size_t mask = d->regions_total - 1;
-        size_t i, j, r;
-
-        if (d->regions_total & (d->regions_total - 1))
-                wrterror(d, "regions_total not 2^x");
-        d->regions_free++;
-        STATS_INC(d->deletes);
-
-        i = ri - d->r;
-        for (;;) {
-                d->r[i].p = NULL;
-                d->r[i].size = 0;
-                j = i;
-                for (;;) {
-                        i = (i - 1) & mask;
-                        if (d->r[i].p == NULL)
-                                return;
-                        r = hash(d->r[i].p) & mask;
-                        if ((i <= r && r < j) || (r < j && j < i) ||
-                            (j < i && i <= r))
-                                continue;
-                        d->r[j] = d->r[i];
-                        STATS_INC(d->delete_moves);
-                        break;
-                }
-
-        }
-}
-
-static inline void
-junk_free(int junk, void *p, size_t sz)
-{
-        size_t i, step = 1;
-        uint64_t *lp = p;
-
-        if (junk == 0 || sz == 0)
-                return;
-        sz /= sizeof(uint64_t);
-        if (junk == 1) {
-                if (sz > MALLOC_PAGESIZE / sizeof(uint64_t))
-                        sz = MALLOC_PAGESIZE / sizeof(uint64_t);
-                step = sz / 4;
-                if (step == 0)
-                        step = 1;
-        }
-        for (i = 0; i < sz; i += step)
-                lp[i] = SOME_FREEJUNK_ULL;
-}
-
-static inline void
-validate_junk(struct dir_info *pool, void *p, size_t sz)
-{
-        size_t i, step = 1;
-        uint64_t *lp = p;
-
-        if (pool->malloc_junk == 0 || sz == 0)
-                return;
-        sz /= sizeof(uint64_t);
-        if (pool->malloc_junk == 1) {
-                if (sz > MALLOC_PAGESIZE / sizeof(uint64_t))
-                        sz = MALLOC_PAGESIZE / sizeof(uint64_t);
-                step = sz / 4;
-                if (step == 0)
-                        step = 1;
-        }
-        for (i = 0; i < sz; i += step) {
-                if (lp[i] != SOME_FREEJUNK_ULL)
-                        wrterror(pool, "write after free %p", p);
-        }
-}
-
-
-/*
- * Cache maintenance. 
- * Opposed to the regular region data structure, the sizes in the
- * cache are in MALLOC_PAGESIZE units.
- */
-static void
-unmap(struct dir_info *d, void *p, size_t sz, size_t clear)
-{
-        size_t psz = sz >> MALLOC_PAGESHIFT;
-        void *r;
-        u_short i;
-        struct cache *cache;
-
-        if (sz != PAGEROUND(sz) || psz == 0)
-                wrterror(d, "munmap round");
-
-        if (psz > MAX_CACHEABLE_SIZE || d->cache[psz - 1].max == 0) {
-                if (munmap(p, sz))
-                        wrterror(d, "munmap %p", p);
-                STATS_SUB(d->malloc_used, sz);
-                return;
-        }
-        cache = &d->cache[psz - 1];
-        if (cache->length == cache->max) {
-                /* use a random slot */
-                i = getrbyte(d) % cache->max;
-                r = cache->pages[i];
-                if (!mopts.malloc_freeunmap)
-                        validate_junk(d, r, sz);
-                if (munmap(r, sz))
-                        wrterror(d, "munmap %p", r);
-                STATS_SUB(d->malloc_used, sz);
-                cache->length--;
-        } else
-                i = cache->length;
-
-        /* fill slot */
-        if (clear > 0)
-                memset(p, 0, clear);
-        if (mopts.malloc_freeunmap)
-                mprotect(p, sz, PROT_NONE);
-        else
-                junk_free(d->malloc_junk, p, sz);
-        cache->pages[i] = p;
-        cache->length++;
-}
-
-static void *
-map(struct dir_info *d, size_t sz, int zero_fill)
-{
-        size_t i, psz = sz >> MALLOC_PAGESHIFT;
-        void *p;
-        struct cache *cache;
-
-        if (mopts.malloc_canary != (d->canary1 ^ (u_int32_t)(uintptr_t)d) ||
-            d->canary1 != ~d->canary2)
-                wrterror(d, "internal struct corrupt");
-        if (sz != PAGEROUND(sz) || psz == 0)
-                wrterror(d, "map round");
-
-        
-        if (psz <= MAX_CACHEABLE_SIZE && d->cache[psz - 1].max > 0) {
-                cache = &d->cache[psz - 1];
-                if (cache->length > 0) {
-                        if (cache->length == 1)
-                                p = cache->pages[--cache->length];
-                        else {
-                                i = getrbyte(d) % cache->length;
-                                p = cache->pages[i];
-                                cache->pages[i] = cache->pages[--cache->length];
-                        }
-                        if (!mopts.malloc_freeunmap)
-                                validate_junk(d, p, sz);
-                        if (mopts.malloc_freeunmap)
-                                mprotect(p, sz, PROT_READ | PROT_WRITE);
-                        if (zero_fill)
-                                memset(p, 0, sz);
-                        else if (mopts.malloc_freeunmap)
-                                junk_free(d->malloc_junk, p, sz);
-                        return p;
-                }
-                if (psz <= 1) {
-                        _MALLOC_LEAVE(d);
-                        p = MMAP(cache->max * sz, d->mmap_flag);
-                        _MALLOC_ENTER(d);
-                        if (p != MAP_FAILED) {
-                                STATS_ADD(d->malloc_used, cache->max * sz);
-                                cache->length = cache->max - 1;
-                                for (i = 0; i < cache->max - 1; i++) {
-                                        void *q = (char*)p + i * sz;
-                                        cache->pages[i] = q;
-                                        if (!mopts.malloc_freeunmap)
-                                                junk_free(d->malloc_junk, q, sz);
-                                }
-                                if (mopts.malloc_freeunmap)
-                                        mprotect(p, (cache->max - 1) * sz, PROT_NONE);
-                                p = (char*)p + (cache->max - 1) * sz;
-                                /* zero fill not needed */
-                                return p;
-                        }
-                }
-
-        }
-        _MALLOC_LEAVE(d);
-        p = MMAP(sz, d->mmap_flag);
-        _MALLOC_ENTER(d);
-        if (p != MAP_FAILED)
-                STATS_ADD(d->malloc_used, sz);
-        /* zero fill not needed */
-        return p;
-}
-
-static void
-init_chunk_info(struct dir_info *d, struct chunk_info *p, int bits)
-{
-        int i;
-
-        if (bits == 0) {
-                p->shift = MALLOC_MINSHIFT;
-                p->total = p->free = MALLOC_PAGESIZE >> p->shift;
-                p->size = 0;
-                p->offset = 0xdead;
-        } else {
-                p->shift = bits;
-                p->total = p->free = MALLOC_PAGESIZE >> p->shift;
-                p->size = 1U << bits;
-                p->offset = howmany(p->total, MALLOC_BITS);
-        }
-        p->canary = (u_short)d->canary1;
-
-        /* set all valid bits in the bitmap */
-        i = p->total - 1;       
-        memset(p->bits, 0xff, sizeof(p->bits[0]) * (i / MALLOC_BITS));
-        p->bits[i / MALLOC_BITS] = (2U << (i % MALLOC_BITS)) - 1;
-}
-
-static struct chunk_info *
-alloc_chunk_info(struct dir_info *d, int bits)
-{
-        struct chunk_info *p;
-
-        if (LIST_EMPTY(&d->chunk_info_list[bits])) {
-                size_t size, count, i;
-                char *q;
-
-                if (bits == 0)
-                        count = MALLOC_PAGESIZE / MALLOC_MINSIZE;
-                else
-                        count = MALLOC_PAGESIZE >> bits;
-
-                size = howmany(count, MALLOC_BITS);
-                size = sizeof(struct chunk_info) + (size - 1) * sizeof(u_short);
-                if (mopts.chunk_canaries)
-                        size += count * sizeof(u_short);
-                size = _ALIGN(size);
-
-                /* Don't use cache here, we don't want user uaf touch this */
-                q = MMAP(MALLOC_PAGESIZE, d->mmap_flag);
-                if (q == MAP_FAILED)
-                        return NULL;
-                STATS_ADD(d->malloc_used, MALLOC_PAGESIZE);
-                count = MALLOC_PAGESIZE / size;
-
-                for (i = 0; i < count; i++, q += size) {
-                        p = (struct chunk_info *)q;
-                        LIST_INSERT_HEAD(&d->chunk_info_list[bits], p, entries);
-                }
-        }
-        p = LIST_FIRST(&d->chunk_info_list[bits]);
-        LIST_REMOVE(p, entries);
-        if (p->shift == 0)
-                init_chunk_info(d, p, bits);
-        return p;
-}
-
-/*
- * Allocate a page of chunks
- */
-static struct chunk_info *
-omalloc_make_chunks(struct dir_info *d, int bits, int listnum)
-{
-        struct chunk_info *bp;
-        void *pp;
-
-        /* Allocate a new bucket */
-        pp = map(d, MALLOC_PAGESIZE, 0);
-        if (pp == MAP_FAILED)
-                return NULL;
-
-        /* memory protect the page allocated in the malloc(0) case */
-        if (bits == 0 && mprotect(pp, MALLOC_PAGESIZE, PROT_NONE) == -1)
-                goto err;
-
-        bp = alloc_chunk_info(d, bits);
-        if (bp == NULL)
-                goto err;
-        bp->page = pp;
-
-        if (insert(d, (void *)((uintptr_t)pp | (bits + 1)), (uintptr_t)bp,
-            NULL))
-                goto err;
-        LIST_INSERT_HEAD(&d->chunk_dir[bits][listnum], bp, entries);
-        return bp;
-
-err:
-        unmap(d, pp, MALLOC_PAGESIZE, 0);
-        return NULL;
-}
-
-static int
-find_chunksize(size_t size)
-{
-        int r;
-
-        /* malloc(0) is special */
-        if (size == 0)
-                return 0;
-
-        if (size < MALLOC_MINSIZE)
-                size = MALLOC_MINSIZE;
-        size--;
-
-        r = MALLOC_MINSHIFT;
-        while (size >> r)
-                r++;
-        return r;
-}
-
-static void
-fill_canary(char *ptr, size_t sz, size_t allocated)
-{
-        size_t check_sz = allocated - sz;
-
-        if (check_sz > CHUNK_CHECK_LENGTH)
-                check_sz = CHUNK_CHECK_LENGTH;
-        memset(ptr + sz, mopts.chunk_canaries, check_sz);
-}
-
-/*
- * Allocate a chunk
- */
-static void *
-malloc_bytes(struct dir_info *d, size_t size, void *f)
-{
-        u_int i, r;
-        int j, listnum;
-        size_t k;
-        u_short *lp;
-        struct chunk_info *bp;
-        void *p;
-
-        if (mopts.malloc_canary != (d->canary1 ^ (u_int32_t)(uintptr_t)d) ||
-            d->canary1 != ~d->canary2)
-                wrterror(d, "internal struct corrupt");
-
-        j = find_chunksize(size);
-
-        r = ((u_int)getrbyte(d) << 8) | getrbyte(d);
-        listnum = r % MALLOC_CHUNK_LISTS;
-        /* If it's empty, make a page more of that size chunks */
-        if ((bp = LIST_FIRST(&d->chunk_dir[j][listnum])) == NULL) {
-                bp = omalloc_make_chunks(d, j, listnum);
-                if (bp == NULL)
-                        return NULL;
-        }
-
-        if (bp->canary != (u_short)d->canary1)
-                wrterror(d, "chunk info corrupted");
-
-        i = (r / MALLOC_CHUNK_LISTS) & (bp->total - 1);
-
-        /* start somewhere in a short */
-        lp = &bp->bits[i / MALLOC_BITS];
-        if (*lp) {
-                j = i % MALLOC_BITS;
-                k = ffs(*lp >> j);
-                if (k != 0) {
-                        k += j - 1;
-                        goto found;
-                }
-        }
-        /* no bit halfway, go to next full short */
-        i /= MALLOC_BITS;
-        for (;;) {
-                if (++i >= bp->total / MALLOC_BITS)
-                        i = 0;
-                lp = &bp->bits[i];
-                if (*lp) {
-                        k = ffs(*lp) - 1;
-                        break;
-                }
-        }
-found:
-#ifdef MALLOC_STATS
-        if (i == 0 && k == 0) {
-                struct region_info *r = find(d, bp->page);
-                r->f = f;
-        }
-#endif
-
-        *lp ^= 1 << k;
-
-        /* If there are no more free, remove from free-list */
-        if (--bp->free == 0)
-                LIST_REMOVE(bp, entries);
-
-        /* Adjust to the real offset of that chunk */
-        k += (lp - bp->bits) * MALLOC_BITS;
-
-        if (mopts.chunk_canaries && size > 0)
-                bp->bits[bp->offset + k] = size;
-
-        k <<= bp->shift;
-
-        p = (char *)bp->page + k;
-        if (bp->size > 0) {
-                if (d->malloc_junk == 2)
-                        memset(p, SOME_JUNK, bp->size);
-                else if (mopts.chunk_canaries)
-                        fill_canary(p, size, bp->size);
-        }
-        return p;
-}
-
-static void
-validate_canary(struct dir_info *d, u_char *ptr, size_t sz, size_t allocated)
-{
-        size_t check_sz = allocated - sz;
-        u_char *p, *q;
-
-        if (check_sz > CHUNK_CHECK_LENGTH)
-                check_sz = CHUNK_CHECK_LENGTH;
-        p = ptr + sz;
-        q = p + check_sz;
-
-        while (p < q) {
-                if (*p != (u_char)mopts.chunk_canaries && *p != SOME_JUNK) {
-                        wrterror(d, "chunk canary corrupted %p %#tx@%#zx%s",
-                            ptr, p - ptr, sz,
-                            *p == SOME_FREEJUNK ? " (double free?)" : "");
-                }
-                p++;
-        }
-}
-
-static uint32_t
-find_chunknum(struct dir_info *d, struct chunk_info *info, void *ptr, int check)
-{
-        uint32_t chunknum;
-
-        if (info->canary != (u_short)d->canary1)
-                wrterror(d, "chunk info corrupted");
-
-        /* Find the chunk number on the page */
-        chunknum = ((uintptr_t)ptr & MALLOC_PAGEMASK) >> info->shift;
-
-        if ((uintptr_t)ptr & ((1U << (info->shift)) - 1))
-                wrterror(d, "modified chunk-pointer %p", ptr);
-        if (info->bits[chunknum / MALLOC_BITS] &
-            (1U << (chunknum % MALLOC_BITS)))
-                wrterror(d, "chunk is already free %p", ptr);
-        if (check && info->size > 0) {
-                validate_canary(d, ptr, info->bits[info->offset + chunknum],
-                    info->size);
-        }
-        return chunknum;
-}
-
-/*
- * Free a chunk, and possibly the page it's on, if the page becomes empty.
- */
-static void
-free_bytes(struct dir_info *d, struct region_info *r, void *ptr)
-{
-        struct chunk_head *mp;
-        struct chunk_info *info;
-        uint32_t chunknum;
-        int listnum;
-
-        info = (struct chunk_info *)r->size;
-        chunknum = find_chunknum(d, info, ptr, 0);
-
-        info->bits[chunknum / MALLOC_BITS] |= 1U << (chunknum % MALLOC_BITS);
-        info->free++;
-
-        if (info->free == 1) {
-                /* Page became non-full */
-                listnum = getrbyte(d) % MALLOC_CHUNK_LISTS;
-                if (info->size != 0)
-                        mp = &d->chunk_dir[info->shift][listnum];
-                else
-                        mp = &d->chunk_dir[0][listnum];
-
-                LIST_INSERT_HEAD(mp, info, entries);
-                return;
-        }
-
-        if (info->free != info->total)
-                return;
-
-        LIST_REMOVE(info, entries);
-
-        if (info->size == 0 && !mopts.malloc_freeunmap)
-                mprotect(info->page, MALLOC_PAGESIZE, PROT_READ | PROT_WRITE);
-        unmap(d, info->page, MALLOC_PAGESIZE, 0);
-
-        delete(d, r);
-        if (info->size != 0)
-                mp = &d->chunk_info_list[info->shift];
-        else
-                mp = &d->chunk_info_list[0];
-        LIST_INSERT_HEAD(mp, info, entries);
-}
-
-
-
-static void *
-omalloc(struct dir_info *pool, size_t sz, int zero_fill, void *f)
-{
-        void *p;
-        size_t psz;
-
-        if (sz > MALLOC_MAXCHUNK) {
-                if (sz >= SIZE_MAX - mopts.malloc_guard - MALLOC_PAGESIZE) {
-                        errno = ENOMEM;
-                        return NULL;
-                }
-                sz += mopts.malloc_guard;
-                psz = PAGEROUND(sz);
-                p = map(pool, psz, zero_fill);
-                if (p == MAP_FAILED) {
-                        errno = ENOMEM;
-                        return NULL;
-                }
-                if (insert(pool, p, sz, f)) {
-                        unmap(pool, p, psz, 0);
-                        errno = ENOMEM;
-                        return NULL;
-                }
-                if (mopts.malloc_guard) {
-                        if (mprotect((char *)p + psz - mopts.malloc_guard,
-                            mopts.malloc_guard, PROT_NONE))
-                                wrterror(pool, "mprotect");
-                        STATS_ADD(pool->malloc_guarded, mopts.malloc_guard);
-                }
-
-                if (MALLOC_MOVE_COND(sz)) {
-                        /* fill whole allocation */
-                        if (pool->malloc_junk == 2)
-                                memset(p, SOME_JUNK, psz - mopts.malloc_guard);
-                        /* shift towards the end */
-                        p = MALLOC_MOVE(p, sz);
-                        /* fill zeros if needed and overwritten above */
-                        if (zero_fill && pool->malloc_junk == 2)
-                                memset(p, 0, sz - mopts.malloc_guard);
-                } else {
-                        if (pool->malloc_junk == 2) {
-                                if (zero_fill)
-                                        memset((char *)p + sz - mopts.malloc_guard,
-                                            SOME_JUNK, psz - sz);
-                                else
-                                        memset(p, SOME_JUNK,
-                                            psz - mopts.malloc_guard);
-                        } else if (mopts.chunk_canaries)
-                                fill_canary(p, sz - mopts.malloc_guard,
-                                    psz - mopts.malloc_guard);
-                }
-
-        } else {
-                /* takes care of SOME_JUNK */
-                p = malloc_bytes(pool, sz, f);
-                if (zero_fill && p != NULL && sz > 0)
-                        memset(p, 0, sz);
-        }
-
-        return p;
-}
-
-/*
- * Common function for handling recursion.  Only
- * print the error message once, to avoid making the problem
- * potentially worse.
- */
-static void
-malloc_recurse(struct dir_info *d)
-{
-        static int noprint;
-
-        if (noprint == 0) {
-                noprint = 1;
-                wrterror(d, "recursive call");
-        }
-        d->active--;
-        _MALLOC_UNLOCK(d->mutex);
-        errno = EDEADLK;
-}
-
-void
-_malloc_init(int from_rthreads)
-{
-        u_int i, j, nmutexes;
-        struct dir_info *d;
-
-        _MALLOC_LOCK(1);
-        if (!from_rthreads && mopts.malloc_pool[1]) {
-                _MALLOC_UNLOCK(1);
-                return;
-        }
-        if (!mopts.malloc_canary)
-                omalloc_init();
-
-        nmutexes = from_rthreads ? mopts.malloc_mutexes : 2;
-        if (((uintptr_t)&malloc_readonly & MALLOC_PAGEMASK) == 0)
-                mprotect(&malloc_readonly, sizeof(malloc_readonly),
-                    PROT_READ | PROT_WRITE);
-        for (i = 0; i < nmutexes; i++) {
-                if (mopts.malloc_pool[i])
-                        continue;
-                if (i == 0) {
-                        omalloc_poolinit(&d, MAP_CONCEAL);
-                        d->malloc_junk = 2;
-                        for (j = 0; j < MAX_CACHEABLE_SIZE; j++)
-                                d->cache[j].max = 0;
-                } else {
-                        omalloc_poolinit(&d, 0);
-                        d->malloc_junk = mopts.def_malloc_junk;
-                        for (j = 0; j < MAX_CACHEABLE_SIZE; j++)
-                                d->cache[j].max = mopts.def_maxcache >> (j / 8);
-                }
-                d->mutex = i;
-                mopts.malloc_pool[i] = d;
-        }
-
-        if (from_rthreads)
-                mopts.malloc_mt = 1;
-        else
-                mopts.internal_funcs = 1;
-
-        /*
-         * Options have been set and will never be reset.
-         * Prevent further tampering with them.
-         */
-        if (((uintptr_t)&malloc_readonly & MALLOC_PAGEMASK) == 0)
-                mprotect(&malloc_readonly, sizeof(malloc_readonly), PROT_READ);
-        _MALLOC_UNLOCK(1);
-}
-DEF_STRONG(_malloc_init);
-
-#define PROLOGUE(p, fn)                 \
-        d = (p);                        \
-        if (d == NULL) {                \
-                _malloc_init(0);        \
-                d = (p);                \
-        }                               \
-        _MALLOC_LOCK(d->mutex);         \
-        d->func = fn;                   \
-        if (d->active++) {              \
-                malloc_recurse(d);      \
-                return NULL;            \
-        }                               \
-
-#define EPILOGUE()                              \
-        d->active--;                            \
-        _MALLOC_UNLOCK(d->mutex);               \
-        if (r == NULL && mopts.malloc_xmalloc)  \
-                wrterror(d, "out of memory");   \
-        if (r != NULL)                          \
-                errno = saved_errno;            \
-        
-void *
-malloc(size_t size)
-{
-        void *r;
-        struct dir_info *d;
-        int saved_errno = errno;
-
-        PROLOGUE(getpool(), "malloc")
-        r = omalloc(d, size, 0, CALLER);
-        EPILOGUE()
-        return r;
-}
-/*DEF_STRONG(malloc);*/
-
-void *
-malloc_conceal(size_t size)
-{
-        void *r;
-        struct dir_info *d;
-        int saved_errno = errno;
-
-        PROLOGUE(mopts.malloc_pool[0], "malloc_conceal")
-        r = omalloc(d, size, 0, CALLER);
-        EPILOGUE()
-        return r;
-}
-DEF_WEAK(malloc_conceal);
-
-static struct region_info *
-findpool(void *p, struct dir_info *argpool, struct dir_info **foundpool,
-    char **saved_function)
-{
-        struct dir_info *pool = argpool;
-        struct region_info *r = find(pool, p);
-
-        STATS_INC(pool->pool_searches);
-        if (r == NULL) {
-                u_int i, nmutexes;
-
-                nmutexes = mopts.malloc_mt ? mopts.malloc_mutexes : 2;
-                STATS_INC(pool->other_pool);
-                for (i = 1; i < nmutexes; i++) {
-                        u_int j = (argpool->mutex + i) & (nmutexes - 1);
-
-                        pool->active--;
-                        _MALLOC_UNLOCK(pool->mutex);
-                        pool = mopts.malloc_pool[j];
-                        _MALLOC_LOCK(pool->mutex);
-                        pool->active++;
-                        r = find(pool, p);
-                        if (r != NULL) {
-                                *saved_function = pool->func;
-                                pool->func = argpool->func;
-                                break;
-                        }
-                }
-                if (r == NULL)
-                        wrterror(argpool, "bogus pointer (double free?) %p", p);
-        }
-        *foundpool = pool;
-        return r;
-}
-
-static void
-ofree(struct dir_info **argpool, void *p, int clear, int check, size_t argsz)
-{
-        struct region_info *r;
-        struct dir_info *pool;
-        char *saved_function;
-        size_t sz;
-
-        r = findpool(p, *argpool, &pool, &saved_function);
-
-        REALSIZE(sz, r);
-        if (pool->mmap_flag) {
-                clear = 1;
-                if (!check)
-                        argsz = sz;
-        }
-        if (check) {
-                if (sz <= MALLOC_MAXCHUNK) {
-                        if (mopts.chunk_canaries && sz > 0) {
-                                struct chunk_info *info =
-                                    (struct chunk_info *)r->size;
-                                uint32_t chunknum =
-                                    find_chunknum(pool, info, p, 0);
-
-                                if (info->bits[info->offset + chunknum] < argsz)
-                                        wrterror(pool, "recorded size %hu"
-                                            " < %zu",
-                                            info->bits[info->offset + chunknum],
-                                            argsz);
-                        } else {
-                                if (sz < argsz)
-                                        wrterror(pool, "chunk size %zu < %zu",
-                                            sz, argsz);
-                        }
-                } else if (sz - mopts.malloc_guard < argsz) {
-                        wrterror(pool, "recorded size %zu < %zu",
-                            sz - mopts.malloc_guard, argsz);
-                }
-        }
-        if (sz > MALLOC_MAXCHUNK) {
-                if (!MALLOC_MOVE_COND(sz)) {
-                        if (r->p != p)
-                                wrterror(pool, "bogus pointer %p", p);
-                        if (mopts.chunk_canaries)
-                                validate_canary(pool, p,
-                                    sz - mopts.malloc_guard,
-                                    PAGEROUND(sz - mopts.malloc_guard));
-                } else {
-                        /* shifted towards the end */
-                        if (p != MALLOC_MOVE(r->p, sz))
-                                wrterror(pool, "bogus moved pointer %p", p);
-                        p = r->p;
-                }
-                if (mopts.malloc_guard) {
-                        if (sz < mopts.malloc_guard)
-                                wrterror(pool, "guard size");
-                        if (!mopts.malloc_freeunmap) {
-                                if (mprotect((char *)p + PAGEROUND(sz) -
-                                    mopts.malloc_guard, mopts.malloc_guard,
-                                    PROT_READ | PROT_WRITE))
-                                        wrterror(pool, "mprotect");
-                        }
-                        STATS_SUB(pool->malloc_guarded, mopts.malloc_guard);
-                }
-                unmap(pool, p, PAGEROUND(sz), clear ? argsz : 0);
-                delete(pool, r);
-        } else {
-                /* Validate and optionally canary check */
-                struct chunk_info *info = (struct chunk_info *)r->size;
-                if (info->size != sz)
-                        wrterror(pool, "internal struct corrupt");
-                find_chunknum(pool, info, p, mopts.chunk_canaries);
-                if (!clear) {
-                        void *tmp;
-                        int i;
-
-                        if (mopts.malloc_freecheck) {
-                                for (i = 0; i <= MALLOC_DELAYED_CHUNK_MASK; i++)
-                                        if (p == pool->delayed_chunks[i])
-                                                wrterror(pool,
-                                                    "double free %p", p);
-                        }
-                        junk_free(pool->malloc_junk, p, sz);
-                        i = getrbyte(pool) & MALLOC_DELAYED_CHUNK_MASK;
-                        tmp = p;
-                        p = pool->delayed_chunks[i];
-                        if (tmp == p)
-                                wrterror(pool, "double free %p", tmp);
-                        pool->delayed_chunks[i] = tmp;
-                        if (p != NULL) {
-                                r = find(pool, p);
-                                REALSIZE(sz, r);
-                                if (r != NULL)
-                                        validate_junk(pool, p, sz);
-                        }
-                } else if (argsz > 0) {
-                        r = find(pool, p);
-                        memset(p, 0, argsz);
-                }
-                if (p != NULL) {
-                        if (r == NULL)
-                                wrterror(pool,
-                                    "bogus pointer (double free?) %p", p);
-                        free_bytes(pool, r, p);
-                }
-        }
-
-        if (*argpool != pool) {
-                pool->func = saved_function;
-                *argpool = pool;
-        }
-}
-
-void
-free(void *ptr)
-{
-        struct dir_info *d;
-        int saved_errno = errno;
-
-        /* This is legal. */
-        if (ptr == NULL)
-                return;
-
-        d = getpool();
-        if (d == NULL)
-                wrterror(d, "free() called before allocation");
-        _MALLOC_LOCK(d->mutex);
-        d->func = "free";
-        if (d->active++) {
-                malloc_recurse(d);
-                return;
-        }
-        ofree(&d, ptr, 0, 0, 0);
-        d->active--;
-        _MALLOC_UNLOCK(d->mutex);
-        errno = saved_errno;
-}
-/*DEF_STRONG(free);*/
-
-static void
-freezero_p(void *ptr, size_t sz)
-{
-        explicit_bzero(ptr, sz);
-        free(ptr);
-}
-
-void
-freezero(void *ptr, size_t sz)
-{
-        struct dir_info *d;
-        int saved_errno = errno;
-
-        /* This is legal. */
-        if (ptr == NULL)
-                return;
-
-        if (!mopts.internal_funcs) {
-                freezero_p(ptr, sz);
-                return;
-        }
-
-        d = getpool();
-        if (d == NULL)
-                wrterror(d, "freezero() called before allocation");
-        _MALLOC_LOCK(d->mutex);
-        d->func = "freezero";
-        if (d->active++) {
-                malloc_recurse(d);
-                return;
-        }
-        ofree(&d, ptr, 1, 1, sz);
-        d->active--;
-        _MALLOC_UNLOCK(d->mutex);
-        errno = saved_errno;
-}
-DEF_WEAK(freezero);
-
-static void *
-orealloc(struct dir_info **argpool, void *p, size_t newsz, void *f)
-{
-        struct region_info *r;
-        struct dir_info *pool;
-        char *saved_function;
-        struct chunk_info *info;
-        size_t oldsz, goldsz, gnewsz;
-        void *q, *ret;
-        uint32_t chunknum;
-        int forced;
-
-        if (p == NULL)
-                return omalloc(*argpool, newsz, 0, f);
-
-        if (newsz >= SIZE_MAX - mopts.malloc_guard - MALLOC_PAGESIZE) {
-                errno = ENOMEM;
-                return  NULL;
-        }
-
-        r = findpool(p, *argpool, &pool, &saved_function);
-
-        REALSIZE(oldsz, r);
-        if (mopts.chunk_canaries && oldsz <= MALLOC_MAXCHUNK) {
-                info = (struct chunk_info *)r->size;
-                chunknum = find_chunknum(pool, info, p, 0);
-        }
-
-        goldsz = oldsz;
-        if (oldsz > MALLOC_MAXCHUNK) {
-                if (oldsz < mopts.malloc_guard)
-                        wrterror(pool, "guard size");
-                oldsz -= mopts.malloc_guard;
-        }
-
-        gnewsz = newsz;
-        if (gnewsz > MALLOC_MAXCHUNK)
-                gnewsz += mopts.malloc_guard;
-
-        forced = mopts.malloc_realloc || pool->mmap_flag;
-        if (newsz > MALLOC_MAXCHUNK && oldsz > MALLOC_MAXCHUNK && !forced) {
-                /* First case: from n pages sized allocation to m pages sized
-                   allocation, m > n */
-                size_t roldsz = PAGEROUND(goldsz);
-                size_t rnewsz = PAGEROUND(gnewsz);
-
-                if (rnewsz < roldsz && rnewsz > roldsz / 2 &&
-                    roldsz - rnewsz < mopts.def_maxcache * MALLOC_PAGESIZE &&
-                    !mopts.malloc_guard) {
-
-                        ret = p;
-                        goto done;
-                }
-
-                if (rnewsz > roldsz) {
-                        /* try to extend existing region */
-                        if (!mopts.malloc_guard) {
-                                void *hint = (char *)r->p + roldsz;
-                                size_t needed = rnewsz - roldsz;
-
-                                STATS_INC(pool->cheap_realloc_tries);
-                                q = MQUERY(hint, needed, pool->mmap_flag);
-                                if (q == hint)
-                                        q = MMAPA(hint, needed, pool->mmap_flag);
-                                else
-                                        q = MAP_FAILED;
-                                if (q == hint) {
-                                        STATS_ADD(pool->malloc_used, needed);
-                                        if (pool->malloc_junk == 2)
-                                                memset(q, SOME_JUNK, needed);
-                                        r->size = gnewsz;
-                                        if (r->p != p) {
-                                                /* old pointer is moved */
-                                                memmove(r->p, p, oldsz);
-                                                p = r->p;
-                                        }
-                                        if (mopts.chunk_canaries)
-                                                fill_canary(p, newsz,
-                                                    PAGEROUND(newsz));
-                                        STATS_SETF(r, f);
-                                        STATS_INC(pool->cheap_reallocs);
-                                        ret = p;
-                                        goto done;
-                                } else if (q != MAP_FAILED) {
-                                        if (munmap(q, needed))
-                                                wrterror(pool, "munmap %p", q);
-                                }
-                        }
-                } else if (rnewsz < roldsz) {
-                        /* shrink number of pages */
-                        if (mopts.malloc_guard) {
-                                if (mprotect((char *)r->p + rnewsz -
-                                    mopts.malloc_guard, mopts.malloc_guard,
-                                    PROT_NONE))
-                                        wrterror(pool, "mprotect");
-                        }
-                        if (munmap((char *)r->p + rnewsz, roldsz - rnewsz))
-                                wrterror(pool, "munmap %p", (char *)r->p + rnewsz);
-                        STATS_SUB(pool->malloc_used, roldsz - rnewsz);
-                        r->size = gnewsz;
-                        if (MALLOC_MOVE_COND(gnewsz)) {
-                                void *pp = MALLOC_MOVE(r->p, gnewsz);
-                                memmove(pp, p, newsz);
-                                p = pp;
-                        } else if (mopts.chunk_canaries)
-                                fill_canary(p, newsz, PAGEROUND(newsz));
-                        STATS_SETF(r, f);
-                        ret = p;
-                        goto done;
-                } else {
-                        /* number of pages remains the same */
-                        void *pp = r->p;
-
-                        r->size = gnewsz;
-                        if (MALLOC_MOVE_COND(gnewsz))
-                                pp = MALLOC_MOVE(r->p, gnewsz);
-                        if (p != pp) {
-                                memmove(pp, p, oldsz < newsz ? oldsz : newsz);
-                                p = pp;
-                        }
-                        if (p == r->p) {
-                                if (newsz > oldsz && pool->malloc_junk == 2)
-                                        memset((char *)p + newsz, SOME_JUNK,
-                                            rnewsz - mopts.malloc_guard -
-                                            newsz);
-                                if (mopts.chunk_canaries)
-                                        fill_canary(p, newsz, PAGEROUND(newsz));
-                        }
-                        STATS_SETF(r, f);
-                        ret = p;
-                        goto done;
-                }
-        }
-        if (oldsz <= MALLOC_MAXCHUNK && oldsz > 0 &&
-            newsz <= MALLOC_MAXCHUNK && newsz > 0 &&
-            1 << find_chunksize(newsz) == oldsz && !forced) {
-                /* do not reallocate if new size fits good in existing chunk */
-                if (pool->malloc_junk == 2)
-                        memset((char *)p + newsz, SOME_JUNK, oldsz - newsz);
-                if (mopts.chunk_canaries) {
-                        info->bits[info->offset + chunknum] = newsz;
-                        fill_canary(p, newsz, info->size);
-                }
-                STATS_SETF(r, f);
-                ret = p;
-        } else if (newsz != oldsz || forced) {
-                /* create new allocation */
-                q = omalloc(pool, newsz, 0, f);
-                if (q == NULL) {
-                        ret = NULL;
-                        goto done;
-                }
-                if (newsz != 0 && oldsz != 0)
-                        memcpy(q, p, oldsz < newsz ? oldsz : newsz);
-                ofree(&pool, p, 0, 0, 0);
-                ret = q;
-        } else {
-                /* oldsz == newsz */
-                if (newsz != 0)
-                        wrterror(pool, "realloc internal inconsistency");
-                STATS_SETF(r, f);
-                ret = p;
-        }
-done:
-        if (*argpool != pool) {
-                pool->func = saved_function;
-                *argpool = pool;
-        }
-        return ret;
-}
-
-void *
-realloc(void *ptr, size_t size)
-{
-        struct dir_info *d;
-        void *r;
-        int saved_errno = errno;
-
-        PROLOGUE(getpool(), "realloc")
-        r = orealloc(&d, ptr, size, CALLER);
-        EPILOGUE()
-        return r;
-}
-/*DEF_STRONG(realloc);*/
-
-/*
- * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
- * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
- */
-#define MUL_NO_OVERFLOW (1UL << (sizeof(size_t) * 4))
-
-void *
-calloc(size_t nmemb, size_t size)
-{
-        struct dir_info *d;
-        void *r;
-        int saved_errno = errno;
-
-        PROLOGUE(getpool(), "calloc")
-        if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
-            nmemb > 0 && SIZE_MAX / nmemb < size) {
-                d->active--;
-                _MALLOC_UNLOCK(d->mutex);
-                if (mopts.malloc_xmalloc)
-                        wrterror(d, "out of memory");
-                errno = ENOMEM;
-                return NULL;
-        }
-
-        size *= nmemb;
-        r = omalloc(d, size, 1, CALLER);
-        EPILOGUE()
-        return r;
-}
-/*DEF_STRONG(calloc);*/
-
-void *
-calloc_conceal(size_t nmemb, size_t size)
-{
-        struct dir_info *d;
-        void *r;
-        int saved_errno = errno;
-
-        PROLOGUE(mopts.malloc_pool[0], "calloc_conceal")
-        if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
-            nmemb > 0 && SIZE_MAX / nmemb < size) {
-                d->active--;
-                _MALLOC_UNLOCK(d->mutex);
-                if (mopts.malloc_xmalloc)
-                        wrterror(d, "out of memory");
-                errno = ENOMEM;
-                return NULL;
-        }
-
-        size *= nmemb;
-        r = omalloc(d, size, 1, CALLER);
-        EPILOGUE()
-        return r;
-}
-DEF_WEAK(calloc_conceal);
-
-static void *
-orecallocarray(struct dir_info **argpool, void *p, size_t oldsize,
-    size_t newsize, void *f)
-{
-        struct region_info *r;
-        struct dir_info *pool;
-        char *saved_function;
-        void *newptr;
-        size_t sz;
-
-        if (p == NULL)
-                return omalloc(*argpool, newsize, 1, f);
-
-        if (oldsize == newsize)
-                return p;
-
-        r = findpool(p, *argpool, &pool, &saved_function);
-
-        REALSIZE(sz, r);
-        if (sz <= MALLOC_MAXCHUNK) {
-                if (mopts.chunk_canaries && sz > 0) {
-                        struct chunk_info *info = (struct chunk_info *)r->size;
-                        uint32_t chunknum = find_chunknum(pool, info, p, 0);
-
-                        if (info->bits[info->offset + chunknum] != oldsize)
-                                wrterror(pool, "recorded old size %hu != %zu",
-                                    info->bits[info->offset + chunknum],
-                                    oldsize);
-                }
-        } else if (oldsize < (sz - mopts.malloc_guard) / 2)
-                wrterror(pool, "recorded old size %zu != %zu",
-                    sz - mopts.malloc_guard, oldsize);
-
-        newptr = omalloc(pool, newsize, 0, f);
-        if (newptr == NULL)
-                goto done;
-
-        if (newsize > oldsize) {
-                memcpy(newptr, p, oldsize);
-                memset((char *)newptr + oldsize, 0, newsize - oldsize);
-        } else
-                memcpy(newptr, p, newsize);
-
-        ofree(&pool, p, 1, 0, oldsize);
-
-done:
-        if (*argpool != pool) {
-                pool->func = saved_function;
-                *argpool = pool;
-        }
-
-        return newptr;
-}
-
-static void *
-recallocarray_p(void *ptr, size_t oldnmemb, size_t newnmemb, size_t size)
-{
-        size_t oldsize, newsize;
-        void *newptr;
-
-        if (ptr == NULL)
-                return calloc(newnmemb, size);
-
-        if ((newnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
-            newnmemb > 0 && SIZE_MAX / newnmemb < size) {
-                errno = ENOMEM;
-                return NULL;
-        }
-        newsize = newnmemb * size;
-
-        if ((oldnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
-            oldnmemb > 0 && SIZE_MAX / oldnmemb < size) {
-                errno = EINVAL;
-                return NULL;
-        }
-        oldsize = oldnmemb * size;
-
-        /*
-         * Don't bother too much if we're shrinking just a bit,
-         * we do not shrink for series of small steps, oh well.
-         */
-        if (newsize <= oldsize) {
-                size_t d = oldsize - newsize;
-
-                if (d < oldsize / 2 && d < MALLOC_PAGESIZE) {
-                        memset((char *)ptr + newsize, 0, d);
-                        return ptr;
-                }
-        }
-
-        newptr = malloc(newsize);
-        if (newptr == NULL)
-                return NULL;
-
-        if (newsize > oldsize) {
-                memcpy(newptr, ptr, oldsize);
-                memset((char *)newptr + oldsize, 0, newsize - oldsize);
-        } else
-                memcpy(newptr, ptr, newsize);
-
-        explicit_bzero(ptr, oldsize);
-        free(ptr);
-
-        return newptr;
-}
-
-void *
-recallocarray(void *ptr, size_t oldnmemb, size_t newnmemb, size_t size)
-{
-        struct dir_info *d;
-        size_t oldsize = 0, newsize;
-        void *r;
-        int saved_errno = errno;
-
-        if (!mopts.internal_funcs)
-                return recallocarray_p(ptr, oldnmemb, newnmemb, size);
-
-        PROLOGUE(getpool(), "recallocarray")
-
-        if ((newnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
-            newnmemb > 0 && SIZE_MAX / newnmemb < size) {
-                d->active--;
-                _MALLOC_UNLOCK(d->mutex);
-                if (mopts.malloc_xmalloc)
-                        wrterror(d, "out of memory");
-                errno = ENOMEM;
-                return NULL;
-        }
-        newsize = newnmemb * size;
-
-        if (ptr != NULL) {
-                if ((oldnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
-                    oldnmemb > 0 && SIZE_MAX / oldnmemb < size) {
-                        d->active--;
-                        _MALLOC_UNLOCK(d->mutex);
-                        errno = EINVAL;
-                        return NULL;
-                }
-                oldsize = oldnmemb * size;
-        }
-
-        r = orecallocarray(&d, ptr, oldsize, newsize, CALLER);
-        EPILOGUE()
-        return r;
-}
-DEF_WEAK(recallocarray);
-
-static void *
-mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill)
-{
-        char *p, *q;
-
-        if (alignment < MALLOC_PAGESIZE || ((alignment - 1) & alignment) != 0)
-                wrterror(d, "mapalign bad alignment");
-        if (sz != PAGEROUND(sz))
-                wrterror(d, "mapalign round");
-
-        /* Allocate sz + alignment bytes of memory, which must include a
-         * subrange of size bytes that is properly aligned.  Unmap the
-         * other bytes, and then return that subrange.
-         */
-
-        /* We need sz + alignment to fit into a size_t. */
-        if (alignment > SIZE_MAX - sz)
-                return MAP_FAILED;
-
-        p = map(d, sz + alignment, zero_fill);
-        if (p == MAP_FAILED)
-                return MAP_FAILED;
-        q = (char *)(((uintptr_t)p + alignment - 1) & ~(alignment - 1));
-        if (q != p) {
-                if (munmap(p, q - p))
-                        wrterror(d, "munmap %p", p);
-        }
-        if (munmap(q + sz, alignment - (q - p)))
-                wrterror(d, "munmap %p", q + sz);
-        STATS_SUB(d->malloc_used, alignment);
-
-        return q;
-}
-
-static void *
-omemalign(struct dir_info *pool, size_t alignment, size_t sz, int zero_fill,
-    void *f)
-{
-        size_t psz;
-        void *p;
-
-        /* If between half a page and a page, avoid MALLOC_MOVE. */
-        if (sz > MALLOC_MAXCHUNK && sz < MALLOC_PAGESIZE)
-                sz = MALLOC_PAGESIZE;
-        if (alignment <= MALLOC_PAGESIZE) {
-                /*
-                 * max(size, alignment) is enough to assure the requested
-                 * alignment, since the allocator always allocates
-                 * power-of-two blocks.
-                 */
-                if (sz < alignment)
-                        sz = alignment;
-                return omalloc(pool, sz, zero_fill, f);
-        }
-
-        if (sz >= SIZE_MAX - mopts.malloc_guard - MALLOC_PAGESIZE) {
-                errno = ENOMEM;
-                return NULL;
-        }
-
-        if (sz < MALLOC_PAGESIZE)
-                sz = MALLOC_PAGESIZE;
-        sz += mopts.malloc_guard;
-        psz = PAGEROUND(sz);
-
-        p = mapalign(pool, alignment, psz, zero_fill);
-        if (p == MAP_FAILED) {
-                errno = ENOMEM;
-                return NULL;
-        }
-
-        if (insert(pool, p, sz, f)) {
-                unmap(pool, p, psz, 0);
-                errno = ENOMEM;
-                return NULL;
-        }
-
-        if (mopts.malloc_guard) {
-                if (mprotect((char *)p + psz - mopts.malloc_guard,
-                    mopts.malloc_guard, PROT_NONE))
-                        wrterror(pool, "mprotect");
-                STATS_ADD(pool->malloc_guarded, mopts.malloc_guard);
-        }
-
-        if (pool->malloc_junk == 2) {
-                if (zero_fill)
-                        memset((char *)p + sz - mopts.malloc_guard,
-                            SOME_JUNK, psz - sz);
-                else
-                        memset(p, SOME_JUNK, psz - mopts.malloc_guard);
-        } else if (mopts.chunk_canaries)
-                fill_canary(p, sz - mopts.malloc_guard,
-                    psz - mopts.malloc_guard);
-
-        return p;
-}
-
-int
-posix_memalign(void **memptr, size_t alignment, size_t size)
-{
-        struct dir_info *d;
-        int res, saved_errno = errno;
-        void *r;
-
-        /* Make sure that alignment is a large enough power of 2. */
-        if (((alignment - 1) & alignment) != 0 || alignment < sizeof(void *))
-                return EINVAL;
-
-        d = getpool();
-        if (d == NULL) {
-                _malloc_init(0);
-                d = getpool();
-        }
-        _MALLOC_LOCK(d->mutex);
-        d->func = "posix_memalign";
-        if (d->active++) {
-                malloc_recurse(d);
-                goto err;
-        }
-        r = omemalign(d, alignment, size, 0, CALLER);
-        d->active--;
-        _MALLOC_UNLOCK(d->mutex);
-        if (r == NULL) {
-                if (mopts.malloc_xmalloc)
-                        wrterror(d, "out of memory");
-                goto err;
-        }
-        errno = saved_errno;
-        *memptr = r;
-        return 0;
-
-err:
-        res = errno;
-        errno = saved_errno;
-        return res;
-}
-/*DEF_STRONG(posix_memalign);*/
-
-void *
-aligned_alloc(size_t alignment, size_t size)
-{
-        struct dir_info *d;
-        int saved_errno = errno;
-        void *r;
-
-        /* Make sure that alignment is a positive power of 2. */
-        if (((alignment - 1) & alignment) != 0 || alignment == 0) {
-                errno = EINVAL;
-                return NULL;
-        };
-        /* Per spec, size should be a multiple of alignment */
-        if ((size & (alignment - 1)) != 0) {
-                errno = EINVAL;
-                return NULL;
-        }
-
-        PROLOGUE(getpool(), "aligned_alloc")
-        r = omemalign(d, alignment, size, 0, CALLER);
-        EPILOGUE()
-        return r;
-}
-/*DEF_STRONG(aligned_alloc);*/
-
-#ifdef MALLOC_STATS
-
-struct malloc_leak {
-        void *f;
-        size_t total_size;
-        int count;
-};
-
-struct leaknode {
-        RBT_ENTRY(leaknode) entry;
-        struct malloc_leak d;
-};
-
-static inline int
-leakcmp(const struct leaknode *e1, const struct leaknode *e2)
-{
-        return e1->d.f < e2->d.f ? -1 : e1->d.f > e2->d.f;
-}
-
-static RBT_HEAD(leaktree, leaknode) leakhead;
-RBT_PROTOTYPE(leaktree, leaknode, entry, leakcmp);
-RBT_GENERATE(leaktree, leaknode, entry, leakcmp);
-
-static void
-putleakinfo(void *f, size_t sz, int cnt)
-{
-        struct leaknode key, *p;
-        static struct leaknode *page;
-        static int used;
-
-        if (cnt == 0 || page == MAP_FAILED)
-                return;
-
-        key.d.f = f;
-        p = RBT_FIND(leaktree, &leakhead, &key);
-        if (p == NULL) {
-                if (page == NULL ||
-                    used >= MALLOC_PAGESIZE / sizeof(struct leaknode)) {
-                        page = MMAP(MALLOC_PAGESIZE, 0);
-                        if (page == MAP_FAILED)
-                                return;
-                        used = 0;
-                }
-                p = &page[used++];
-                p->d.f = f;
-                p->d.total_size = sz * cnt;
-                p->d.count = cnt;
-                RBT_INSERT(leaktree, &leakhead, p);
-        } else {
-                p->d.total_size += sz * cnt;
-                p->d.count += cnt;
-        }
-}
-
-static struct malloc_leak *malloc_leaks;
-
-static void
-dump_leaks(int fd)
-{
-        struct leaknode *p;
-        int i = 0;
-
-        dprintf(fd, "Leak report\n");
-        dprintf(fd, "                 f     sum      #    avg\n");
-        /* XXX only one page of summary */
-        if (malloc_leaks == NULL)
-                malloc_leaks = MMAP(MALLOC_PAGESIZE, 0);
-        if (malloc_leaks != MAP_FAILED)
-                memset(malloc_leaks, 0, MALLOC_PAGESIZE);
-        RBT_FOREACH(p, leaktree, &leakhead) {
-                dprintf(fd, "%18p %7zu %6u %6zu\n", p->d.f,
-                    p->d.total_size, p->d.count, p->d.total_size / p->d.count);
-                if (malloc_leaks == MAP_FAILED ||
-                    i >= MALLOC_PAGESIZE / sizeof(struct malloc_leak))
-                        continue;
-                malloc_leaks[i].f = p->d.f;
-                malloc_leaks[i].total_size = p->d.total_size;
-                malloc_leaks[i].count = p->d.count;
-                i++;
-        }
-}
-
-static void
-dump_chunk(int fd, struct chunk_info *p, void *f, int fromfreelist)
-{
-        while (p != NULL) {
-                dprintf(fd, "chunk %18p %18p %4d %d/%d\n",
-                    p->page, ((p->bits[0] & 1) ? NULL : f),
-                    p->size, p->free, p->total);
-                if (!fromfreelist) {
-                        if (p->bits[0] & 1)
-                                putleakinfo(NULL, p->size, p->total - p->free);
-                        else {
-                                putleakinfo(f, p->size, 1);
-                                putleakinfo(NULL, p->size,
-                                    p->total - p->free - 1);
-                        }
-                        break;
-                }
-                p = LIST_NEXT(p, entries);
-                if (p != NULL)
-                        dprintf(fd, "        ");
-        }
-}
-
-static void
-dump_free_chunk_info(int fd, struct dir_info *d)
-{
-        int i, j, count;
-        struct chunk_info *p;
-
-        dprintf(fd, "Free chunk structs:\n");
-        for (i = 0; i <= MALLOC_MAXSHIFT; i++) {
-                count = 0;
-                LIST_FOREACH(p, &d->chunk_info_list[i], entries)
-                        count++;
-                for (j = 0; j < MALLOC_CHUNK_LISTS; j++) {
-                        p = LIST_FIRST(&d->chunk_dir[i][j]);
-                        if (p == NULL && count == 0)
-                                continue;
-                        dprintf(fd, "%2d) %3d ", i, count);
-                        if (p != NULL)
-                                dump_chunk(fd, p, NULL, 1);
-                        else
-                                dprintf(fd, "\n");
-                }
-        }
-
-}
-
-static void
-dump_free_page_info(int fd, struct dir_info *d)
-{
-        struct cache *cache;
-        size_t i, total = 0;
-
-        dprintf(fd, "Cached:\n");
-        for (i = 0; i < MAX_CACHEABLE_SIZE; i++) {
-                cache = &d->cache[i];
-                if (cache->length != 0)
-                        dprintf(fd, "%zu(%u): %u = %zu\n", i + 1, cache->max, cache->length, cache->length * (i + 1));
-                total += cache->length * (i + 1);
-        }
-        dprintf(fd, "Free pages cached: %zu\n", total);
-}
-
-static void
-malloc_dump1(int fd, int poolno, struct dir_info *d)
-{
-        size_t i, realsize;
-
-        dprintf(fd, "Malloc dir of %s pool %d at %p\n", __progname, poolno, d);
-        if (d == NULL)
-                return;
-        dprintf(fd, "J=%d Fl=%x\n", d->malloc_junk, d->mmap_flag);
-        dprintf(fd, "Region slots free %zu/%zu\n",
-                d->regions_free, d->regions_total);
-        dprintf(fd, "Finds %zu/%zu\n", d->finds, d->find_collisions);
-        dprintf(fd, "Inserts %zu/%zu\n", d->inserts, d->insert_collisions);
-        dprintf(fd, "Deletes %zu/%zu\n", d->deletes, d->delete_moves);
-        dprintf(fd, "Cheap reallocs %zu/%zu\n",
-            d->cheap_reallocs, d->cheap_realloc_tries);
-        dprintf(fd, "Other pool searches %zu/%zu\n",
-            d->other_pool, d->pool_searches);
-        dprintf(fd, "In use %zu\n", d->malloc_used);
-        dprintf(fd, "Guarded %zu\n", d->malloc_guarded);
-        dump_free_chunk_info(fd, d);
-        dump_free_page_info(fd, d);
-        dprintf(fd,
-            "slot)  hash d  type               page                  f size [free/n]\n");
-        for (i = 0; i < d->regions_total; i++) {
-                if (d->r[i].p != NULL) {
-                        size_t h = hash(d->r[i].p) &
-                            (d->regions_total - 1);
-                        dprintf(fd, "%4zx) #%4zx %zd ",
-                            i, h, h - i);
-                        REALSIZE(realsize, &d->r[i]);
-                        if (realsize > MALLOC_MAXCHUNK) {
-                                putleakinfo(d->r[i].f, realsize, 1);
-                                dprintf(fd,
-                                    "pages %18p %18p %zu\n", d->r[i].p,
-                                    d->r[i].f, realsize);
-                        } else
-                                dump_chunk(fd,
-                                    (struct chunk_info *)d->r[i].size,
-                                    d->r[i].f, 0);
-                }
-        }
-        dump_leaks(fd);
-        dprintf(fd, "\n");
-}
-
-void
-malloc_dump(int fd, int poolno, struct dir_info *pool)
-{
-        int i;
-        void *p;
-        struct region_info *r;
-        int saved_errno = errno;
-
-        if (pool == NULL)
-                return;
-        for (i = 0; i < MALLOC_DELAYED_CHUNK_MASK + 1; i++) {
-                p = pool->delayed_chunks[i];
-                if (p == NULL)
-                        continue;
-                r = find(pool, p);
-                if (r == NULL)
-                        wrterror(pool, "bogus pointer in malloc_dump %p", p);
-                free_bytes(pool, r, p);
-                pool->delayed_chunks[i] = NULL;
-        }
-        /* XXX leak when run multiple times */
-        RBT_INIT(leaktree, &leakhead);
-        malloc_dump1(fd, poolno, pool);
-        errno = saved_errno;
-}
-DEF_WEAK(malloc_dump);
-
-void
-malloc_gdump(int fd)
-{
-        int i;
-        int saved_errno = errno;
-
-        for (i = 0; i < mopts.malloc_mutexes; i++)
-                malloc_dump(fd, i, mopts.malloc_pool[i]);
-
-        errno = saved_errno;
-}
-DEF_WEAK(malloc_gdump);
-
-static void
-malloc_exit(void)
-{
-        int save_errno = errno, fd, i;
-
-        fd = open("malloc.out", O_RDWR|O_APPEND);
-        if (fd != -1) {
-                dprintf(fd, "******** Start dump %s *******\n", __progname);
-                dprintf(fd,
-                    "MT=%d M=%u I=%d F=%d U=%d J=%d R=%d X=%d C=%d cache=%u G=%zu\n",
-                    mopts.malloc_mt, mopts.malloc_mutexes,
-                    mopts.internal_funcs, mopts.malloc_freecheck,
-                    mopts.malloc_freeunmap, mopts.def_malloc_junk,
-                    mopts.malloc_realloc, mopts.malloc_xmalloc,
-                    mopts.chunk_canaries, mopts.def_maxcache,
-                    mopts.malloc_guard);
-
-                for (i = 0; i < mopts.malloc_mutexes; i++)
-                        malloc_dump(fd, i, mopts.malloc_pool[i]);
-                dprintf(fd, "******** End dump %s *******\n", __progname);
-                close(fd);
-        } else
-                dprintf(STDERR_FILENO,
-                    "malloc() warning: Couldn't dump stats\n");
-        errno = save_errno;
-}
-
-#endif /* MALLOC_STATS */
diff --git a/src/lib/libc/stdlib/merge.c b/src/lib/libc/stdlib/merge.c
deleted file mode 100644
index d60317ce08..0000000000
--- a/src/lib/libc/stdlib/merge.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*      $OpenBSD: merge.c,v 1.10 2015/06/21 03:20:56 millert Exp $ */
-/*-
- * Copyright (c) 1992, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Peter McIlroy.
- *
- * 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.
- */
-
-/*
- * Hybrid exponential search/linear search merge sort with hybrid
- * natural/pairwise first pass.  Requires about .3% more comparisons
- * for random data than LSMS with pairwise first pass alone.
- * It works for objects as small as two bytes.
- */
-
-#define NATURAL
-#define THRESHOLD 16    /* Best choice for natural merge cut-off. */
-
-/* #define NATURAL to get hybrid natural merge.
- * (The default is pairwise merging.)
- */
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-static void setup(u_char *, 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 *)
-#define ICOPY_LIST(src, dst, last)                              \
-        do                                                      \
-        *(int*)dst = *(int*)src, src += ISIZE, dst += ISIZE;    \
-        while(src < last)
-#define ICOPY_ELT(src, dst, i)                                  \
-        do                                                      \
-        *(int*) dst = *(int*) src, src += ISIZE, dst += ISIZE;  \
-        while (i -= ISIZE)
-
-#define CCOPY_LIST(src, dst, last)              \
-        do                                      \
-                *dst++ = *src++;                \
-        while (src < last)
-#define CCOPY_ELT(src, dst, i)                  \
-        do                                      \
-                *dst++ = *src++;                \
-        while (i -= 1)
-                
-/*
- * Find the next possible pointer head.  (Trickery for forcing an array
- * to do double duty as a linked list when objects do not align with word
- * boundaries.
- */
-/* Assumption: PSIZE is a power of 2. */
-#define EVAL(p) (u_char **)                                             \
-        ((u_char *)0 +                                                  \
-            (((u_char *)p + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1)))
-
-/*
- * Arguments are as for qsort.
- */
-int
-mergesort(void *base, size_t nmemb, size_t size,
-    int (*cmp)(const void *, const void *))
-{
-        int i, sense;
-        int big, iflag;
-        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. */
-                errno = EINVAL;
-                return (-1);
-        }
-
-        if (nmemb == 0)
-                return (0);
-
-        /*
-         * XXX
-         * Stupid subtraction for the Cray.
-         */
-        iflag = 0;
-        if (!(size % ISIZE) && !(((char *)base - (char *)0) % ISIZE))
-                iflag = 1;
-
-        if ((list2 = malloc(nmemb * size + PSIZE)) == NULL)
-                return (-1);
-
-        list1 = base;
-        setup(list1, list2, nmemb, size, cmp);
-        last = list2 + nmemb * size;
-        i = big = 0;
-        while (*EVAL(list2) != last) {
-            l2 = list1;
-            p1 = EVAL(list1);
-            for (tp2 = p2 = list2; p2 != last; p1 = EVAL(l2)) {
-                p2 = *EVAL(p2);
-                f1 = l2;
-                f2 = l1 = list1 + (p2 - list2);
-                if (p2 != last)
-                        p2 = *EVAL(p2);
-                l2 = list1 + (p2 - list2);
-                while (f1 < l1 && f2 < l2) {
-                        if ((*cmp)(f1, f2) <= 0) {
-                                q = f2;
-                                b = f1, t = l1;
-                                sense = -1;
-                        } else {
-                                q = f1;
-                                b = f2, t = l2;
-                                sense = 0;
-                        }
-                        if (!big) {     /* here i = 0 */
-                                while ((b += size) < t && cmp(q, b) >sense)
-                                        if (++i == 6) {
-                                                big = 1;
-                                                goto EXPONENTIAL;
-                                        }
-                        } else {
-EXPONENTIAL:                    for (i = size; ; i <<= 1)
-                                        if ((p = (b + i)) >= t) {
-                                                if ((p = t - size) > b &&
-                                                    (*cmp)(q, p) <= sense)
-                                                        t = p;
-                                                else
-                                                        b = p;
-                                                break;
-                                        } else if ((*cmp)(q, p) <= sense) {
-                                                t = p;
-                                                if (i == size)
-                                                        big = 0; 
-                                                goto FASTCASE;
-                                        } else
-                                                b = p;
-                                while (t > b+size) {
-                                        i = (((t - b) / size) >> 1) * size;
-                                        if ((*cmp)(q, p = b + i) <= sense)
-                                                t = p;
-                                        else
-                                                b = p;
-                                }
-                                goto COPY;
-FASTCASE:                       while (i > size)
-                                        if ((*cmp)(q,
-                                                p = b + (i >>= 1)) <= sense)
-                                                t = p;
-                                        else
-                                                b = p;
-COPY:                           b = t;
-                        }
-                        i = size;
-                        if (q == f1) {
-                                if (iflag) {
-                                        ICOPY_LIST(f2, tp2, b);
-                                        ICOPY_ELT(f1, tp2, i);
-                                } else {
-                                        CCOPY_LIST(f2, tp2, b);
-                                        CCOPY_ELT(f1, tp2, i);
-                                }
-                        } else {
-                                if (iflag) {
-                                        ICOPY_LIST(f1, tp2, b);
-                                        ICOPY_ELT(f2, tp2, i);
-                                } else {
-                                        CCOPY_LIST(f1, tp2, b);
-                                        CCOPY_ELT(f2, tp2, i);
-                                }
-                        }
-                }
-                if (f2 < l2) {
-                        if (iflag)
-                                ICOPY_LIST(f2, tp2, l2);
-                        else
-                                CCOPY_LIST(f2, tp2, l2);
-                } else if (f1 < l1) {
-                        if (iflag)
-                                ICOPY_LIST(f1, tp2, l1);
-                        else
-                                CCOPY_LIST(f1, tp2, l1);
-                }
-                *p1 = l2;
-            }
-            tp2 = list1;        /* swap list1, list2 */
-            list1 = list2;
-            list2 = tp2;
-            last = list2 + nmemb*size;
-        }
-        if (base == list2) {
-                memmove(list2, list1, nmemb*size);
-                list2 = list1;
-        }
-        free(list2);
-        return (0);
-}
-
-#define swap(a, b) {                                    \
-                s = b;                                  \
-                i = size;                               \
-                do {                                    \
-                        tmp = *a; *a++ = *s; *s++ = tmp; \
-                } while (--i);                          \
-                a -= size;                              \
-        }
-#define reverse(bot, top) {                             \
-        s = top;                                        \
-        do {                                            \
-                i = size;                               \
-                do {                                    \
-                        tmp = *bot; *bot++ = *s; *s++ = tmp; \
-                } while (--i);                          \
-                s -= size2;                             \
-        } while(bot < s);                               \
-}
-
-/*
- * Optional hybrid natural/pairwise first pass.  Eats up list1 in runs of
- * increasing order, list2 in a corresponding linked list.  Checks for runs
- * when THRESHOLD/2 pairs compare with same sense.  (Only used when NATURAL
- * is defined.  Otherwise simple pairwise merging is used.)
- */
-void
-setup(u_char *list1, u_char *list2, size_t n, size_t size,
-    int (*cmp)(const void *, const void *))
-{
-        int i, length, size2, sense;
-        u_char tmp, *f1, *f2, *s, *l2, *last, *p2;
-
-        size2 = size*2;
-        if (n <= 5) {
-                insertionsort(list1, n, size, cmp);
-                *EVAL(list2) = (u_char*) list2 + n*size;
-                return;
-        }
-        /*
-         * Avoid running pointers out of bounds; limit n to evens
-         * for simplicity.
-         */
-        i = 4 + (n & 1);
-        insertionsort(list1 + (n - i) * size, i, size, cmp);
-        last = list1 + size * (n - i);
-        *EVAL(list2 + (last - list1)) = list2 + n * size;
-
-#ifdef NATURAL
-        p2 = list2;
-        f1 = list1;
-        sense = (cmp(f1, f1 + size) > 0);
-        for (; f1 < last; sense = !sense) {
-                length = 2;
-                                        /* Find pairs with same sense. */
-                for (f2 = f1 + size2; f2 < last; f2 += size2) {
-                        if ((cmp(f2, f2+ size) > 0) != sense)
-                                break;
-                        length += 2;
-                }
-                if (length < THRESHOLD) {               /* Pairwise merge */
-                        do {
-                                p2 = *EVAL(p2) = f1 + size2 - list1 + list2;
-                                if (sense > 0)
-                                        swap (f1, f1 + size);
-                        } while ((f1 += size2) < f2);
-                } else {                                /* Natural merge */
-                        l2 = f2;
-                        for (f2 = f1 + size2; f2 < l2; f2 += size2) {
-                                if ((cmp(f2-size, f2) > 0) != sense) {
-                                        p2 = *EVAL(p2) = f2 - list1 + list2;
-                                        if (sense > 0)
-                                                reverse(f1, f2-size);
-                                        f1 = f2;
-                                }
-                        }
-                        if (sense > 0)
-                                reverse (f1, f2-size);
-                        f1 = f2;
-                        if (f2 < last || cmp(f2 - size, f2) > 0)
-                                p2 = *EVAL(p2) = f2 - list1 + list2;
-                        else
-                                p2 = *EVAL(p2) = list2 + n*size;
-                }
-        }
-#else           /* pairwise merge only. */
-        for (f1 = list1, p2 = list2; f1 < last; f1 += size2) {
-                p2 = *EVAL(p2) = p2 + size2;
-                if (cmp (f1, f1 + size) > 0)
-                        swap(f1, f1 + size);
-        }
-#endif /* NATURAL */
-}
-
-/*
- * This is to avoid out-of-bounds addresses in sorting the
- * last 4 elements.
- */
-static void
-insertionsort(u_char *a, size_t n, size_t size,
-    int (*cmp)(const void *, const void *))
-{
-        u_char *ai, *s, *t, *u, tmp;
-        int i;
-
-        for (ai = a+size; --n >= 1; ai += size)
-                for (t = ai; t > a; t -= size) {
-                        u = t - size;
-                        if (cmp(u, t) <= 0)
-                                break;
-                        swap(u, t);
-                }
-}
diff --git a/src/lib/libc/stdlib/mrand48.c b/src/lib/libc/stdlib/mrand48.c
deleted file mode 100644
index 3334e2ad2b..0000000000
--- a/src/lib/libc/stdlib/mrand48.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*      $OpenBSD: mrand48.c,v 1.6 2015/08/27 04:33:31 guenther Exp $ */
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.
- */
-
-#include "rand48.h"
-
-long
-mrand48(void)
-{
-        if (__rand48_deterministic == 0)
-                return (int)arc4random();
-        __dorand48(__rand48_seed);
-        return ((long) __rand48_seed[2] << 16) + (long) __rand48_seed[1];
-}
diff --git a/src/lib/libc/stdlib/nrand48.c b/src/lib/libc/stdlib/nrand48.c
deleted file mode 100644
index f1f548c3af..0000000000
--- a/src/lib/libc/stdlib/nrand48.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*      $OpenBSD: nrand48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.
- */
-
-#include "rand48.h"
-
-long
-nrand48(unsigned short xseed[3])
-{
-        __dorand48(xseed);
-        return ((long) xseed[2] << 15) + ((long) xseed[1] >> 1);
-}
diff --git a/src/lib/libc/stdlib/posix_memalign.3 b/src/lib/libc/stdlib/posix_memalign.3
deleted file mode 100644
index fcd0a4cbdb..0000000000
--- a/src/lib/libc/stdlib/posix_memalign.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"     $OpenBSD: posix_memalign.3,v 1.4 2017/05/13 07:11:29 otto Exp $
-.\" Copyright (C) 2006 Jason Evans <jasone@FreeBSD.org>.
-.\" 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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
-.\"
-.\" $FreeBSD: src/lib/libc/stdlib/posix_memalign.3,v 1.3 2007/03/28 04:32:51 jasone Exp $
-.\"
-.Dd $Mdocdate: May 13 2017 $
-.Dt POSIX_MEMALIGN 3
-.Os
-.Sh NAME
-.Nm posix_memalign
-.Nd aligned memory allocation
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn posix_memalign "void **ptr" "size_t alignment" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn posix_memalign
-function allocates
-.Fa size
-bytes of memory such that the allocation's base address is a multiple of
-.Fa alignment ,
-and returns the allocation in the value pointed to by
-.Fa ptr .
-.Pp
-The requested
-.Fa alignment
-must be a power of 2 at least as large as
-.Fn sizeof "void *" .
-.Pp
-Memory that is allocated via
-.Fn posix_memalign
-can be used as an argument in subsequent calls to
-.Xr realloc 3 ,
-.Xr reallocarray 3
-and
-.Xr free 3 ,
-but not
-.Xr recallocarray 3
-and
-.Xr freezero 3 .
-.Sh RETURN VALUES
-The
-.Fn posix_memalign
-function returns the value 0 if successful; otherwise it returns an error value.
-.Sh ERRORS
-The
-.Fn posix_memalign
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa alignment
-parameter is not a power of 2 at least as large as
-.Fn sizeof "void *" .
-.It Bq Er ENOMEM
-Memory allocation error.
-.El
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr realloc 3
-.Sh STANDARDS
-The
-.Fn posix_memalign
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_memalign
-function first appeared in
-.Ox 4.8 .
diff --git a/src/lib/libc/stdlib/posix_openpt.3 b/src/lib/libc/stdlib/posix_openpt.3
deleted file mode 100644
index b55e1be750..0000000000
--- a/src/lib/libc/stdlib/posix_openpt.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"     $OpenBSD: posix_openpt.3,v 1.4 2019/01/25 00:19:25 millert Exp $
-.\"
-.\" Copyright (c) 2012 Todd C. Miller <millert@openbsd.org>
-.\"
-.\" 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 $Mdocdate: January 25 2019 $
-.Dt POSIX_OPENPT 3
-.Os
-.Sh NAME
-.Nm posix_openpt
-.Nd open a pseudo-terminal device
-.Sh SYNOPSIS
-.In stdlib.h
-.In fcntl.h
-.Ft int
-.Fn posix_openpt "int oflag"
-.Sh DESCRIPTION
-The
-.Fn posix_openpt
-function finds the next available pseudo-terminal and returns an open
-file descriptor for its master device.
-The path name of the slave device may be determined via the
-.Fn ptsname
-function.
-Note that the
-.Fn unlockpt
-and
-.Fn grantpt
-functions should be called before opening the slave device.
-.Pp
-The
-.Ar oflag
-argument is formed by bitwise-inclusive
-.Tn OR Ns 'ing
-the following values defined in
-.In fcntl.h :
-.Bl -tag -width O_NOCTTY -offset indent
-.It Dv O_RDWR
-Open for reading and writing.
-.It Dv O_NOCTTY
-Prevent the device from being made the controlling terminal for the session.
-This flag has no effect on
-.Ox
-and is included for compatibility with other systems.
-.El
-.Pp
-The
-.Dv O_RDWR
-flag must be specified in
-.Fa oflag .
-If
-.Fa oflag
-contains values other than those listed above,
-.Fn posix_openpt
-will return an error.
-.Sh RETURN VALUES
-If successful,
-.Fn posix_openpt
-returns a non-negative integer, the file descriptor for the
-pseudo-terminal master device.
-Otherwise, a value of \-1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn posix_openpt
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EMFILE
-The per-process descriptor table is full.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er EINVAL
-The value of
-.Fa oflag
-is not valid.
-.El
-.Sh SEE ALSO
-.Xr ptsname 3 ,
-.Xr pty 4 ,
-.Xr tty 4
-.Sh STANDARDS
-The
-.Fn posix_openpt
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_openpt
-function appeared in
-.Ox 5.3 .
diff --git a/src/lib/libc/stdlib/posix_pty.c b/src/lib/libc/stdlib/posix_pty.c
deleted file mode 100644
index e45ab6ebd0..0000000000
--- a/src/lib/libc/stdlib/posix_pty.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*      $OpenBSD: posix_pty.c,v 1.3 2019/01/25 00:19:25 millert Exp $   */
-
-/*
- * Copyright (c) 2012 Todd C. Miller <millert@openbsd.org>
- *
- * 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 <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/tty.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-int
-posix_openpt(int oflag)
-{
-        struct ptmget ptm;
-        int fd, mfd = -1;
-
-        /* User must specify O_RDWR in oflag. */
-        if ((oflag & O_ACCMODE) != O_RDWR ||
-            (oflag & ~(O_ACCMODE | O_NOCTTY)) != 0) {
-                errno = EINVAL;
-                return -1;
-        }
-
-        /* Get pty master and slave (this API only uses the master). */
-        fd = open(PATH_PTMDEV, O_RDWR);
-        if (fd != -1) {
-                if (ioctl(fd, PTMGET, &ptm) != -1) {
-                        close(ptm.sfd);
-                        mfd = ptm.cfd;
-                }
-                close(fd);
-        }
-
-        return mfd;
-}
-
-/*
- * Look up the name of the specified pty master fd.
- * Note that the name returned does *not* include the /dev/ prefix.
- * Returns the name on success and NULL on error, setting errno.
- */
-static const char *
-ptmname(int mfd)
-{
-        struct stat sb;
-        const char *name;
-
-        /* Make sure it is a pty master. */
-        if (fstat(mfd, &sb) != 0)
-                return NULL;
-        if (!S_ISCHR(sb.st_mode)) {
-                errno = EINVAL;
-                return NULL;
-        }
-        name = devname(sb.st_rdev, S_IFCHR);
-        if (strncmp(name, "pty", 3) != 0) {
-                errno = EINVAL;
-                return NULL;
-        }
-        return name;
-}
-
-/*
- * The PTMGET ioctl handles the mode and owner for us.
- */
-int
-grantpt(int mfd)
-{
-        return ptmname(mfd) ? 0 : -1;
-}
-
-/*
- * The PTMGET ioctl unlocks the pty master and slave for us.
- */
-int
-unlockpt(int mfd)
-{
-        return ptmname(mfd) ? 0 : -1;
-}
-
-/*
- * Look up the path of the slave pty that corresponds to the master fd.
- * Returns the path if successful or NULL on error.
- */
-char *
-ptsname(int mfd)
-{
-        const char *master;
-        static char slave[sizeof(((struct ptmget *)NULL)->sn)];
-
-        if ((master = ptmname(mfd)) == NULL)
-                return NULL;
-
-        /* Add /dev/ prefix and convert "pty" to "tty". */
-        strlcpy(slave, _PATH_DEV, sizeof(slave));
-        strlcat(slave, master, sizeof(slave));
-        slave[sizeof(_PATH_DEV) - 1] = 't';
-
-        return slave;
-}
diff --git a/src/lib/libc/stdlib/ptsname.3 b/src/lib/libc/stdlib/ptsname.3
deleted file mode 100644
index 98705528f5..0000000000
--- a/src/lib/libc/stdlib/ptsname.3
+++ /dev/null
@@ -1,160 +0,0 @@
-.\"     $OpenBSD: ptsname.3,v 1.2 2012/12/04 18:42:16 millert Exp $
-.\"
-.\" Copyright (c) 2002 The FreeBSD Project, Inc.
-.\" All rights reserved.
-.\"
-.\" This software includes code contributed to the FreeBSD Project
-.\" by Ryan Younce of North Carolina State University.
-.\"
-.\" 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 FreeBSD Project 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 FREEBSD PROJECT 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 FREEBSD PROJECT
-.\" OR ITS 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.
-.\"
-.\" $FreeBSD: head/lib/libc/stdlib/ptsname.3 240412 2012-09-12 17:54:09Z emaste $
-.\"
-.Dd $Mdocdate: December 4 2012 $
-.Dt PTSNAME 3
-.Os
-.Sh NAME
-.Nm grantpt ,
-.Nm ptsname ,
-.Nm unlockpt
-.Nd pseudo-terminal access functions
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn grantpt "int fildes"
-.Ft "char *"
-.Fn ptsname "int fildes"
-.Ft int
-.Fn unlockpt "int fildes"
-.Sh DESCRIPTION
-The
-.Fn grantpt ,
-.Fn ptsname ,
-and
-.Fn unlockpt
-functions allow access to pseudo-terminal devices.
-These three functions accept a file descriptor that references the
-master half of a pseudo-terminal pair.
-This file descriptor is created with
-.Xr posix_openpt 3 .
-.Pp
-The
-.Fn grantpt
-function is used to establish ownership and permissions
-of the slave device counterpart to the master device
-specified with
-.Fa fildes .
-The slave device's ownership is set to the real user ID
-of the calling process, and the permissions are set to
-user readable-writable and group writable.
-The group owner of the slave device is also set to the
-group
-.Dq Li tty .
-.Pp
-The
-.Fn ptsname
-function returns the full path name of the slave device
-counterpart to the master device specified with
-.Fa fildes .
-This value can be used
-to subsequently open the appropriate slave after
-.Xr posix_openpt 3
-and
-.Fn grantpt
-have been called.
-.Pp
-The
-.Fn unlockpt
-function clears the lock held on the pseudo-terminal pair
-for the master device specified with
-.Fa fildes .
-.Sh RETURN VALUES
-.Rv -std grantpt unlockpt
-.Pp
-The
-.Fn ptsname
-function returns a pointer to the name
-of the slave device on success; otherwise a
-.Dv NULL
-pointer is returned.
-.Sh ERRORS
-The
-.Fn grantpt ,
-.Fn ptsname
-and
-.Fn unlockpt
-functions may fail and set
-.Va errno
-to:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa fildes
-is not a valid open file descriptor.
-.It Bq Er EINVAL
-.Fa fildes
-is not a master pseudo-terminal device.
-.El
-.Pp
-In addition, the
-.Fn grantpt
-function may set
-.Va errno
-to:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The slave pseudo-terminal device could not be accessed.
-.El
-.Sh SEE ALSO
-.Xr posix_openpt 3 ,
-.Xr pty 4 ,
-.Xr tty 4
-.Sh STANDARDS
-The
-.Fn ptsname
-function conforms to
-.St -p1003.1-2008 .
-.Pp
-This implementation of
-.Fn grantpt
-and
-.Fn unlockpt
-does not conform to
-.St -p1003.1-2008 ,
-because it depends on
-.Xr posix_openpt 3
-to create the pseudo-terminal device with proper permissions in place.
-It only validates whether
-.Fa fildes
-is a valid pseudo-terminal master device.
-Future revisions of the specification will likely allow this behaviour,
-as stated by the Austin Group.
-.Sh HISTORY
-The
-.Fn grantpt ,
-.Fn ptsname
-and
-.Fn unlockpt
-functions appeared in
-.Ox 5.3 .
diff --git a/src/lib/libc/stdlib/qsort.3 b/src/lib/libc/stdlib/qsort.3
deleted file mode 100644
index 4c0cddaccb..0000000000
--- a/src/lib/libc/stdlib/qsort.3
+++ /dev/null
@@ -1,276 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"     The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" 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: qsort.3,v 1.27 2020/02/08 01:09:57 jsg Exp $
-.\"
-.Dd $Mdocdate: February 8 2020 $
-.Dt QSORT 3
-.Os
-.Sh NAME
-.Nm qsort ,
-.Nm heapsort ,
-.Nm mergesort
-.Nd sort functions
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn qsort "void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
-.Ft int
-.Fn heapsort "void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
-.Ft int
-.Fn mergesort "void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
-.Sh DESCRIPTION
-The
-.Fn qsort
-function is a modified partition-exchange sort, or quicksort.
-The
-.Fn heapsort
-function is a modified selection sort.
-The
-.Fn mergesort
-function is a modified merge sort with exponential search
-intended for sorting data with pre-existing order.
-.Pp
-The
-.Fn qsort
-and
-.Fn heapsort
-functions sort an array of
-.Fa nmemb
-objects, the initial member of which is pointed to by
-.Fa base .
-The size of each object is specified by
-.Fa size .
-.Fn mergesort
-behaves similarly, but
-.Em requires
-that
-.Fa size
-be greater than
-.Dq "sizeof(void *) / 2" .
-.Pp
-The contents of the array
-.Fa base
-are sorted in ascending order according to
-a comparison function pointed to by
-.Fa compar ,
-which requires two arguments pointing to the objects being
-compared.
-.Pp
-The comparison function must return an int less than, equal to, or
-greater than zero if the first argument is considered to be respectively
-less than, equal to, or greater than the second.
-.Pp
-The functions
-.Fn qsort
-and
-.Fn heapsort
-are
-.Em not
-stable, that is, if two members compare as equal, their order in
-the sorted array is undefined.
-The function
-.Fn mergesort
-is stable.
-.Pp
-The
-.Fn qsort
-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
-takes O N lg N average time.
-This implementation uses median selection to avoid its
-O N**2 worst-case behavior and will fall back to
-.Fn heapsort
-if the recursion depth exceeds 2 lg N.
-.Pp
-The
-.Fn heapsort
-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
-takes O N lg N worst-case time.
-This implementation of
-.Fn heapsort
-is implemented without recursive function calls.
-.Pp
-The function
-.Fn mergesort
-requires additional memory of size
-.Fa nmemb *
-.Fa size
-bytes; it should be used only when space is not at a premium.
-.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 ,
-which is faster than
-.Fn heapsort .
-Memory availability and pre-existing order in the data can make this untrue.
-.Sh RETURN VALUES
-.Rv -std heapsort mergesort
-.Sh EXAMPLES
-.Bd -literal
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *array[] = { "XX", "YYY", "Z" };
-#define N (sizeof(array) / sizeof(array[0]))
-
-int
-cmp(const void *a, const void *b)
-{
-        /*
-         * a and b point to elements of the array.
-         * Cast and dereference to obtain the actual elements,
-         * which are also pointers in this case.
-         */
-        size_t lena = strlen(*(const char **)a);
-        size_t lenb = strlen(*(const char **)b);
-        /*
-         * Do not subtract the lengths. The difference between values
-         * cannot be represented by an int.
-         */
-        return lena < lenb ? -1 : lena > lenb;
-}
-
-int
-main()
-{
-        size_t i;
-
-        qsort(array, N, sizeof(array[0]), cmp);
-        for (i =  0; i < N; i++)
-                printf("%s\en", array[i]);
-}
-.Ed
-.Pp
-It is almost always an error to use subtraction to compute the return value
-of the comparison function.
-.Sh ERRORS
-The
-.Fn heapsort
-and
-.Fn mergesort
-functions succeed unless:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa size
-argument is zero, or the
-.Fa size
-argument to
-.Fn mergesort
-is less than
-.Dq "sizeof(void *) / 2" .
-.It Bq Er ENOMEM
-.Fn heapsort
-or
-.Fn mergesort
-were unable to allocate memory.
-.El
-.Sh SEE ALSO
-.Xr sort 1 ,
-.Xr radixsort 3
-.Rs
-.%A Hoare, C.A.R.
-.%D 1962
-.%T "Quicksort"
-.%J "The Computer Journal"
-.%V 5:1
-.%P pp. 10-15
-.Re
-.Rs
-.%A Williams, J.W.J
-.%D 1964
-.%T "Heapsort"
-.%J "Communications of the ACM"
-.%V 7:1
-.%P pp. 347\-348
-.Re
-.Rs
-.%A Knuth, D.E.
-.%D 1968
-.%B "The Art of Computer Programming"
-.%V Vol. 3
-.%T "Sorting and Searching"
-.%P pp. 114\-123, 145\-149
-.Re
-.Rs
-.%A McIlroy, P.M.
-.%T "Optimistic Sorting and Information Theoretic Complexity"
-.%J "Fourth Annual ACM-SIAM Symposium on Discrete Algorithms"
-.%P pp. 467\-464
-.%D January 1993
-.Re
-.Rs
-.%A Bentley, J.L.
-.%A McIlroy, M.D.
-.%T "Engineering a Sort Function"
-.%J "Software \- Practice and Experience"
-.%V Vol. 23(11)
-.%P pp. 1249\-1265
-.%D November 1993
-.Re
-.Rs
-.%A Musser, D.
-.%T "Introspective Sorting and Selection Algorithms"
-.%J "Software \- Practice and Experience"
-.%V Vol. 27(8)
-.%P pp. 983\-993
-.%D August 1997
-.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 conforms to
-.St -ansiC .
-.Sh HISTORY
-A
-.Fn qsort
-function first appeared in
-.At v2 .
diff --git a/src/lib/libc/stdlib/qsort.c b/src/lib/libc/stdlib/qsort.c
deleted file mode 100644
index ca73e67f29..0000000000
--- a/src/lib/libc/stdlib/qsort.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*      $OpenBSD: qsort.c,v 1.18 2017/05/30 14:54:09 millert Exp $ */
-/*-
- * Copyright (c) 1992, 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 <sys/types.h>
-#include <stdlib.h>
-
-static __inline char    *med3(char *, char *, char *, int (*)(const void *, const void *));
-static __inline void     swapfunc(char *, char *, size_t, int);
-
-#define min(a, b)       (a) < (b) ? a : b
-
-/*
- * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
- *
- * This version differs from Bentley & McIlroy in the following ways:
- *   1. The partition value is swapped into a[0] instead of being
- *      stored out of line.
- *
- *   2. The swap function can swap 32-bit aligned elements on 64-bit
- *      platforms instead of swapping them as byte-aligned.
- *
- *   3. It uses David Musser's introsort algorithm to fall back to
- *      heapsort(3) when the recursion depth reaches 2*lg(n + 1).
- *      This avoids quicksort's quadratic behavior for pathological
- *      input without appreciably changing the average run time.
- *
- *   4. Tail recursion is eliminated when sorting the larger of two
- *      subpartitions to save stack space.
- */
-#define SWAPTYPE_BYTEV  1
-#define SWAPTYPE_INTV   2
-#define SWAPTYPE_LONGV  3
-#define SWAPTYPE_INT    4
-#define SWAPTYPE_LONG   5
-
-#define TYPE_ALIGNED(TYPE, a, es)                       \
-        (((char *)a - (char *)0) % sizeof(TYPE) == 0 && es % sizeof(TYPE) == 0)
-
-#define swapcode(TYPE, parmi, parmj, n) {               \
-        size_t i = (n) / sizeof (TYPE);                 \
-        TYPE *pi = (TYPE *) (parmi);                    \
-        TYPE *pj = (TYPE *) (parmj);                    \
-        do {                                            \
-                TYPE    t = *pi;                        \
-                *pi++ = *pj;                            \
-                *pj++ = t;                              \
-        } while (--i > 0);                              \
-}
-
-static __inline void
-swapfunc(char *a, char *b, size_t n, int swaptype)
-{
-        switch (swaptype) {
-        case SWAPTYPE_INT:
-        case SWAPTYPE_INTV:
-                swapcode(int, a, b, n);
-                break;
-        case SWAPTYPE_LONG:
-        case SWAPTYPE_LONGV:
-                swapcode(long, a, b, n);
-                break;
-        default:
-                swapcode(char, a, b, n);
-                break;
-        }
-}
-
-#define swap(a, b)      do {                            \
-        switch (swaptype) {                             \
-        case SWAPTYPE_INT: {                            \
-                int t = *(int *)(a);                    \
-                *(int *)(a) = *(int *)(b);              \
-                *(int *)(b) = t;                        \
-                break;                                  \
-            }                                           \
-        case SWAPTYPE_LONG: {                           \
-                long t = *(long *)(a);                  \
-                *(long *)(a) = *(long *)(b);            \
-                *(long *)(b) = t;                       \
-                break;                                  \
-            }                                           \
-        default:                                        \
-                swapfunc(a, b, es, swaptype);           \
-        }                                               \
-} while (0)
-
-#define vecswap(a, b, n)        if ((n) > 0) swapfunc(a, b, n, swaptype)
-
-static __inline char *
-med3(char *a, char *b, char *c, int (*cmp)(const void *, const void *))
-{
-        return cmp(a, b) < 0 ?
-               (cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a ))
-              :(cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c ));
-}
-
-static void
-introsort(char *a, size_t n, size_t es, size_t maxdepth, int swaptype,
-    int (*cmp)(const void *, const void *))
-{
-        char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
-        int cmp_result;
-        size_t r, s;
-
-loop:   if (n < 7) {
-                for (pm = a + es; pm < a + n * es; pm += es)
-                        for (pl = pm; pl > a && cmp(pl - es, pl) > 0;
-                             pl -= es)
-                                swap(pl, pl - es);
-                return;
-        }
-        if (maxdepth == 0) {
-                if (heapsort(a, n, es, cmp) == 0)
-                        return;
-        }
-        maxdepth--;
-        pm = a + (n / 2) * es;
-        if (n > 7) {
-                pl = a;
-                pn = a + (n - 1) * es;
-                if (n > 40) {
-                        s = (n / 8) * es;
-                        pl = med3(pl, pl + s, pl + 2 * s, cmp);
-                        pm = med3(pm - s, pm, pm + s, cmp);
-                        pn = med3(pn - 2 * s, pn - s, pn, cmp);
-                }
-                pm = med3(pl, pm, pn, cmp);
-        }
-        swap(a, pm);
-        pa = pb = a + es;
-        pc = pd = a + (n - 1) * es;
-        for (;;) {
-                while (pb <= pc && (cmp_result = cmp(pb, a)) <= 0) {
-                        if (cmp_result == 0) {
-                                swap(pa, pb);
-                                pa += es;
-                        }
-                        pb += es;
-                }
-                while (pb <= pc && (cmp_result = cmp(pc, a)) >= 0) {
-                        if (cmp_result == 0) {
-                                swap(pc, pd);
-                                pd -= es;
-                        }
-                        pc -= es;
-                }
-                if (pb > pc)
-                        break;
-                swap(pb, pc);
-                pb += es;
-                pc -= es;
-        }
-
-        pn = a + n * es;
-        r = min(pa - a, pb - pa);
-        vecswap(a, pb - r, r);
-        r = min(pd - pc, pn - pd - es);
-        vecswap(pb, pn - r, r);
-        /*
-         * To save stack space we sort the smaller side of the partition first
-         * using recursion and eliminate tail recursion for the larger side.
-         */
-        r = pb - pa;
-        s = pd - pc;
-        if (r < s) {
-                /* Recurse for 1st side, iterate for 2nd side. */
-                if (s > es) {
-                        if (r > es) {
-                                introsort(a, r / es, es, maxdepth,
-                                    swaptype, cmp);
-                        }
-                        a = pn - s;
-                        n = s / es;
-                        goto loop;
-                }
-        } else {
-                /* Recurse for 2nd side, iterate for 1st side. */
-                if (r > es) {
-                        if (s > es) {
-                                introsort(pn - s, s / es, es, maxdepth,
-                                    swaptype, cmp);
-                        }
-                        n = r / es;
-                        goto loop;
-                }
-        }
-}
-
-void
-qsort(void *a, size_t n, size_t es, int (*cmp)(const void *, const void *))
-{
-        size_t i, maxdepth = 0;
-        int swaptype;
-
-        /* Approximate 2*ceil(lg(n + 1)) */
-        for (i = n; i > 0; i >>= 1)
-                maxdepth++;
-        maxdepth *= 2;
-
-        if (TYPE_ALIGNED(long, a, es))
-                swaptype = es == sizeof(long) ? SWAPTYPE_LONG : SWAPTYPE_LONGV;
-        else if (sizeof(int) != sizeof(long) && TYPE_ALIGNED(int, a, es))
-                swaptype = es == sizeof(int) ? SWAPTYPE_INT : SWAPTYPE_INTV;
-        else
-                swaptype = SWAPTYPE_BYTEV;
-
-        introsort(a, n, es, maxdepth, swaptype, cmp);
-
-}
-
-DEF_STRONG(qsort);
diff --git a/src/lib/libc/stdlib/radixsort.3 b/src/lib/libc/stdlib/radixsort.3
deleted file mode 100644
index e706b798b7..0000000000
--- a/src/lib/libc/stdlib/radixsort.3
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" 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.
-.\"
-.\"     $OpenBSD: radixsort.3,v 1.13 2015/01/29 01:46:31 schwarze Exp $
-.\"
-.Dd $Mdocdate: January 29 2015 $
-.Dt RADIXSORT 3
-.Os
-.Sh NAME
-.Nm radixsort ,
-.Nm sradixsort
-.Nd radix sort
-.Sh SYNOPSIS
-.In limits.h
-.In stdlib.h
-.Ft int
-.Fn radixsort "const u_char **base" "int nmemb" "const u_char *table" "u_int endbyte"
-.Ft int
-.Fn sradixsort "const u_char **base" "int nmemb" "const u_char *table" "u_int endbyte"
-.Sh DESCRIPTION
-The
-.Fn radixsort
-and
-.Fn sradixsort
-functions are implementations of radix sort.
-.Pp
-These functions sort an array of
-.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
-.Fa endbyte .
-.Pp
-Applications may specify a sort order by providing the
-.Fa table
-argument.
-If non-null,
-.Fa table
-must reference an array of
-.Dv UCHAR_MAX
-+ 1 bytes which contains the sort 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 is useful for applications which wish to sort different characters
-equally; for example, providing a table with the same weights
-for A\-Z as for a\-z will result in a case-insensitive sort.
-If
-.Fa table
-is
-.Dv NULL ,
-the contents of the array are sorted in ascending order according to the
-ASCII order of the byte strings they reference and
-.Fa endbyte
-has a sorting weight of 0.
-.Pp
-The
-.Fn sradixsort
-function is stable; that is, if two elements compare as equal, their
-order in the sorted array is unchanged.
-The
-.Fn sradixsort
-function uses additional memory sufficient to hold
-.Fa nmemb
-pointers.
-.Pp
-The
-.Fn radixsort
-function is not stable, but uses no additional memory.
-.Pp
-These functions are variants of most-significant-byte radix sorting; in
-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
-.Rv -std
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa endbyte
-element of
-.Fa table
-is not 0 or 255.
-.El
-.Pp
-Additionally, the
-.Fn sradixsort
-function 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
-.Rs
-.%A Knuth, D.E.
-.%D 1968
-.%B "The Art of Computer Programming"
-.%T "Sorting and Searching"
-.%V Vol. 3
-.%P pp. 170-178
-.Re
-.Rs
-.%A Paige, R.
-.%D 1987
-.%T "Three Partition Refinement Algorithms"
-.%J "SIAM J. Comput."
-.%V Vol. 16
-.%N No. 6
-.Re
-.Rs
-.%A McIlroy, P.
-.%D 1993
-.%B "Engineering Radix Sort"
-.%T "Computing Systems"
-.%V Vol. 6:1
-.%P pp. 5-27
-.Re
-.Sh HISTORY
-The
-.Fn radixsort
-function first appeared in
-.Bx 4.4 .
diff --git a/src/lib/libc/stdlib/radixsort.c b/src/lib/libc/stdlib/radixsort.c
deleted file mode 100644
index 49d03b52d5..0000000000
--- a/src/lib/libc/stdlib/radixsort.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/*      $OpenBSD: radixsort.c,v 1.9 2007/09/02 15:19:17 deraadt Exp $ */
-/*-
- * Copyright (c) 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Peter McIlroy and by Dan Bernstein at New York University, 
- *
- * 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.
- */
-
-/*
- * Radixsort routines.
- * 
- * Program r_sort_a() is unstable but uses O(logN) extra memory for a stack.
- * Use radixsort(a, n, trace, endchar) for this case.
- * 
- * For stable sorting (using N extra pointers) use sradixsort(), which calls
- * r_sort_b().
- * 
- * For a description of this code, see D. McIlroy, P. McIlroy, K. Bostic,
- * "Engineering Radix Sort".
- */
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <errno.h>
-
-typedef struct {
-        const u_char **sa;
-        int sn, si;
-} stack;
-
-static __inline void simplesort
-(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(const u_char **,
-            const u_char **, int, int, const u_char *, u_int);
-
-#define THRESHOLD       20              /* Divert to simplesort(). */
-#define SIZE            512             /* Default stack size. */
-
-#define SETUP {                                                         \
-        if (tab == NULL) {                                              \
-                tr = tr0;                                               \
-                for (c = 0; c < endch; c++)                             \
-                        tr0[c] = c + 1;                                 \
-                tr0[c] = 0;                                             \
-                for (c++; c < 256; c++)                                 \
-                        tr0[c] = c;                                     \
-                endch = 0;                                              \
-        } else {                                                        \
-                endch = tab[endch];                                     \
-                tr = tab;                                               \
-                if (endch != 0 && endch != 255) {                       \
-                        errno = EINVAL;                                 \
-                        return (-1);                                    \
-                }                                                       \
-        }                                                               \
-}
-
-int
-radixsort(const u_char **a, int n, const u_char *tab, u_int endch)
-{
-        const u_char *tr;
-        int c;
-        u_char tr0[256];
-
-        SETUP;
-        r_sort_a(a, n, 0, tr, endch);
-        return (0);
-}
-
-int
-sradixsort(const u_char **a, int n, const u_char *tab, u_int endch)
-{
-        const u_char *tr, **ta;
-        int c;
-        u_char tr0[256];
-
-        SETUP;
-        if (n < THRESHOLD)
-                simplesort(a, n, 0, tr, endch);
-        else {
-                if ((ta = calloc(n, sizeof(a))) == NULL)
-                        return (-1);
-                r_sort_b(a, ta, n, 0, tr, endch);
-                free(ta);
-        }
-        return (0);
-}
-
-#define empty(s)        (s >= sp)
-#define pop(a, n, i)    a = (--sp)->sa, n = sp->sn, i = sp->si
-#define push(a, n, i)   sp->sa = a, sp->sn = n, (sp++)->si = i
-#define swap(a, b, t)   t = a, a = b, b = t
-
-/* Unstable, in-place sort. */
-void
-r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
-{
-        static int count[256], nc, bmin;
-        int c;
-        const u_char **ak, *r;
-        stack s[SIZE], *sp, *sp0, *sp1, temp;
-        int *cp, bigc;
-        const u_char **an, *t, **aj, **top[256];
-
-        /* Set up stack. */
-        sp = s;
-        push(a, n, i);
-        while (!empty(s)) {
-                pop(a, n, i);
-                if (n < THRESHOLD) {
-                        simplesort(a, n, i, tr, endch);
-                        continue;
-                }
-                an = a + n;
-
-                /* Make character histogram. */
-                if (nc == 0) {
-                        bmin = 255;     /* First occupied bin, excluding eos. */
-                        for (ak = a; ak < an;) {
-                                c = tr[(*ak++)[i]];
-                                if (++count[c] == 1 && c != endch) {
-                                        if (c < bmin)
-                                                bmin = c;
-                                        nc++;
-                                }
-                        }
-                        if (sp + nc > s + SIZE) {       /* Get more stack. */
-                                r_sort_a(a, n, i, tr, endch);
-                                continue;
-                        }
-                }
-
-                /*
-                 * Set top[]; push incompletely sorted bins onto stack.
-                 * top[] = pointers to last out-of-place element in bins.
-                 * count[] = counts of elements in bins.
-                 * Before permuting: top[c-1] + count[c] = top[c];
-                 * during deal: top[c] counts down to top[c-1].
-                 */
-                sp0 = sp1 = sp;         /* Stack position of biggest bin. */
-                bigc = 2;               /* Size of biggest bin. */
-                if (endch == 0)         /* Special case: set top[eos]. */
-                        top[0] = ak = a + count[0];
-                else {
-                        ak = a;
-                        top[255] = an;
-                }
-                for (cp = count + bmin; nc > 0; cp++) {
-                        while (*cp == 0)        /* Find next non-empty pile. */
-                                cp++;
-                        if (*cp > 1) {
-                                if (*cp > bigc) {
-                                        bigc = *cp;
-                                        sp1 = sp;
-                                }
-                                push(ak, *cp, i+1);
-                        }
-                        top[cp-count] = ak += *cp;
-                        nc--;
-                }
-                swap(*sp0, *sp1, temp); /* Play it safe -- biggest bin last. */
-
-                /*
-                 * Permute misplacements home.  Already home: everything
-                 * before aj, and in bin[c], items from top[c] on.
-                 * Inner loop:
-                 *      r = next element to put in place;
-                 *      ak = top[r[i]] = location to put the next element.
-                 *      aj = bottom of 1st disordered bin.
-                 * Outer loop:
-                 *      Once the 1st disordered bin is done, ie. aj >= ak,
-                 *      aj<-aj + count[c] connects the bins in a linked list;
-                 *      reset count[c].
-                 */
-                for (aj = a; aj < an;  *aj = r, aj += count[c], count[c] = 0)
-                        for (r = *aj;  aj < (ak = --top[c = tr[r[i]]]);)
-                                swap(*ak, r, t);
-        }
-}
-
-/* Stable sort, requiring additional memory. */
-void
-r_sort_b(const u_char **a, const u_char **ta, int n, int i, const u_char *tr,
-    u_int endch)
-{
-        static int count[256], nc, bmin;
-        int c;
-        const u_char **ak, **ai;
-        stack s[512], *sp, *sp0, *sp1, temp;
-        const u_char **top[256];
-        int *cp, bigc;
-
-        sp = s;
-        push(a, n, i);
-        while (!empty(s)) {
-                pop(a, n, i);
-                if (n < THRESHOLD) {
-                        simplesort(a, n, i, tr, endch);
-                        continue;
-                }
-
-                if (nc == 0) {
-                        bmin = 255;
-                        for (ak = a + n; --ak >= a;) {
-                                c = tr[(*ak)[i]];
-                                if (++count[c] == 1 && c != endch) {
-                                        if (c < bmin)
-                                                bmin = c;
-                                        nc++;
-                                }
-                        }
-                        if (sp + nc > s + SIZE) {
-                                r_sort_b(a, ta, n, i, tr, endch);
-                                continue;
-                        }
-                }
-
-                sp0 = sp1 = sp;
-                bigc = 2;
-                if (endch == 0) {
-                        top[0] = ak = a + count[0];
-                        count[0] = 0;
-                } else {
-                        ak = a;
-                        top[255] = a + n;
-                        count[255] = 0;
-                }
-                for (cp = count + bmin; nc > 0; cp++) {
-                        while (*cp == 0)
-                                cp++;
-                        if ((c = *cp) > 1) {
-                                if (c > bigc) {
-                                        bigc = c;
-                                        sp1 = sp;
-                                }
-                                push(ak, c, i+1);
-                        }
-                        top[cp-count] = ak += c;
-                        *cp = 0;                        /* Reset count[]. */
-                        nc--;
-                }
-                swap(*sp0, *sp1, temp);
-
-                for (ak = ta + n, ai = a+n; ak > ta;)   /* Copy to temp. */
-                        *--ak = *--ai;
-                for (ak = ta+n; --ak >= ta;)            /* Deal to piles. */
-                        *--top[tr[(*ak)[i]]] = *ak;
-        }
-}
-                
-static __inline void
-simplesort(const u_char **a, int n, int b, const u_char *tr, u_int endch)
-    /* insertion sort */
-{
-        u_char ch;
-        const u_char  **ak, **ai, *s, *t;
-
-        for (ak = a+1; --n >= 1; ak++)
-                for (ai = ak; ai > a; ai--) {
-                        for (s = ai[0] + b, t = ai[-1] + b;
-                            (ch = tr[*s]) != endch; s++, t++)
-                                if (ch != tr[*t])
-                                        break;
-                        if (ch >= tr[*t])
-                                break;
-                        swap(ai[0], ai[-1], s);
-                }
-}
diff --git a/src/lib/libc/stdlib/rand.3 b/src/lib/libc/stdlib/rand.3
deleted file mode 100644
index 76278c871a..0000000000
--- a/src/lib/libc/stdlib/rand.3
+++ /dev/null
@@ -1,135 +0,0 @@
-.\" Copyright (c) 1990, 1991 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
-.\" 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: rand.3,v 1.20 2021/02/12 17:03:51 deraadt Exp $
-.\"
-.Dd $Mdocdate: February 12 2021 $
-.Dt RAND 3
-.Os
-.Sh NAME
-.Nm rand ,
-.Nm rand_r ,
-.Nm srand ,
-.Nm srand_deterministic
-.Nd bad pseudo-random number generator
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn srand "unsigned int seed"
-.Ft void
-.Fn srand_deterministic "unsigned int seed"
-.Ft int
-.Fn rand void
-.Ft int
-.Fn rand_r "unsigned int *seed"
-.Sh DESCRIPTION
-.Bf -symbolic
-Standards insist that this interface return deterministic results.
-Unsafe usage is very common, so
-.Ox
-changed the subsystem to return non-deterministic results by default.
-.Ef
-.Pp
-To satisfy portable code,
-.Fn srand
-may be called to initialize the subsystem.
-In
-.Ox
-the
-.Ar seed
-variable is ignored, and strong random number results will be provided from
-.Xr arc4random 3 .
-In other systems, the
-.Ar seed
-variable primes a simplistic deterministic algorithm.
-.Pp
-If the standardized behavior is required
-.Fn srand_deterministic
-can be substituted for
-.Fn srand ,
-then subsequent
-.Fn rand
-calls will return results using the deterministic algorithm.
-The deterministic sequence algorithm changed a number of times since
-original development, is underspecified, and should not be relied upon to
-remain consistent between platforms and over time.
-.Pp
-The
-.Fn rand
-function returns a result in the range of 0 to
-.Dv RAND_MAX .
-By default, this result comes from
-.Xr arc4random 3 .
-If
-.Fn srand_deterministic
-was called, the result will be computed using the deterministic algorithm.
-.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.
-It always operates using the deterministic algorithm.
-.Sh SEE ALSO
-.Xr arc4random 3 ,
-.Xr rand48 3 ,
-.Xr random 3
-.Sh STANDARDS
-The
-.Fn rand
-function conforms to
-.St -ansiC .
-.Pp
-The
-.Fn rand_r
-function conforms to
-.St -p1003.1-2008 .
-.Pp
-The
-.Fn srand
-function does not conform to
-.St -ansiC ,
-intentionally.
-.Pp
-The
-.Fn srand_deterministic
-function is an
-.Ox
-extension.
-.Sh HISTORY
-The functions
-.Fn rand
-and
-.Fn srand
-first appeared in
-.At v3 .
diff --git a/src/lib/libc/stdlib/rand.c b/src/lib/libc/stdlib/rand.c
deleted file mode 100644
index 97964f6ef9..0000000000
--- a/src/lib/libc/stdlib/rand.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*      $OpenBSD: rand.c,v 1.18 2017/11/28 06:55:49 tb 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 <sys/types.h>
-#include <stdlib.h>
-
-static int rand_deterministic;
-static u_int next = 1;
-
-int
-rand_r(u_int *seed)
-{
-        *seed = *seed * 1103515245 + 12345;
-        return (*seed & RAND_MAX);
-}
-DEF_WEAK(rand_r);
-
-#if defined(APIWARN)
-__warn_references(rand_r,
-    "rand_r() is not random, it is deterministic.");
-#endif
-
-int
-rand(void)
-{
-        if (rand_deterministic == 0)
-                return (arc4random() & RAND_MAX);
-        return (rand_r(&next));
-}
-
-#if defined(APIWARN)
-__warn_references(rand,
-    "rand() may return deterministic values, is that what you want?");
-#endif
-
-void
-srand(u_int seed)
-{
-        rand_deterministic = 0;
-}
-
-void
-srand_deterministic(u_int seed)
-{
-        rand_deterministic = 1;
-        next = seed;
-}
diff --git a/src/lib/libc/stdlib/rand48.3 b/src/lib/libc/stdlib/rand48.3
deleted file mode 100644
index fa7a7179bc..0000000000
--- a/src/lib/libc/stdlib/rand48.3
+++ /dev/null
@@ -1,240 +0,0 @@
-.\" Copyright (c) 1993 Martin Birgmeier
-.\" All rights reserved.
-.\"
-.\" You may redistribute unmodified or modified versions of this source
-.\" code provided that the above copyright notice and this and the
-.\" following conditions are retained.
-.\"
-.\" 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.3,v 1.21 2019/12/20 19:16:40 tb Exp $
-.\"
-.Dd $Mdocdate: December 20 2019 $
-.Dt DRAND48 3
-.Os
-.Sh NAME
-.Nm drand48 ,
-.Nm erand48 ,
-.Nm lrand48 ,
-.Nm nrand48 ,
-.Nm mrand48 ,
-.Nm jrand48 ,
-.Nm srand48 ,
-.Nm srand48_deterministic ,
-.Nm seed48 ,
-.Nm seed48_deterministic ,
-.Nm lcong48 ,
-.Nm lcong48_deterministic
-.Nd pseudo-random number generators and initialization routines
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft double
-.Fn drand48 void
-.Ft double
-.Fn erand48 "unsigned short xseed[3]"
-.Ft long
-.Fn lrand48 void
-.Ft long
-.Fn nrand48 "unsigned short xseed[3]"
-.Ft long
-.Fn mrand48 void
-.Ft long
-.Fn jrand48 "unsigned short xseed[3]"
-.Ft void
-.Fn srand48 "long seed"
-.Ft void
-.Fn srand48_deterministic "long seed"
-.Ft "unsigned short *"
-.Fn seed48 "unsigned short xseed[3]"
-.Ft "unsigned short *"
-.Fn seed48_deterministic "unsigned short xseed[3]"
-.Ft void
-.Fn lcong48 "unsigned short p[7]"
-.Ft void
-.Fn lcong48_deterministic "unsigned short p[7]"
-.Sh DESCRIPTION
-.Bf -symbolic
-Standards insist that this interface return deterministic results.
-Unsafe usage is very common, so
-.Ox
-changed the subsystem to return non-deterministic results by default.
-.Ef
-.Pp
-To satisfy portable code,
-.Fn srand48 ,
-.Fn seed48 ,
-or
-.Fn lcong48
-should be called to initialize the subsystem.
-In
-.Ox
-the
-seeding parameters are ignored, and strong random number results will be
-provided from
-.Xr arc4random 3 .
-In other systems, the
-parameters prime a simplistic deterministic algorithm.
-.Pp
-If the standardized behavior is required then
-.Fn srand48_deterministic ,
-.Fn seed48_deterministic ,
-and
-.Fn lcong48_deterministic
-can be substituted for
-.Fn srand48 ,
-.Fn seed48 ,
-and
-.Fn lcong48 .
-That will cause subsequent
-calls to
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn jrand48
-to return results using the deterministic algorithm.
-.Pp
-.Fn drand48
-and
-.Fn erand48
-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).
-.Pp
-.Fn lrand48
-and
-.Fn nrand48
-return values of type long in the range
-[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
-.Fn mrand48
-and
-.Fn jrand48
-return values of type long in the range
-[-2**31, 2**31-1].
-The high-order (32) bits of r(n+1) are loaded into the returned value.
-.Pp
-In the deterministic mode, the
-.Fn rand48
-family of functions generates numbers using a linear congruential
-algorithm working on integers 48 bits in size.
-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.
-r(n) is called the seed of the random number generator.
-.Pp
-For all the six generator routines described next, the first
-computational step is to perform a single iteration of the algorithm.
-.Pp
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48
-use an internal buffer to store r(n).
-For these functions
-the initial value of r(0) = 0x1234abcd330e = 20017429951246.
-.Pp
-On the other hand,
-.Fn erand48 ,
-.Fn nrand48 ,
-and
-.Fn jrand48
-use a user-supplied buffer to store the seed r(n),
-which consists of an array of 3 shorts, where the zeroth member
-holds the least significant bits.
-.Pp
-All functions share the same multiplicand and addend.
-.Pp
-.Fn srand48_deterministic
-is used to initialize the internal buffer r(n) of
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48
-such that the 32 bits of the seed value are copied into the upper 32 bits
-of r(n), with the lower 16 bits of r(n) arbitrarily being set to 0x330e.
-Additionally, the constant multiplicand and addend of the algorithm are
-reset to the default values given above.
-.Pp
-.Fn seed48_deterministic
-also initializes the internal buffer r(n) of
-.Fn drand48 ,
-.Fn lrand48 ,
-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, the constant multiplicand and addend of the algorithm are
-reset to the default values given above.
-.Fn seed48_deterministic
-returns a pointer to an array of 3 shorts which contains the old seed.
-This array is statically allocated, so its contents are lost after
-each new call to
-.Fn seed48_deterministic .
-.Pp
-Finally,
-.Fn lcong48_deterministic
-allows full control over the multiplicand and addend used in
-.Fn drand48 ,
-.Fn erand48 ,
-.Fn lrand48 ,
-.Fn nrand48 ,
-.Fn mrand48 ,
-and
-.Fn jrand48 ,
-and the seed used in
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48 .
-An array of 7 shorts is passed as parameter; the first three shorts are
-used to initialize the seed; the second three are used to initialize the
-multiplicand; and the last short is used to initialize the addend.
-It is thus not possible to use values greater than 0xffff as the addend.
-.Pp
-Note that all three methods of seeding the random number generator
-always also set the multiplicand and addend for any of the six
-generator calls.
-.Sh SEE ALSO
-.Xr arc4random 3 ,
-.Xr rand 3 ,
-.Xr random 3
-.Sh STANDARDS
-The
-.Fn drand48 ,
-.Fn erand48 ,
-.Fn jrand48 ,
-.Fn lrand48 ,
-.Fn mrand48 ,
-and
-.Fn nrand48 ,
-functions conform to
-.St -p1003.1-2008 .
-.Pp
-The
-.Fn seed48 ,
-.Fn srand48 ,
-and
-.Fn lcong48
-function do not conform to
-.St -ansiC ,
-intentionally.
-.Pp
-The
-.Fn seed48_deterministic ,
-.Fn srand48_deterministic ,
-and
-.Fn lcong48_deterministic
-functions are
-.Ox
-extensions.
-.Sh AUTHORS
-.An Martin Birgmeier
diff --git a/src/lib/libc/stdlib/rand48.h b/src/lib/libc/stdlib/rand48.h
deleted file mode 100644
index 7a719beba6..0000000000
--- a/src/lib/libc/stdlib/rand48.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.6 2015/09/14 13:30:17 guenther Exp $
- */
-
-#ifndef _RAND48_H_
-#define _RAND48_H_
-
-#include <stdlib.h>
-
-__BEGIN_HIDDEN_DECLS
-extern unsigned short __rand48_seed[3];
-extern unsigned short __rand48_mult[3];
-extern unsigned short __rand48_add;
-
-void            __dorand48(unsigned short[3]);
-extern int      __rand48_deterministic;
-__END_HIDDEN_DECLS
-
-#define RAND48_SEED_0   (0x330e)
-#define RAND48_SEED_1   (0xabcd)
-#define RAND48_SEED_2   (0x1234)
-#define RAND48_MULT_0   (0xe66d)
-#define RAND48_MULT_1   (0xdeec)
-#define RAND48_MULT_2   (0x0005)
-#define RAND48_ADD      (0x000b)
-
-#endif /* _RAND48_H_ */
diff --git a/src/lib/libc/stdlib/random.3 b/src/lib/libc/stdlib/random.3
deleted file mode 100644
index 0770d20f09..0000000000
--- a/src/lib/libc/stdlib/random.3
+++ /dev/null
@@ -1,197 +0,0 @@
-.\" Copyright (c) 1983, 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. 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: random.3,v 1.29 2021/02/12 17:03:51 deraadt Exp $
-.\"
-.Dd $Mdocdate: February 12 2021 $
-.Dt RANDOM 3
-.Os
-.Sh NAME
-.Nm random ,
-.Nm srandom ,
-.Nm srandom_deterministic ,
-.Nm srandomdev ,
-.Nm initstate ,
-.Nm setstate
-.Nd pseudo-random number generator; routines for changing generators
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long
-.Fn random void
-.Ft void
-.Fn srandom "unsigned int seed"
-.Ft void
-.Fn srandom_deterministic "unsigned int seed"
-.Ft void
-.Fn srandomdev void
-.Ft char *
-.Fn initstate "unsigned int seed" "char *state" "size_t n"
-.Ft char *
-.Fn setstate "char *state"
-.Sh DESCRIPTION
-.Bf -symbolic
-Standards insist that this interface return deterministic results.
-Unsafe usage is very common, so
-.Ox
-changed the subsystem to return non-deterministic results by default.
-.Ef
-.Pp
-To satisfy portable code,
-.Fn srandom
-or
-.Fn srandomdev
-may be called to initialize the subsystem.
-In
-.Ox
-the
-.Ar seed
-variable is ignored, and strong random number results will be provided from
-.Xr arc4random 3 .
-In other systems, the
-.Ar seed
-variable primes a simplistic deterministic algorithm.
-.Pp
-If the standardized behavior is required
-.Fn srandom_deterministic
-can be substituted for
-.Fn srandom ,
-then subsequent
-.Fn random
-calls will return results using the deterministic algorithm.
-.Pp
-In non-deterministic (default) mode, the
-.Fn random
-function returns results from
-.Xr arc4random 3
-in the range from 0 to (2**31)\-1.
-.Pp
-In deterministic mode, the
-.Fn random
-function uses a non-linear additive feedback random number generator employing
-a default table of size 31 long integers to return successive pseudo-random
-numbers in the range from 0 to (2**31)\-1.
-The period of this random number generator is very large, approximately
-16*((2**31)\-1), but the results are a deterministic sequence from the seed.
-The deterministic sequence algorithm changed a number of times since
-original development, is underspecified, and should not be relied upon to
-remain consistent between platforms and over time.
-.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
-.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 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 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 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
-or
-.Fn setstate .
-.Pp
-Once a state array has been initialized, it may be restarted at a
-different point either by calling
-.Fn initstate
-(with the desired seed, the state array, and its size) or by calling
-both
-.Fn setstate
-(with the state array) and
-.Fn srandom
-(with the desired seed).
-The advantage of calling both
-.Fn setstate
-and
-.Fn srandom
-is that the size of the state array does not have to be remembered after
-it is initialized.
-.Pp
-Use of
-.Fn srandom_deterministic ,
-.Fn initstate ,
-or
-.Fn setstate
-forces the subsystem into deterministic mode.
-.Sh DIAGNOSTICS
-If
-.Fn initstate
-is called with less than 8 bytes of state information, or if
-.Fn setstate
-detects that the state information has been garbled, error
-messages are printed on the standard error output.
-.Sh SEE ALSO
-.Xr arc4random 3 ,
-.Xr drand48 3 ,
-.Xr rand 3 ,
-.Xr random 4
-.Sh STANDARDS
-The
-.Fn random ,
-.Fn initstate ,
-and
-.Fn setstate
-functions conform to
-.St -xpg4.2 .
-.Pp
-The
-.Fn srandom
-function does not conform to
-.St -xpg4.2 ,
-intentionally.
-.Pp
-The
-.Fn srandomdev
-function is an extension.
-.Pp
-The
-.Fn srandom_deterministic
-function is an
-.Ox
-extension.
-.Sh HISTORY
-These
-functions appeared in
-.Bx 4.2 .
-.Sh AUTHORS
-.An Earl T. Cohen
diff --git a/src/lib/libc/stdlib/random.c b/src/lib/libc/stdlib/random.c
deleted file mode 100644
index 62a0c24bdb..0000000000
--- a/src/lib/libc/stdlib/random.c
+++ /dev/null
@@ -1,419 +0,0 @@
-/*      $OpenBSD: random.c,v 1.31 2017/11/28 06:55:49 tb Exp $ */
-/*
- * Copyright (c) 1983 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 <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "thread_private.h"
-
-/*
- * random.c:
- *
- * An improved random number generation package.  In addition to the standard
- * rand()/srand() like interface, this package also has a special state info
- * interface.  The initstate() routine is called with a seed, an array of
- * bytes, and a count of how many bytes are being passed in; this array is
- * then initialized to contain information for random number generation with
- * that much state information.  Good sizes for the amount of state
- * information are 32, 64, 128, and 256 bytes.  The state can be switched by
- * calling the setstate() routine with the same array as was initiallized
- * with initstate().  By default, the package runs with 128 bytes of state
- * information and generates far better random numbers than a linear
- * 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 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 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).
- * 
- * The random number generation technique is a linear feedback shift register
- * approach, employing trinomials (since there are fewer terms to sum up that
- * way).  In this approach, the least significant bit of all the numbers in
- * the state table will act as a linear feedback shift register, and will
- * have period 2^deg - 1 (where deg is the degree of the polynomial being
- * used, assuming that the polynomial is irreducible and primitive).  The
- * higher order bits will have longer periods, since their values are also
- * influenced by pseudo-random carries out of the lower bits.  The total
- * period of the generator is approximately deg*(2**deg - 1); thus doubling
- * the amount of state information has a vast influence on the period of the
- * generator.  Note: the deg*(2**deg - 1) is an approximation only good for
- * large deg, when the period of the shift register is the dominant factor.
- * With deg equal to seven, the period is actually much longer than the
- * 7*(2**7 - 1) predicted by this formula.
- */
-
-/*
- * For each of the currently supported random number generators, we have a
- * break value on the amount of state information (you need at least this
- * many bytes of state info to support this random number generator), a degree
- * for the polynomial (actually a trinomial) that the R.N.G. is based on, and
- * the separation between the two lower order coefficients of the trinomial.
- */
-#define TYPE_0          0               /* linear congruential */
-#define BREAK_0         8
-#define DEG_0           0
-#define SEP_0           0
-
-#define TYPE_1          1               /* x**7 + x**3 + 1 */
-#define BREAK_1         32
-#define DEG_1           7
-#define SEP_1           3
-
-#define TYPE_2          2               /* x**15 + x + 1 */
-#define BREAK_2         64
-#define DEG_2           15
-#define SEP_2           1
-
-#define TYPE_3          3               /* x**31 + x**3 + 1 */
-#define BREAK_3         128
-#define DEG_3           31
-#define SEP_3           3
-
-#define TYPE_4          4               /* x**63 + x + 1 */
-#define BREAK_4         256
-#define DEG_4           63
-#define SEP_4           1
-
-/*
- * Array versions of the above information to make code run faster --
- * relies on fact that TYPE_i == i.
- */
-#define MAX_TYPES       5               /* max number of types above */
-
-static int degrees[MAX_TYPES] = { DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 };
-static int seps [MAX_TYPES] =   { SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 };
-
-/*
- * Initially, everything is set up as if from:
- *
- *      initstate(1, &randtbl, 128);
- *
- * Note that this initialization takes advantage of the fact that srandom()
- * advances the front and rear pointers 10*rand_deg times, and hence the
- * rear pointer which starts at 0 will also end up at zero; thus the zeroeth
- * element of the state information, which contains info about the current
- * position of the rear pointer is just
- *
- *      MAX_TYPES * (rptr - state) + TYPE_3 == TYPE_3.
- */
-
-static int32_t randtbl[DEG_3 + 1] = {
-        TYPE_3,
-        0x991539b1, 0x16a5bce3, 0x6774a4cd, 0x3e01511e, 0x4e508aaa, 0x61048c05, 
-        0xf5500617, 0x846b7115, 0x6a19892c, 0x896a97af, 0xdb48f936, 0x14898454, 
-        0x37ffd106, 0xb58bff9c, 0x59e17104, 0xcf918a49, 0x09378c83, 0x52c7a471, 
-        0x8d293ea9, 0x1f4fc301, 0xc3db71be, 0x39b44e1c, 0xf8a44ef9, 0x4c8b80b1, 
-        0x19edc328, 0x87bf4bdd, 0xc9b240e5, 0xe9ee4b1b, 0x4382aee7, 0x535b6b41, 
-        0xf3bec5da,
-};
-
-/*
- * fptr and rptr are two pointers into the state info, a front and a rear
- * pointer.  These two pointers are always rand_sep places aparts, as they
- * cycle cyclically through the state information.  (Yes, this does mean we
- * could get away with just one pointer, but the code for random() is more
- * efficient this way).  The pointers are left positioned as they would be
- * from the call
- *
- *      initstate(1, randtbl, 128);
- *
- * (The position of the rear pointer, rptr, is really 0 (as explained above
- * in the initialization of randtbl) because the state table pointer is set
- * to point to randtbl[1] (as explained below).
- */
-static int32_t *fptr = &randtbl[SEP_3 + 1];
-static int32_t *rptr = &randtbl[1];
-
-/*
- * The following things are the pointer to the state information table, the
- * type of the current generator, the degree of the current polynomial being
- * used, and the separation between the two pointers.  Note that for efficiency
- * of random(), we remember the first location of the state information, not
- * the zeroeth.  Hence it is valid to access state[-1], which is used to
- * store the type of the R.N.G.  Also, we remember the last location, since
- * 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 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 int random_deterministic;
-
-static void *random_mutex;
-static long random_l(void);
-
-#define LOCK()          _MUTEX_LOCK(&random_mutex)
-#define UNLOCK()        _MUTEX_UNLOCK(&random_mutex)
-
-/*
- * srandom:
- *
- * Initialize the random number generator based on the given seed.  If the
- * type is the trivial no-state-information type, just remember the seed.
- * Otherwise, initializes state[] based on the given "seed" via a linear
- * congruential generator.  Then, the pointers are set to known locations
- * that are exactly rand_sep places apart.  Lastly, it cycles the state
- * information a given number of times to get rid of any initial dependencies
- * introduced by the L.C.R.N.G.  Note that the initialization of randtbl[]
- * for default usage relies on values produced by this routine.
- */
-static void
-srandom_l(unsigned int x)
-{
-        int i;
-        int32_t test;
-        div_t val;
-
-        random_deterministic = 1;
-        if (rand_type == TYPE_0)
-                state[0] = x;
-        else {
-                /* A seed of 0 would result in state[] always being zero. */
-                state[0] = x ? x : 1;
-                for (i = 1; i < rand_deg; i++) {
-                        /*
-                         * 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++)
-                        (void)random_l();
-        }
-}
-
-void
-srandom(unsigned int x)
-{
-        random_deterministic = 0;
-}
-
-void
-srandomdev(void)
-{
-        random_deterministic = 0;       /* back to the default */
-}
-
-void
-srandom_deterministic(unsigned int x)
-{
-        LOCK();
-        srandom_l(x);
-        UNLOCK();
-}
-
-/*
- * initstate:
- *
- * Initialize the state information in the given array of n bytes for future
- * random number generation.  Based on the number of bytes we are given, and
- * the break values for the different R.N.G.'s, we choose the best (largest)
- * one we can and set things up for it.  srandom() is then called to
- * initialize the state information.
- * 
- * Note that on return from srandom(), we set state[-1] to be the type
- * multiplexed with the current value of the rear pointer; this is so
- * successive calls to initstate() won't lose this information and will be
- * able to restart with setstate().
- * 
- * Note: the first thing we do is save the current state, if any, just like
- * setstate() so that it doesn't matter when initstate is called.
- *
- * Returns a pointer to the old state.
- */
-char *
-initstate(u_int seed, char *arg_state, size_t n)
-{
-        char *ostate = (char *)(&state[-1]);
-
-        LOCK();
-        random_deterministic = 1;
-        if (rand_type == TYPE_0)
-                state[-1] = rand_type;
-        else
-                state[-1] = MAX_TYPES * (rptr - state) + rand_type;
-        if (n < BREAK_0) {
-                UNLOCK();
-                return(NULL);
-        }
-        if (n < BREAK_1) {
-                rand_type = TYPE_0;
-                rand_deg = DEG_0;
-                rand_sep = SEP_0;
-        } else if (n < BREAK_2) {
-                rand_type = TYPE_1;
-                rand_deg = DEG_1;
-                rand_sep = SEP_1;
-        } else if (n < BREAK_3) {
-                rand_type = TYPE_2;
-                rand_deg = DEG_2;
-                rand_sep = SEP_2;
-        } else if (n < BREAK_4) {
-                rand_type = TYPE_3;
-                rand_deg = DEG_3;
-                rand_sep = SEP_3;
-        } else {
-                rand_type = TYPE_4;
-                rand_deg = DEG_4;
-                rand_sep = SEP_4;
-        }
-        state = &(((int32_t *)arg_state)[1]);   /* first location */
-        end_ptr = &state[rand_deg];     /* must set end_ptr before srandom */
-        srandom_l(seed);
-        if (rand_type == TYPE_0)
-                state[-1] = rand_type;
-        else
-                state[-1] = MAX_TYPES*(rptr - state) + rand_type;
-        UNLOCK();
-        return(ostate);
-}
-
-/*
- * setstate:
- *
- * Restore the state from the given state array.
- *
- * Note: it is important that we also remember the locations of the pointers
- * in the current state information, and restore the locations of the pointers
- * from the old state information.  This is done by multiplexing the pointer
- * location into the zeroeth word of the state information.
- *
- * Note that due to the order in which things are done, it is OK to call
- * setstate() with the same state as the current state.
- *
- * Returns a pointer to the old state information.
- */
-char *
-setstate(char *arg_state)
-{
-        int32_t *new_state = (int32_t *)arg_state;
-        int32_t type = new_state[0] % MAX_TYPES;
-        int32_t rear = new_state[0] / MAX_TYPES;
-        char *ostate = (char *)(&state[-1]);
-
-        LOCK();
-        random_deterministic = 1;
-        if (rand_type == TYPE_0)
-                state[-1] = rand_type;
-        else
-                state[-1] = MAX_TYPES * (rptr - state) + rand_type;
-        switch(type) {
-        case TYPE_0:
-        case TYPE_1:
-        case TYPE_2:
-        case TYPE_3:
-        case TYPE_4:
-                rand_type = type;
-                rand_deg = degrees[type];
-                rand_sep = seps[type];
-                break;
-        default:
-                UNLOCK();
-                return(NULL);
-        }
-        state = &new_state[1];
-        if (rand_type != TYPE_0) {
-                rptr = &state[rear];
-                fptr = &state[(rear + rand_sep) % rand_deg];
-        }
-        end_ptr = &state[rand_deg];             /* set end_ptr too */
-        UNLOCK();
-        return(ostate);
-}
-
-/*
- * random:
- *
- * If we are using the trivial TYPE_0 R.N.G., just do the old linear
- * congruential bit.  Otherwise, we do our fancy trinomial stuff, which is
- * the same in all the other cases due to all the global variables that have
- * been set up.  The basic operation is to add the number at the rear pointer
- * into the one at the front pointer.  Then both pointers are advanced to
- * the next location cyclically in the table.  The value returned is the sum
- * generated, reduced to 31 bits by throwing away the "least random" low bit.
- *
- * Note: the code takes advantage of the fact that both the front and
- * rear pointers can't wrap on the same call by not testing the rear
- * pointer if the front one has wrapped.
- *
- * Returns a 31-bit random number.
- */
-static long
-random_l(void)
-{
-        int32_t i;
-
-        if (random_deterministic == 0)
-                return arc4random() & 0x7fffffff;
-
-        if (rand_type == TYPE_0)
-                i = state[0] = (state[0] * 1103515245 + 12345) & 0x7fffffff;
-        else {
-                *fptr += *rptr;
-                i = (*fptr >> 1) & 0x7fffffff;  /* chucking least random bit */
-                if (++fptr >= end_ptr) {
-                        fptr = state;
-                        ++rptr;
-                } else if (++rptr >= end_ptr)
-                        rptr = state;
-        }
-        return((long)i);
-}
-
-long
-random(void)
-{
-        long r;
-        LOCK();
-        r = random_l();
-        UNLOCK();
-        return r;
-}
-
-#if defined(APIWARN)
-__warn_references(random,
-    "random() may return deterministic values, is that what you want?");
-#endif
diff --git a/src/lib/libc/stdlib/reallocarray.c b/src/lib/libc/stdlib/reallocarray.c
deleted file mode 100644
index baea252a87..0000000000
--- a/src/lib/libc/stdlib/reallocarray.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*      $OpenBSD: reallocarray.c,v 1.3 2015/09/13 08:31:47 guenther Exp $       */
-/*
- * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
- *
- * 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 <sys/types.h>
-#include <errno.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/*
- * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
- * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
- */
-#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4))
-
-void *
-reallocarray(void *optr, size_t nmemb, size_t size)
-{
-        if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
-            nmemb > 0 && SIZE_MAX / nmemb < size) {
-                errno = ENOMEM;
-                return NULL;
-        }
-        return realloc(optr, size * nmemb);
-}
-DEF_WEAK(reallocarray);
diff --git a/src/lib/libc/stdlib/realpath.3 b/src/lib/libc/stdlib/realpath.3
deleted file mode 100644
index 51abd93652..0000000000
--- a/src/lib/libc/stdlib/realpath.3
+++ /dev/null
@@ -1,164 +0,0 @@
-.\" Copyright (c) 1994
-.\"     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
-.\" 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: realpath.3,v 1.25 2019/12/11 20:01:50 bluhm Exp $
-.\"
-.Dd $Mdocdate: December 11 2019 $
-.Dt REALPATH 3
-.Os
-.Sh NAME
-.Nm realpath
-.Nd returns the canonicalized absolute pathname
-.Sh SYNOPSIS
-.In limits.h
-.In stdlib.h
-.Ft "char *"
-.Fn realpath "const char *pathname" "char *resolved"
-.Sh DESCRIPTION
-The
-.Fn realpath
-function resolves all symbolic links, extra
-.Dq /
-characters and references to
-.Pa /./
-and
-.Pa /../
-in
-.Fa pathname ,
-and copies the resulting absolute pathname into the memory referenced by
-.Fa resolved .
-The
-.Fa resolved
-argument
-.Em must
-refer to a buffer capable of storing at least
-.Dv PATH_MAX
-characters, or be
-.Dv NULL .
-.Pp
-The
-.Fn realpath
-function will resolve both absolute and relative paths
-and return the absolute pathname corresponding to
-.Fa pathname .
-All components of
-.Fa pathname
-must exist when
-.Fn realpath
-is called.
-.Sh RETURN VALUES
-The
-.Fn realpath
-function returns
-.Fa resolved
-on success.
-If
-.Fa resolved
-is
-.Dv NULL
-and no error occurred, then
-.Fn realpath
-returns a NUL-terminated string in a newly allocated buffer.
-If an error occurs,
-.Fn realpath
-returns
-.Dv NULL
-and the contents of
-.Fa resolved
-are undefined.
-.Sh ERRORS
-The function
-.Fn realpath
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Read or search permission was denied for a component of
-.Ar pathname .
-.It Bq Er EINVAL
-The
-.Ar pathname
-argument is a null pointer.
-.It Bq Er EIO
-An error occurred while reading from the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating
-.Ar pathname .
-.It Bq Er ENAMETOOLONG
-A component of
-.Ar pathname
-exceeded
-.Dv NAME_MAX
-characters, or the entire
-.Ar pathname
-(including the terminating NUL) exceeded
-.Dv PATH_MAX .
-.It Bq Er ENAMETOOLONG
-Pathname resolution of a symbolic link produced an intermediate
-result whose length exceeds
-.Dv PATH_MAX .
-.It Bq Er ENOENT
-A component of
-.Ar pathname
-does not name an existing file or
-.Ar pathname
-points to an empty string.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENOMEM
-Sufficient storage space is unavailable for allocation.
-.El
-.Sh SEE ALSO
-.Xr readlink 1 ,
-.Xr getcwd 3
-.Sh STANDARDS
-The
-.Fn realpath
-function conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn realpath
-function call first appeared in
-.Bx 4.4 .
-.Pp
-In
-.Ox 6.6 ,
-it was reimplemented on top of the
-.Fn __realpath
-system call.
-Its calling convention differs from the standard
-function by requiring
-.Ar resolved
-to not be
-.Dv NULL
-and by returning an integer,
-zero on success, and -1 with corresponding errno on failure.
-This is visible in the output of
-.Xr kdump 1 .
diff --git a/src/lib/libc/stdlib/realpath.c b/src/lib/libc/stdlib/realpath.c
deleted file mode 100644
index f7ac9fe606..0000000000
--- a/src/lib/libc/stdlib/realpath.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*      $OpenBSD: realpath.c,v 1.27 2019/07/05 05:04:26 deraadt Exp $ */
-/*
- * Copyright (c) 2019 Bob Beck <beck@openbsd.org>
- * Copyright (c) 2019 Theo de Raadt <deraadt@openbsd.org>
- *
- * Permission to use, copy, modify, and/or 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 <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <limits.h>
-#include <syslog.h>
-#include <stdarg.h>
-
-int __realpath(const char *pathname, char *resolved);
-PROTO_NORMAL(__realpath);
-
-/*
- * wrapper for kernel __realpath
- */
-
-char *
-realpath(const char *path, char *resolved)
-{
-        char rbuf[PATH_MAX];
-
-        if (__realpath(path, rbuf) == -1)
-                return NULL;
-        if (resolved == NULL)
-                return (strdup(rbuf));
-        strlcpy(resolved, rbuf, PATH_MAX);
-        return (resolved);
-}
diff --git a/src/lib/libc/stdlib/recallocarray.c b/src/lib/libc/stdlib/recallocarray.c
deleted file mode 100644
index 81059e6ae1..0000000000
--- a/src/lib/libc/stdlib/recallocarray.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*      $OpenBSD: recallocarray.c,v 1.2 2021/03/18 11:16:58 claudio Exp $       */
-/*
- * Copyright (c) 2008, 2017 Otto Moerbeek <otto@drijf.net>
- *
- * 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 <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-
-/*
- * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
- * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
- */
-#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4))
-
-void *
-recallocarray(void *ptr, size_t oldnmemb, size_t newnmemb, size_t size)
-{
-        size_t oldsize, newsize;
-        void *newptr;
-
-        if (ptr == NULL)
-                return calloc(newnmemb, size);
-
-        if ((newnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
-            newnmemb > 0 && SIZE_MAX / newnmemb < size) {
-                errno = ENOMEM;
-                return NULL;
-        }
-        newsize = newnmemb * size;
-
-        if ((oldnmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
-            oldnmemb > 0 && SIZE_MAX / oldnmemb < size) {
-                errno = EINVAL;
-                return NULL;
-        }
-        oldsize = oldnmemb * size;
-        
-        /*
-         * Don't bother too much if we're shrinking just a bit,
-         * we do not shrink for series of small steps, oh well.
-         */
-        if (newsize <= oldsize) {
-                size_t d = oldsize - newsize;
-
-                if (d < oldsize / 2 && d < (size_t)getpagesize()) {
-                        memset((char *)ptr + newsize, 0, d);
-                        return ptr;
-                }
-        }
-
-        newptr = malloc(newsize);
-        if (newptr == NULL)
-                return NULL;
-
-        if (newsize > oldsize) {
-                memcpy(newptr, ptr, oldsize);
-                memset((char *)newptr + oldsize, 0, newsize - oldsize);
-        } else
-                memcpy(newptr, ptr, newsize);
-
-        explicit_bzero(ptr, oldsize);
-        free(ptr);
-
-        return newptr;
-}
-DEF_WEAK(recallocarray);
diff --git a/src/lib/libc/stdlib/remque.c b/src/lib/libc/stdlib/remque.c
deleted file mode 100644
index 71b74b2dce..0000000000
--- a/src/lib/libc/stdlib/remque.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*      $OpenBSD: remque.c,v 1.3 2014/08/15 04:14:36 guenther 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 <stdlib.h>
-#include <search.h>
-
-struct qelem {
-        struct qelem *q_forw;
-        struct qelem *q_back;
-};
-
-void
-remque(void *element)
-{
-        struct qelem *e = element;
-
-        if (e->q_forw != NULL)
-                e->q_forw->q_back = e->q_back;
-        if (e->q_back != NULL)
-                e->q_back->q_forw = e->q_forw;
-}
diff --git a/src/lib/libc/stdlib/seed48.c b/src/lib/libc/stdlib/seed48.c
deleted file mode 100644
index b4b4424c73..0000000000
--- a/src/lib/libc/stdlib/seed48.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*      $OpenBSD: seed48.c,v 1.6 2015/09/13 15:20:40 guenther Exp $ */
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.
- */
-
-#include "rand48.h"
-
-unsigned short *
-seed48(unsigned short xseed[3])
-{
-        unsigned short *res;
-
-        res = seed48_deterministic(xseed);
-        __rand48_deterministic = 0;
-        return res;
-}
-
-unsigned short *
-seed48_deterministic(unsigned short xseed[3])
-{
-        static unsigned short sseed[3];
-
-        __rand48_deterministic = 1;
-        sseed[0] = __rand48_seed[0];
-        sseed[1] = __rand48_seed[1];
-        sseed[2] = __rand48_seed[2];
-        __rand48_seed[0] = xseed[0];
-        __rand48_seed[1] = xseed[1];
-        __rand48_seed[2] = xseed[2];
-        __rand48_mult[0] = RAND48_MULT_0;
-        __rand48_mult[1] = RAND48_MULT_1;
-        __rand48_mult[2] = RAND48_MULT_2;
-        __rand48_add = RAND48_ADD;
-        return sseed;
-}
-DEF_WEAK(seed48_deterministic);
diff --git a/src/lib/libc/stdlib/setenv.c b/src/lib/libc/stdlib/setenv.c
deleted file mode 100644
index 15c550ba30..0000000000
--- a/src/lib/libc/stdlib/setenv.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*      $OpenBSD: setenv.c,v 1.19 2016/09/21 04:38:56 guenther Exp $ */
-/*
- * Copyright (c) 1987 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 <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-static char **lastenv;                          /* last value of environ */
-
-/*
- * putenv --
- *      Add a name=value string directly to the environmental, replacing
- *      any current value.
- */
-int
-putenv(char *str)
-{
-        char **P, *cp;
-        size_t cnt = 0;
-        int offset = 0;
-
-        for (cp = str; *cp && *cp != '='; ++cp)
-                ;
-        if (*cp != '=') {
-                errno = EINVAL;
-                return (-1);                    /* missing `=' in string */
-        }
-
-        if (__findenv(str, (int)(cp - str), &offset) != NULL) {
-                environ[offset++] = str;
-                /* could be set multiple times */
-                while (__findenv(str, (int)(cp - str), &offset)) {
-                        for (P = &environ[offset];; ++P)
-                                if (!(*P = *(P + 1)))
-                                        break;
-                }
-                return (0);
-        }
-
-        /* create new slot for string */
-        if (environ != NULL) {
-                for (P = environ; *P != NULL; P++)
-                        ;
-                cnt = P - environ;
-        }
-        P = reallocarray(lastenv, cnt + 2, sizeof(char *));
-        if (!P)
-                return (-1);
-        if (lastenv != environ && environ != NULL)
-                memcpy(P, environ, cnt * sizeof(char *));
-        lastenv = environ = P;
-        environ[cnt] = str;
-        environ[cnt + 1] = NULL;
-        return (0);
-}
-DEF_WEAK(putenv);
-
-/*
- * setenv --
- *      Set the value of the environmental variable "name" to be
- *      "value".  If rewrite is set, replace any current value.
- */
-int
-setenv(const char *name, const char *value, int rewrite)
-{
-        char *C, **P;
-        const char *np;
-        int l_value, offset = 0;
-
-        if (!name || !*name) {
-                errno = EINVAL;
-                return (-1);
-        }
-        for (np = name; *np && *np != '='; ++np)
-                ;
-        if (*np) {
-                errno = EINVAL;
-                return (-1);                    /* has `=' in name */
-        }
-
-        l_value = strlen(value);
-        if ((C = __findenv(name, (int)(np - name), &offset)) != NULL) {
-                int tmpoff = offset + 1;
-                if (!rewrite)
-                        return (0);
-#if 0 /* XXX - existing entry may not be writable */
-                if (strlen(C) >= l_value) {     /* old larger; copy over */
-                        while ((*C++ = *value++))
-                                ;
-                        return (0);
-                }
-#endif
-                /* could be set multiple times */
-                while (__findenv(name, (int)(np - name), &tmpoff)) {
-                        for (P = &environ[tmpoff];; ++P)
-                                if (!(*P = *(P + 1)))
-                                        break;
-                }
-        } else {                                        /* create new slot */
-                size_t cnt = 0;
-
-                if (environ != NULL) {
-                        for (P = environ; *P != NULL; P++)
-                                ;
-                        cnt = P - environ;
-                }
-                P = reallocarray(lastenv, cnt + 2, sizeof(char *));
-                if (!P)
-                        return (-1);
-                if (lastenv != environ && environ != NULL)
-                        memcpy(P, environ, cnt * sizeof(char *));
-                lastenv = environ = P;
-                offset = cnt;
-                environ[cnt + 1] = NULL;
-        }
-        if (!(environ[offset] =                 /* name + `=' + value */
-            malloc((int)(np - name) + l_value + 2)))
-                return (-1);
-        for (C = environ[offset]; (*C = *name++) && *C != '='; ++C)
-                ;
-        for (*C++ = '='; (*C++ = *value++); )
-                ;
-        return (0);
-}
-DEF_WEAK(setenv);
-
-/*
- * unsetenv(name) --
- *      Delete environmental variable "name".
- */
-int
-unsetenv(const char *name)
-{
-        char **P;
-        const char *np;
-        int offset = 0;
-
-        if (!name || !*name) {
-                errno = EINVAL;
-                return (-1);
-        }
-        for (np = name; *np && *np != '='; ++np)
-                ;
-        if (*np) {
-                errno = EINVAL;
-                return (-1);                    /* has `=' in name */
-        }
-
-        /* could be set multiple times */
-        while (__findenv(name, (int)(np - name), &offset)) {
-                for (P = &environ[offset];; ++P)
-                        if (!(*P = *(P + 1)))
-                                break;
-        }
-        return (0);
-}
-DEF_WEAK(unsetenv);
diff --git a/src/lib/libc/stdlib/srand48.c b/src/lib/libc/stdlib/srand48.c
deleted file mode 100644
index d41391d445..0000000000
--- a/src/lib/libc/stdlib/srand48.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*      $OpenBSD: srand48.c,v 1.6 2015/09/13 08:31:48 guenther Exp $ */
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * 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.
- */
-
-#include "rand48.h"
-
-int     __rand48_deterministic;
-
-void
-srand48(long seed)
-{
-        srand48_deterministic(seed);
-        __rand48_deterministic = 0;
-}
-
-void
-srand48_deterministic(long seed)
-{
-        __rand48_deterministic = 1;
-        __rand48_seed[0] = RAND48_SEED_0;
-        __rand48_seed[1] = (unsigned short) seed;
-        __rand48_seed[2] = (unsigned short) (seed >> 16);
-        __rand48_mult[0] = RAND48_MULT_0;
-        __rand48_mult[1] = RAND48_MULT_1;
-        __rand48_mult[2] = RAND48_MULT_2;
-        __rand48_add = RAND48_ADD;
-}
-DEF_WEAK(srand48_deterministic);
diff --git a/src/lib/libc/stdlib/strtod.3 b/src/lib/libc/stdlib/strtod.3
deleted file mode 100644
index 0561f3615d..0000000000
--- a/src/lib/libc/stdlib/strtod.3
+++ /dev/null
@@ -1,176 +0,0 @@
-.\" Copyright (c) 1990, 1991 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
-.\" 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: strtod.3,v 1.22 2019/01/16 12:55:49 schwarze Exp $
-.\"
-.Dd $Mdocdate: January 16 2019 $
-.Dt STRTOD 3
-.Os
-.Sh NAME
-.Nm strtod ,
-.Nm strtof ,
-.Nm strtold
-.Nd convert ASCII string to double, float or long double
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft double
-.Fn strtod "const char *nptr" "char **endptr"
-.Pp
-.Ft float
-.Fn strtof "const char *nptr" "char **endptr"
-.Pp
-.Ft long double
-.Fn strtold "const char *nptr" "char **endptr"
-.Sh DESCRIPTION
-The
-.Fn strtod
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Li double
-representation.
-The
-.Fn strtof
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Li float
-representation.
-The
-.Fn strtold
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Li long double
-representation.
-.Pp
-The expected form of the string is an optional plus
-.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
-.Sq E
-or
-.Sq e ,
-followed by an optional plus or minus sign, followed by a sequence of digits.
-.Pp
-Alternatively, if the portion of the string following the optional
-plus or minus sign begins with
-.Dq INF
-or
-.Dq NAN ,
-ignoring case, it is interpreted as an infinity or a quiet \*(Na,
-respectively.
-The syntax
-.Dq NAN Ns Pq Ar s ,
-where
-.Ar s
-is an alphanumeric string, produces the same value as the call
-.Fo nan
-.Qq Ar s Ns
-.Fc
-(respectively,
-.Fo nanf
-.Qq Ar s Ns
-.Fc
-and
-.Fo nanl
-.Qq Ar s Ns
-.Fc ) .
-.Pp
-In any of the above cases, leading whitespace characters in the
-string (as defined by the
-.Xr isspace 3
-function) are skipped.
-.Sh RETURN VALUES
-The
-.Fn strtod ,
-.Fn strtof
-and
-.Fn strtold
-functions return the converted value, if any.
-.Pp
-If
-.Fa endptr
-is not
-.Dv NULL ,
-a pointer to the character after the last character used
-in the conversion is stored in the location referenced by
-.Fa endptr .
-.Pp
-If no conversion is performed, zero is returned and the value of
-.Fa nptr
-is stored in the location referenced by
-.Fa endptr .
-.Pp
-If the correct value would cause overflow, plus or minus
-.Dv HUGE_VAL
-is returned (according to the sign of the value), and
-.Er ERANGE
-is stored in
-.Va errno .
-If the correct value would cause underflow, zero is returned and
-.Er ERANGE
-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 ,
-.Xr atol 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn strtod
-function conforms to
-.St -ansiC-89 .
-The
-.Fn strtof
-and
-.Fn strtold
-functions conform to
-.St -isoC-99 .
-.Sh CAVEATS
-On systems other than
-.Ox ,
-the
-.Dv LC_NUMERIC
-.Xr locale 1
-category can cause parsing failures; see CAVEATS in
-.Xr setlocale 3
-for details.
diff --git a/src/lib/libc/stdlib/strtoimax.c b/src/lib/libc/stdlib/strtoimax.c
deleted file mode 100644
index 74e355626a..0000000000
--- a/src/lib/libc/stdlib/strtoimax.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*      $OpenBSD: strtoimax.c,v 1.4 2017/07/06 16:23:11 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;
-
-        /*
-         * Ensure that base is between 2 and 36 inclusive, or the special
-         * value of 0.
-         */
-        if (base < 0 || base == 1 || base > 36) {
-                if (endptr != 0)
-                        *endptr = (char *)nptr;
-                errno = EINVAL;
-                return 0;
-        }
-
-        /*
-         * 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') && isxdigit((unsigned char)s[1])) {
-                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);
-}
-DEF_STRONG(strtoimax);
diff --git a/src/lib/libc/stdlib/strtol.3 b/src/lib/libc/stdlib/strtol.3
deleted file mode 100644
index 92774d082c..0000000000
--- a/src/lib/libc/stdlib/strtol.3
+++ /dev/null
@@ -1,273 +0,0 @@
-.\" 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: strtol.3,v 1.27 2015/04/14 22:16:03 nicm Exp $
-.\"
-.Dd $Mdocdate: April 14 2015 $
-.Dt STRTOL 3
-.Os
-.Sh NAME
-.Nm strtol ,
-.Nm strtoll ,
-.Nm strtoimax ,
-.Nm strtoq
-.Nd convert string value to a long, long long or intmax_t integer
-.Sh SYNOPSIS
-.In limits.h
-.In stdlib.h
-.Ft long
-.Fn strtol "const char *nptr" "char **endptr" "int base"
-.Ft long long
-.Fn strtoll "const char *nptr" "char **endptr" "int base"
-.In inttypes.h
-.Ft intmax_t
-.Fn strtoimax "const char *nptr" "char **endptr" "int base"
-.In sys/types.h
-.In limits.h
-.In stdlib.h
-.Ft quad_t
-.Fn strtoq "const char *nptr" "char **endptr" "int base"
-.Sh DESCRIPTION
-The
-.Fn strtol
-function converts the string in
-.Fa nptr
-to a
-.Vt long
-value.
-The
-.Fn strtoll
-function converts the string in
-.Fa nptr
-to a
-.Vt long long
-value.
-The
-.Fn strtoimax
-function converts the string in
-.Fa nptr
-to an
-.Vt intmax_t
-value.
-The
-.Fn strtoq
-function 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 a number between 2 and 36 inclusive or the special value 0.
-.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.
-If
-.Fa base
-is zero or 16, the string may then include a
-.Ql 0x
-prefix, and the number will be read in base 16; otherwise, a zero
-.Fa base
-is taken as 10 (decimal) unless the next character is
-.Ql 0 ,
-in which case it is taken as 8 (octal).
-.Pp
-The remainder of the string is converted to a
-.Vt long ,
-.Vt long long ,
-or
-.Vt 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 represents 10,
-.Ql B
-represents 11, and so forth, with
-.Ql Z
-representing 35.)
-.Pp
-If
-.Fa endptr
-is non-null,
-.Fn strtol
-stores the address of the first invalid character in
-.Fa *endptr .
-If there were no digits at all, however,
-.Fn strtol
-stores the original value of
-.Fa nptr
-in
-.Fa *endptr .
-(Thus, if
-.Fa *nptr
-is not
-.Ql \e0
-but
-.Fa **endptr
-is
-.Ql \e0
-on return, the entire string was valid.)
-.Sh RETURN VALUES
-The
-.Fn strtol ,
-.Fn strtoll ,
-.Fn strtoimax ,
-and
-.Fn strtoq
-functions return the result of the conversion.
-If overflow or underflow occurs,
-.Va errno
-is set to
-.Er ERANGE
-and the function return value is as follows:
-.Bl -column "strtoimaxXX" "INTMAX_MIN" "INTMAX_MAX" -offset indent
-.It Sy Function Ta Sy underflow Ta Sy overflow
-.It Fn strtol Ta Dv LONG_MIN Ta Dv LONG_MAX
-.It Fn strtoll Ta Dv LLONG_MIN Ta Dv LLONG_MAX
-.It Fn strtoimax Ta Dv INTMAX_MIN Ta Dv INTMAX_MAX
-.It Fn strtoq Ta Dv LLONG_MIN Ta Dv LLONG_MAX
-.El
-.Pp
-If there is no valid digit, 0 is returned.
-If
-.Ar base
-is invalid, 0 is returned and the global variable
-.Va errno
-is set to
-.Er EINVAL .
-.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
-.Vt int
-rather than a
-.Vt 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 EINVAL
-The value of
-.Ar base
-was neither between 2 and 36 inclusive nor the special value 0.
-.It Bq Er ERANGE
-The given string was out of range; the value converted has been clamped.
-.El
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr atoll 3 ,
-.Xr sscanf 3 ,
-.Xr strtod 3 ,
-.Xr strtonum 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn strtol ,
-.Fn strtoll ,
-and
-.Fn strtoimax
-functions conform to
-.St -isoC-99 .
-Setting
-.Va errno
-to
-.Dv EINVAL
-is an extension to that standard required by
-.St -p1003.1-2008 .
-.Pp
-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
deleted file mode 100644
index 599d2355a8..0000000000
--- a/src/lib/libc/stdlib/strtol.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*      $OpenBSD: strtol.c,v 1.12 2017/07/06 16:23:11 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 <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
-/*
- * Convert a string to a long integer.
- *
- * Ignores `locale' stuff.  Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-long
-strtol(const char *nptr, char **endptr, int base)
-{
-        const char *s;
-        long acc, cutoff;
-        int c;
-        int neg, any, cutlim;
-
-        /*
-         * Ensure that base is between 2 and 36 inclusive, or the special
-         * value of 0.
-         */
-        if (base < 0 || base == 1 || base > 36) {
-                if (endptr != 0)
-                        *endptr = (char *)nptr;
-                errno = EINVAL;
-                return 0;
-        }
-
-        /*
-         * 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') && isxdigit((unsigned char)s[1])) {
-                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 longs is
-         * [-2147483648..2147483647] and the input base is 10,
-         * cutoff will be set to 214748364 and cutlim to either
-         * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
-         * a value > 214748364, 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 ? LONG_MIN : LONG_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 = 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 (endptr != 0)
-                *endptr = (char *) (any ? s - 1 : nptr);
-        return (acc);
-}
-DEF_STRONG(strtol);
diff --git a/src/lib/libc/stdlib/strtoll.c b/src/lib/libc/stdlib/strtoll.c
deleted file mode 100644
index d21a249a0b..0000000000
--- a/src/lib/libc/stdlib/strtoll.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*      $OpenBSD: strtoll.c,v 1.10 2017/07/06 16:23:11 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 <sys/types.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
-/*
- * Convert a string to a long long.
- *
- * Ignores `locale' stuff.  Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-long long
-strtoll(const char *nptr, char **endptr, int base)
-{
-        const char *s;
-        long long acc, cutoff;
-        int c;
-        int neg, any, cutlim;
-
-        /*
-         * Ensure that base is between 2 and 36 inclusive, or the special
-         * value of 0.
-         */
-        if (base < 0 || base == 1 || base > 36) {
-                if (endptr != 0)
-                        *endptr = (char *)nptr;
-                errno = EINVAL;
-                return 0;
-        }
-
-        /*
-         * 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') && isxdigit((unsigned char)s[1])) {
-                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 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
-         * 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 ? LLONG_MIN : LLONG_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 = 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 (endptr != 0)
-                *endptr = (char *) (any ? s - 1 : nptr);
-        return (acc);
-}
-DEF_STRONG(strtoll);
-
-__weak_alias(strtoq, strtoll);
diff --git a/src/lib/libc/stdlib/strtonum.3 b/src/lib/libc/stdlib/strtonum.3
deleted file mode 100644
index 43df0edc78..0000000000
--- a/src/lib/libc/stdlib/strtonum.3
+++ /dev/null
@@ -1,152 +0,0 @@
-.\" $OpenBSD: strtonum.3,v 1.18 2016/02/07 20:50:24 mmcc 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 $Mdocdate: February 7 2016 $
-.Dt STRTONUM 3
-.Os
-.Sh NAME
-.Nm strtonum
-.Nd reliably convert string value to an integer
-.Sh SYNOPSIS
-.In 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 != NULL)
-        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 Qq too large
-The result was larger than the provided maximum value.
-.It Qq too small
-The result was smaller than the provided minimum value.
-.It Qq 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
deleted file mode 100644
index ad22d1c30c..0000000000
--- a/src/lib/libc/stdlib/strtonum.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*      $OpenBSD: strtonum.c,v 1.8 2015/09/13 08:31:48 guenther 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;
-        int error = 0;
-        char *ep;
-        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);
-}
-DEF_WEAK(strtonum);
diff --git a/src/lib/libc/stdlib/strtoul.3 b/src/lib/libc/stdlib/strtoul.3
deleted file mode 100644
index dd5668d1d6..0000000000
--- a/src/lib/libc/stdlib/strtoul.3
+++ /dev/null
@@ -1,260 +0,0 @@
-.\" 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: strtoul.3,v 1.24 2014/11/30 21:21:59 schwarze Exp $
-.\"
-.Dd $Mdocdate: November 30 2014 $
-.Dt STRTOUL 3
-.Os
-.Sh NAME
-.Nm strtoul ,
-.Nm strtoull ,
-.Nm strtoumax ,
-.Nm strtouq
-.Nd convert a string to an unsigned long, unsigned long long or uintmax_t integer
-.Sh SYNOPSIS
-.In limits.h
-.In stdlib.h
-.Ft unsigned long
-.Fn strtoul "const char *nptr" "char **endptr" "int base"
-.Ft unsigned long long
-.Fn strtoull "const char *nptr" "char **endptr" "int base"
-.In inttypes.h
-.Ft uintmax_t
-.Fn strtoumax "const char *nptr" "char **endptr" "int base"
-.In sys/types.h
-.In limits.h
-.In stdlib.h
-.Ft u_quad_t
-.Fn strtouq "const char *nptr" "char **endptr" "int base"
-.Sh DESCRIPTION
-The
-.Fn strtoul
-function converts the string in
-.Fa nptr
-to an
-.Vt unsigned long
-value.
-The
-.Fn strtoull
-function converts the string in
-.Fa nptr
-to an
-.Vt unsigned long long
-value.
-The
-.Fn strtoumax
-function converts the string in
-.Fa nptr
-to a
-.Vt 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 a number between 2 and 36 inclusive 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 whitespace
-(as determined by
-.Xr isspace 3 )
-followed by a single optional
-.Ql +
-or
-.Ql -
-sign.
-If
-.Fa base
-is zero or 16, the string may then include a
-.Ql 0x
-prefix, and the number will be read in base 16; otherwise, a zero
-.Fa base
-is taken as 10 (decimal) unless the next character is
-.Ql 0 ,
-in which case it is taken as 8 (octal).
-.Pp
-The remainder of the string is converted to an
-.Vt unsigned long ,
-.Vt unsigned long long ,
-or
-.Vt uintmax_t
-value in the obvious manner,
-stopping at the first character which is not a valid digit
-in the given base.
-(In bases above 10, the letter
-.Ql A
-in either upper or lower case represents 10,
-.Ql B
-represents 11, and so forth, with
-.Ql Z
-representing 35.)
-.Pp
-If
-.Fa endptr
-is non-null,
-.Fn strtoul
-stores the address of the first invalid character in
-.Fa *endptr .
-If there were no digits at all, however,
-.Fn strtoul
-stores the original value of
-.Fa nptr
-in
-.Fa *endptr .
-(Thus, if
-.Fa *nptr
-is not
-.Ql \e0
-but
-.Fa **endptr
-is
-.Ql \e0
-on return, the entire string was valid.)
-.Sh RETURN VALUES
-The
-.Fn strtoul ,
-.Fn strtoull ,
-.Fn strtoumax
-and
-.Fn strtouq
-functions return either the result of the conversion or,
-if there was a leading minus sign,
-the negation of the result of the conversion,
-unless the original (non-negated) value would overflow.
-If overflow occurs,
-.Fn strtoul
-returns
-.Dv ULONG_MAX ,
-.Fn strtoull
-returns
-.Dv ULLONG_MAX ,
-.Fn strtoumax
-returns
-.Dv UINTMAX_MAX ,
-.Fn strtouq
-returns
-.Dv ULLONG_MAX
-and the global variable
-.Va errno
-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.
-.Pp
-If there is no valid digit, 0 is returned.
-If
-.Ar base
-is invalid, 0 is returned and the global variable
-.Va errno
-is set to
-.Er EINVAL .
-.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 EINVAL
-The value of
-.Ar base
-was neither between 2 and 36 inclusive nor the special value 0.
-.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 strtoull ,
-and
-.Fn strtoumax
-functions conform to
-.St -isoC-99 .
-Setting
-.Va errno
-to
-.Dv EINVAL
-is an extension to that standard required by
-.St -p1003.1-2008 .
-.Pp
-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
deleted file mode 100644
index 6667bea8fa..0000000000
--- a/src/lib/libc/stdlib/strtoul.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*      $OpenBSD: strtoul.c,v 1.11 2017/07/06 16:23:11 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 <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
-/*
- * Convert a string to an unsigned long integer.
- *
- * Ignores `locale' stuff.  Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-unsigned long
-strtoul(const char *nptr, char **endptr, int base)
-{
-        const char *s;
-        unsigned long acc, cutoff;
-        int c;
-        int neg, any, cutlim;
-
-        /*
-         * See strtol for comments as to the logic used.
-         */
-        if (base < 0 || base == 1 || base > 36) {
-                if (endptr != 0)
-                        *endptr = (char *)nptr;
-                errno = EINVAL;
-                return 0;
-        }
-
-        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') && isxdigit((unsigned char)s[1])) {
-                c = s[1];
-                s += 2;
-                base = 16;
-        }
-        if (base == 0)
-                base = c == '0' ? 8 : 10;
-
-        cutoff = ULONG_MAX / (unsigned long)base;
-        cutlim = ULONG_MAX % (unsigned long)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 = ULONG_MAX;
-                        errno = ERANGE;
-                } else {
-                        any = 1;
-                        acc *= (unsigned long)base;
-                        acc += c;
-                }
-        }
-        if (neg && any > 0)
-                acc = -acc;
-        if (endptr != 0)
-                *endptr = (char *) (any ? s - 1 : nptr);
-        return (acc);
-}
-DEF_STRONG(strtoul);
diff --git a/src/lib/libc/stdlib/strtoull.c b/src/lib/libc/stdlib/strtoull.c
deleted file mode 100644
index d7733e4003..0000000000
--- a/src/lib/libc/stdlib/strtoull.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*      $OpenBSD: strtoull.c,v 1.9 2017/07/06 16:23:11 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 <sys/types.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
-/*
- * Convert a string to an unsigned long long.
- *
- * Ignores `locale' stuff.  Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-unsigned long long
-strtoull(const char *nptr, char **endptr, int base)
-{
-        const char *s;
-        unsigned long long acc, cutoff;
-        int c;
-        int neg, any, cutlim;
-
-        /*
-         * See strtoll for comments as to the logic used.
-         */
-        if (base < 0 || base == 1 || base > 36) {
-                if (endptr != 0)
-                        *endptr = (char *)nptr;
-                errno = EINVAL;
-                return 0;
-        }
-
-        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') && isxdigit((unsigned char)s[1])) {
-                c = s[1];
-                s += 2;
-                base = 16;
-        }
-        if (base == 0)
-                base = c == '0' ? 8 : 10;
-
-        cutoff = ULLONG_MAX / (unsigned long long)base;
-        cutlim = ULLONG_MAX % (unsigned long long)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 = ULLONG_MAX;
-                        errno = ERANGE;
-                } else {
-                        any = 1;
-                        acc *= (unsigned long long)base;
-                        acc += c;
-                }
-        }
-        if (neg && any > 0)
-                acc = -acc;
-        if (endptr != 0)
-                *endptr = (char *) (any ? s - 1 : nptr);
-        return (acc);
-}
-DEF_STRONG(strtoull);
-
-__weak_alias(strtouq, strtoull);
diff --git a/src/lib/libc/stdlib/strtoumax.c b/src/lib/libc/stdlib/strtoumax.c
deleted file mode 100644
index 348184c1ac..0000000000
--- a/src/lib/libc/stdlib/strtoumax.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*      $OpenBSD: strtoumax.c,v 1.4 2017/07/06 16:23:11 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 strtoimax for comments as to the logic used.
-         */
-        if (base < 0 || base == 1 || base > 36) {
-                if (endptr != 0)
-                        *endptr = (char *)nptr;
-                errno = EINVAL;
-                return 0;
-        }
-
-        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') && isxdigit((unsigned char)s[1])) {
-                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);
-}
-DEF_STRONG(strtoumax);
diff --git a/src/lib/libc/stdlib/system.3 b/src/lib/libc/stdlib/system.3
deleted file mode 100644
index bdd94c0115..0000000000
--- a/src/lib/libc/stdlib/system.3
+++ /dev/null
@@ -1,116 +0,0 @@
-.\" Copyright (c) 1990, 1991 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
-.\" 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: system.3,v 1.14 2016/02/05 18:09:19 espie Exp $
-.\"
-.Dd $Mdocdate: February 5 2016 $
-.Dt SYSTEM 3
-.Os
-.Sh NAME
-.Nm system
-.Nd pass a command to the shell
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn system "const char *string"
-.Sh DESCRIPTION
-The
-.Fn system
-function hands the argument
-.Fa string
-to the command interpreter
-.Xr sh 1 .
-The calling process waits for the shell to finish executing the command,
-ignoring
-.Dv SIGINT
-and
-.Dv SIGQUIT ,
-and blocking
-.Dv SIGCHLD .
-.Pp
-If
-.Fa string
-is
-.Dv NULL ,
-.Fn system
-will return non-zero.
-Otherwise,
-.Fn system
-returns the termination status of the shell in the format specified by
-.Xr waitpid 2 .
-.Pp
-Note that fork handlers established using
-.Xr pthread_atfork 3
-are not called when a multithreaded program calls
-.Fn system .
-.Sh RETURN VALUES
-If a child process cannot be created, or the termination status of
-the shell cannot be obtained,
-.Fn system
-returns \-1 and sets
-.Va errno
-to indicate the error.
-If execution of the shell fails,
-.Fn system
-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 waitpid 2 ,
-.Xr popen 3
-.Sh STANDARDS
-The
-.Fn system
-function conforms to
-.St -ansiC
-and
-.St -p1003.2-92 .
-.Sh HISTORY
-The
-.Fn system
-function first appeared in
-.At v6 .
-.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.
-.Pp
-It is often simpler to bypass the shell and run an external command using
-.Xr fork 2 ,
-.Xr execlp 3 ,
-and
-.Xr waitpid 2
-directly instead of having to sanitize a string for shell consumption.
diff --git a/src/lib/libc/stdlib/system.c b/src/lib/libc/stdlib/system.c
deleted file mode 100644
index fe718276b9..0000000000
--- a/src/lib/libc/stdlib/system.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*      $OpenBSD: system.c,v 1.12 2016/03/13 18:34:21 guenther Exp $ */
-/*
- * Copyright (c) 1988 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 <sys/types.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <paths.h>
-
-int
-system(const char *command)
-{
-        pid_t pid, cpid;
-        struct sigaction intsave, quitsave;
-        sigset_t mask, omask;
-        int pstat;
-        char *argp[] = {"sh", "-c", NULL, NULL};
-
-        if (!command)           /* just checking... */
-                return(1);
-
-        argp[2] = (char *)command;
-
-        sigemptyset(&mask);
-        sigaddset(&mask, SIGCHLD);
-        sigprocmask(SIG_BLOCK, &mask, &omask);
-        switch (cpid = vfork()) {
-        case -1:                        /* error */
-                sigprocmask(SIG_SETMASK, &omask, NULL);
-                return(-1);
-        case 0:                         /* child */
-                sigprocmask(SIG_SETMASK, &omask, NULL);
-                execve(_PATH_BSHELL, argp, environ);
-                _exit(127);
-        }
-
-        sigaction(SIGINT, NULL, &intsave);
-        sigaction(SIGQUIT, NULL, &quitsave);
-        do {
-                pid = waitpid(cpid, &pstat, 0);
-        } while (pid == -1 && errno == EINTR);
-        sigprocmask(SIG_SETMASK, &omask, NULL);
-        sigaction(SIGINT, &intsave, NULL);
-        sigaction(SIGQUIT, &quitsave, NULL);
-        return (pid == -1 ? -1 : pstat);
-}
-DEF_STRONG(system);
diff --git a/src/lib/libc/stdlib/tfind.c b/src/lib/libc/stdlib/tfind.c
deleted file mode 100644
index 49f9dbc17a..0000000000
--- a/src/lib/libc/stdlib/tfind.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*      $OpenBSD: tfind.c,v 1.7 2015/09/26 16:03:48 guenther 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
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-#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/thread_atexit.c b/src/lib/libc/stdlib/thread_atexit.c
deleted file mode 100644
index ef0423c428..0000000000
--- a/src/lib/libc/stdlib/thread_atexit.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*      $OpenBSD: thread_atexit.c,v 1.2 2019/06/02 01:03:01 guenther Exp $ */
-/*
- * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
- *
- * 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 <dlfcn.h>
-#include <stdlib.h>
-#include <tib.h>
-
-#include "atexit.h"
-
-__weak_alias(__cxa_thread_atexit, __cxa_thread_atexit_impl);
-
-int
-__cxa_thread_atexit_impl(void (*func)(void *), void *arg, void *dso)
-{
-        struct thread_atexit_fn *fnp;
-        struct tib *tib = TIB_GET();
-
-        fnp = calloc(1, sizeof(struct thread_atexit_fn));
-        if (fnp == NULL)
-                return -1;
-
-        dlctl(NULL, DL_REFERENCE, dso);
-
-        fnp->func = func;
-        fnp->arg = arg;
-        fnp->next = tib->tib_atexit;
-        tib->tib_atexit = fnp;
-
-        return 0;
-}
diff --git a/src/lib/libc/stdlib/tsearch.3 b/src/lib/libc/stdlib/tsearch.3
deleted file mode 100644
index cd90435614..0000000000
--- a/src/lib/libc/stdlib/tsearch.3
+++ /dev/null
@@ -1,126 +0,0 @@
-.\" $OpenBSD: tsearch.3,v 1.21 2019/01/25 00:19:25 millert Exp $
-.\"
-.\" Copyright (c) 1997 Todd C. Miller <millert@openbsd.org>
-.\"
-.\" 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 $Mdocdate: January 25 2019 $
-.Dt TSEARCH 3
-.Os
-.Sh NAME
-.Nm tsearch ,
-.Nm tfind ,
-.Nm tdelete ,
-.Nm twalk
-.Nd manipulate binary search trees
-.Sh SYNOPSIS
-.In 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.
-If the node to be deleted is the root of the binary search tree,
-.Fa rootp
-will be adjusted and an unspecified non-null pointer will be returned.
-It takes the same arguments as
-.Fn tfind
-and
-.Fn tsearch .
-.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 tdelete
-returns a pointer to the parent of the deleted node or an unspecified
-non-null pointer if the root node is deleted.
-.Pp
-.Fn tfind ,
-.Fn tsearch ,
-and
-.Fn tdelete
-return
-.Dv NULL
-if
-.Fa rootp
-is
-.Dv NULL
-or the datum cannot be found.
-.Sh SEE ALSO
-.Xr bsearch 3 ,
-.Xr lsearch 3
-.Sh STANDARDS
-These functions conform to
-.St -p1003.1-2008 .
-.Sh CAVEATS
-The value returned when deleting the root node was unspecified before
-the
-.St -p1003.1-2008
-standard, so users of the
-.Fn tdelete
-function should be wary of relying on a specific behaviour.
diff --git a/src/lib/libc/stdlib/tsearch.c b/src/lib/libc/stdlib/tsearch.c
deleted file mode 100644
index 1dd31454eb..0000000000
--- a/src/lib/libc/stdlib/tsearch.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*      $OpenBSD: tsearch.c,v 1.10 2015/09/26 16:03:48 guenther 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
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#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 = 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 *)1;
-    node *q;
-    node *r;
-    int cmp;
-
-    if (rootp == (struct node_t **)0 || *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;
-        }
-    }
-    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);
-}
diff --git a/src/lib/libc/string/Makefile.inc b/src/lib/libc/string/Makefile.inc
deleted file mode 100644
index a1b1934aad..0000000000
--- a/src/lib/libc/string/Makefile.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-#       $OpenBSD: Makefile.inc,v 1.39 2017/09/05 03:16:13 schwarze Exp $
-
-# string sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/string ${LIBCSRCDIR}/string
-
-SRCS+=  explicit_bzero.c memccpy.c memmem.c memrchr.c stpcpy.c stpncpy.c \
-        strcasecmp.c strcasecmp_l.c strcasestr.c strcoll.c strcoll_l.c \
-        strdup.c strerror.c strerror_l.c strerror_r.c strmode.c \
-        strndup.c strnlen.c strsignal.c strtok.c strxfrm.c strxfrm_l.c \
-        timingsafe_bcmp.c timingsafe_memcmp.c \
-        wcscat.c wcschr.c wcscmp.c wcscpy.c wcscspn.c wcslcat.c wcslcpy.c \
-        wcslen.c wcsncat.c wcsncmp.c wcsncpy.c wcspbrk.c wcsrchr.c wcsspn.c \
-        wcsstr.c wcstok.c wcswcs.c wcswidth.c wmemchr.c wmemcmp.c wmemcpy.c \
-        wmemmove.c wmemset.c wcsdup.c wcscasecmp.c wcscasecmp_l.c
-
-# machine-dependent net sources
-# ../arch/ARCH/Makefile.inc must include sources for:
-#       bcmp() bcopy() bzero() ffs() index() memchr() memcmp() memset()
-#       memcpy() memmove() memset() rindex() strcat() strchr()
-#       strcmp() strcpy() strcspn() strlen() strlcat() strlcpy()
-#       strncat() strncmp() strncpy() strpbrk() strrchr() strsep()
-#       strspn() strstr() swab()
-
-.include "${LIBCSRCDIR}/arch/${MACHINE_CPU}/string/Makefile.inc"
-
-MAN+=   bcmp.3 bcopy.3 bzero.3 ffs.3 memccpy.3 memchr.3 \
-        memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 stpcpy.3 strcasecmp.3 \
-        strcat.3 strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 \
-        strerror.3 strlen.3 strmode.3 strncat.3 strncpy.3 strpbrk.3 \
-        strrchr.3 strsep.3 strsignal.3 strspn.3 strstr.3 strtok.3 strxfrm.3 \
-        swab.3 strlcpy.3 timingsafe_bcmp.3 \
-        wcscasecmp.3 wcscat.3 wcschr.3 wcscmp.3 wcscpy.3 \
-        wcscspn.3 wcsdup.3 wcslcpy.3 wcslen.3 wcspbrk.3 wcsrchr.3 wcsspn.3 \
-        wcsstr.3 wcstok.3 wcswidth.3 wmemchr.3 wmemcmp.3 wmemcpy.3 wmemmove.3 \
-        wmemset.3
diff --git a/src/lib/libc/string/bcmp.3 b/src/lib/libc/string/bcmp.3
deleted file mode 100644
index a3cb1dfb74..0000000000
--- a/src/lib/libc/string/bcmp.3
+++ /dev/null
@@ -1,67 +0,0 @@
-.\" 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.
-.\" 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: bcmp.3,v 1.12 2015/11/24 09:14:35 daniel Exp $
-.\"
-.Dd $Mdocdate: November 24 2015 $
-.Dt BCMP 3
-.Os
-.Sh NAME
-.Nm bcmp
-.Nd compare byte string
-.Sh SYNOPSIS
-.In strings.h
-.Ft int
-.Fn bcmp "const void *b1" "const void *b2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn bcmp
-function compares byte string
-.Fa b1
-against byte string
-.Fa b2 ,
-returning zero if they are identical, non-zero otherwise.
-Both strings are assumed to be
-.Fa len
-bytes long.
-Zero-length strings are always identical.
-.Pp
-The strings may overlap.
-.Sh SEE ALSO
-.Xr memcmp 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3 ,
-.Xr timingsafe_bcmp 3
-.Sh HISTORY
-The
-.Fn bcmp
-function first appeared in
-.Bx 4.2 .
diff --git a/src/lib/libc/string/bcmp.c b/src/lib/libc/string/bcmp.c
deleted file mode 100644
index 5d446bf096..0000000000
--- a/src/lib/libc/string/bcmp.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*      $OpenBSD: bcmp.c,v 1.11 2015/08/31 02:53:57 guenther Exp $      */
-
-/*
- * Copyright (c) 1987 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 <string.h>
-
-/*
- * bcmp -- vax cmpc3 instruction
- */
-int
-bcmp(const void *b1, const void *b2, size_t length)
-{
-        char *p1, *p2;
-
-        if (length == 0)
-                return (0);
-        p1 = (char *)b1;
-        p2 = (char *)b2;
-        do
-                if (*p1++ != *p2++)
-                        return (1);
-        while (--length);
-        return (0);
-}
-DEF_WEAK(bcmp);
diff --git a/src/lib/libc/string/bcopy.3 b/src/lib/libc/string/bcopy.3
deleted file mode 100644
index 68c63f92ec..0000000000
--- a/src/lib/libc/string/bcopy.3
+++ /dev/null
@@ -1,67 +0,0 @@
-.\" 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.
-.\"
-.\" 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: bcopy.3,v 1.12 2015/11/24 09:14:35 daniel Exp $
-.\"
-.Dd $Mdocdate: November 24 2015 $
-.Dt BCOPY 3
-.Os
-.Sh NAME
-.Nm bcopy
-.Nd copy bytes
-.Sh SYNOPSIS
-.In strings.h
-.Ft void
-.Fn bcopy "const void *src" "void *dst" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn bcopy
-function copies
-.Fa len
-bytes from buffer
-.Fa src
-to buffer
-.Fa dst .
-The two buffers may overlap.
-If
-.Fa len
-is zero, no bytes are copied.
-.Sh SEE ALSO
-.Xr memccpy 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3 ,
-.Xr strlcpy 3 ,
-.Xr strncpy 3
-.Sh HISTORY
-The
-.Fn bcopy
-function first appeared in
-.Bx 4.2 .
diff --git a/src/lib/libc/string/bcopy.c b/src/lib/libc/string/bcopy.c
deleted file mode 100644
index ef0d368053..0000000000
--- a/src/lib/libc/string/bcopy.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*      $OpenBSD: bcopy.c,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-/*
- * sizeof(word) MUST BE A POWER OF TWO
- * SO THAT wmask BELOW IS ALL ONES
- */
-typedef long word;              /* "word" used for optimal copy speed */
-
-#define wsize   sizeof(word)
-#define wmask   (wsize - 1)
-
-/*
- * Copy a block of memory, handling overlap.
- */
-void
-bcopy(const void *src0, void *dst0, size_t length)
-{
-        char *dst = dst0;
-        const char *src = src0;
-        size_t t;
-
-        if (length == 0 || dst == src)          /* nothing to do */
-                goto done;
-
-        /*
-         * Macros: loop-t-times; and loop-t-times, t>0
-         */
-#define TLOOP(s) if (t) TLOOP1(s)
-#define TLOOP1(s) do { s; } while (--t)
-
-        if ((unsigned long)dst < (unsigned long)src) {
-                /*
-                 * Copy forward.
-                 */
-                t = (long)src;  /* only need low bits */
-                if ((t | (long)dst) & wmask) {
-                        /*
-                         * Try to align operands.  This cannot be done
-                         * unless the low bits match.
-                         */
-                        if ((t ^ (long)dst) & wmask || length < wsize)
-                                t = length;
-                        else
-                                t = wsize - (t & wmask);
-                        length -= t;
-                        TLOOP1(*dst++ = *src++);
-                }
-                /*
-                 * Copy whole words, then mop up any trailing bytes.
-                 */
-                t = length / wsize;
-                TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
-                t = length & wmask;
-                TLOOP(*dst++ = *src++);
-        } else {
-                /*
-                 * Copy backwards.  Otherwise essentially the same.
-                 * Alignment works as before, except that it takes
-                 * (t&wmask) bytes to align, not wsize-(t&wmask).
-                 */
-                src += length;
-                dst += length;
-                t = (long)src;
-                if ((t | (long)dst) & wmask) {
-                        if ((t ^ (long)dst) & wmask || length <= wsize)
-                                t = length;
-                        else
-                                t &= wmask;
-                        length -= t;
-                        TLOOP1(*--dst = *--src);
-                }
-                t = length / wsize;
-                TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src);
-                t = length & wmask;
-                TLOOP(*--dst = *--src);
-        }
-done:
-        return;
-}
-DEF_WEAK(bcopy);
diff --git a/src/lib/libc/string/bzero.3 b/src/lib/libc/string/bzero.3
deleted file mode 100644
index 87a23e20bb..0000000000
--- a/src/lib/libc/string/bzero.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" 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.
-.\" 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: bzero.3,v 1.13 2017/10/12 15:22:32 schwarze Exp $
-.\"
-.Dd $Mdocdate: October 12 2017 $
-.Dt BZERO 3
-.Os
-.Sh NAME
-.Nm bzero ,
-.Nm explicit_bzero
-.Nd write zeroes to a byte string
-.Sh SYNOPSIS
-.In strings.h
-.Ft void
-.Fn bzero "void *b" "size_t len"
-.In string.h
-.Ft void
-.Fn explicit_bzero "void *b" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn bzero
-function writes
-.Fa len
-zero bytes to the string
-.Fa b .
-If
-.Fa len
-is zero,
-.Fn bzero
-does nothing.
-.Pp
-The
-.Fn explicit_bzero
-variant behaves the same, but will not be removed by a compiler's dead store
-optimization pass, making it useful for clearing sensitive memory such as a
-password.
-.Sh SEE ALSO
-.Xr memset 3 ,
-.Xr swab 3
-.Sh STANDARDS
-The
-.Fn bzero
-function conforms to the X/Open System Interfaces option of the
-.St -p1003.1-2004
-specification.
-It was removed from the standard in
-.St -p1003.1-2008 ,
-which recommends using
-.Xr memset 3
-instead.
-.Pp
-The
-.Fn explicit_bzero
-function is an
-.Ox
-extension.
-.Sh HISTORY
-The
-.Fn bzero
-function first appeared in
-.Bx 4.2 .
-The
-.Fn explicit_bzero
-function first appeared in
-.Ox 5.5 .
diff --git a/src/lib/libc/string/bzero.c b/src/lib/libc/string/bzero.c
deleted file mode 100644
index 5173de26dd..0000000000
--- a/src/lib/libc/string/bzero.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*      $OpenBSD: bzero.c,v 1.9 2015/08/31 02:53:57 guenther Exp $      */
-
-/*
- * Copyright (c) 1987 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 <string.h>
-
-/*
- * bzero -- vax movc5 instruction
- */
-void
-bzero(void *b, size_t length)
-{
-        char *p;
-
-        for (p = b; length--;)
-                *p++ = '\0';
-}
-DEF_WEAK(bzero);
diff --git a/src/lib/libc/string/explicit_bzero.c b/src/lib/libc/string/explicit_bzero.c
deleted file mode 100644
index 003ea7cc4c..0000000000
--- a/src/lib/libc/string/explicit_bzero.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*      $OpenBSD: explicit_bzero.c,v 1.4 2015/08/31 02:53:57 guenther Exp $ */
-/*
- * Public domain.
- * Written by Matthew Dempsky.
- */
-
-#include <string.h>
-
-__attribute__((weak)) void
-__explicit_bzero_hook(void *buf, size_t len)
-{
-}
-
-void
-explicit_bzero(void *buf, size_t len)
-{
-        memset(buf, 0, len);
-        __explicit_bzero_hook(buf, len);
-}
-DEF_WEAK(explicit_bzero);
diff --git a/src/lib/libc/string/ffs.3 b/src/lib/libc/string/ffs.3
deleted file mode 100644
index e78ab99e8f..0000000000
--- a/src/lib/libc/string/ffs.3
+++ /dev/null
@@ -1,61 +0,0 @@
-.\" 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.
-.\" 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: ffs.3,v 1.11 2019/08/30 18:35:03 deraadt Exp $
-.\"
-.Dd $Mdocdate: August 30 2019 $
-.Dt FFS 3
-.Os
-.Sh NAME
-.Nm ffs
-.Nd find first bit set in a bit string
-.Sh SYNOPSIS
-.In strings.h
-.Ft int
-.Fn ffs "int value"
-.Sh DESCRIPTION
-The
-.Fn ffs
-function finds the first bit set in
-.Fa value
-and returns the index of that bit.
-Bits are numbered starting from 1, starting at the rightmost bit.
-A return value of 0 means that the argument was zero.
-.Sh SEE ALSO
-.Xr bit_ffs 3
-.Sh STANDARDS
-The
-.Fn ffs
-function conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn ffs
-function first appeared in
-.Bx 4.2 .
diff --git a/src/lib/libc/string/ffs.c b/src/lib/libc/string/ffs.c
deleted file mode 100644
index 09d6e35eca..0000000000
--- a/src/lib/libc/string/ffs.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*      $OpenBSD: ffs.c,v 1.10 2018/01/18 08:23:44 guenther Exp $       */
-
-/*
- * Public domain.
- * Written by Dale Rahn.
- */
-
-#include <string.h>
-
-/*
- * ffs -- vax ffs instruction
- */
-int
-ffs(int mask)
-{
-        int bit;
-        unsigned int r = mask;
-        static const signed char t[16] = {
-                -28, 1, 2, 1,
-                  3, 1, 2, 1,
-                  4, 1, 2, 1,
-                  3, 1, 2, 1
-        };
-
-        bit = 0;
-        if (!(r & 0xffff)) {
-                bit += 16;
-                r >>= 16;
-        }
-        if (!(r & 0xff)) {
-                bit += 8;
-                r >>= 8;
-        }
-        if (!(r & 0xf)) {
-                bit += 4;
-                r >>= 4;
-        }
-
-        return (bit + t[ r & 0xf ]);
-}
diff --git a/src/lib/libc/string/memccpy.3 b/src/lib/libc/string/memccpy.3
deleted file mode 100644
index 98326d6871..0000000000
--- a/src/lib/libc/string/memccpy.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\"     $OpenBSD: memccpy.3,v 1.12 2013/09/25 21:49:30 millert 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.
-.\"
-.\"     @(#)memccpy.3   8.1 (Berkeley) 6/9/93
-.\"
-.Dd $Mdocdate: September 25 2013 $
-.Dt MEMCCPY 3
-.Os
-.Sh NAME
-.Nm memccpy
-.Nd copy string until character found
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memccpy "void *dst" "const void *src" "int c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memccpy
-function copies bytes from string
-.Fa src
-to string
-.Fa dst .
-If the character
-.Fa c
-(as converted to an
-.Li unsigned char )
-occurs in the string
-.Fa src ,
-the copy stops and a pointer to the byte after the copy of
-.Fa c
-in the string
-.Fa dst
-is returned.
-Otherwise,
-.Fa len
-bytes are copied, and a null pointer is returned.
-.Pp
-If the
-.Fa src
-and
-.Fa dst
-strings overlap, the behavior is undefined.
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3 ,
-.Xr strlcpy 3
-.Sh HISTORY
-The
-.Fn memccpy
-function first appeared in
-.At V
-and was reimplemented for
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/string/memccpy.c b/src/lib/libc/string/memccpy.c
deleted file mode 100644
index 635061b8cb..0000000000
--- a/src/lib/libc/string/memccpy.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*      $OpenBSD: memccpy.c,v 1.7 2015/08/31 02:53:57 guenther 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 <string.h>
-
-void *
-memccpy(void *t, const void *f, int c, size_t n)
-{
-
-        if (n) {
-                unsigned char *tp = t;
-                const unsigned char *fp = f;
-                unsigned char uc = c;
-                do {
-                        if ((*tp++ = *fp++) == uc)
-                                return (tp);
-                } while (--n != 0);
-        }
-        return (0);
-}
-DEF_WEAK(memccpy);
diff --git a/src/lib/libc/string/memchr.3 b/src/lib/libc/string/memchr.3
deleted file mode 100644
index 8d8a9ddf9c..0000000000
--- a/src/lib/libc/string/memchr.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"     $OpenBSD: memchr.3,v 1.12 2014/04/07 17:57:56 schwarze Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: April 7 2014 $
-.Dt MEMCHR 3
-.Os
-.Sh NAME
-.Nm memchr ,
-.Nm memrchr
-.Nd locate byte in byte string
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memchr "const void *b" "int c" "size_t len"
-.Ft void *
-.Fn memrchr "const void *b" "int c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memchr
-function locates the first occurrence of
-.Fa c
-(converted to an
-.Li unsigned char )
-in string
-.Fa b .
-.Pp
-The
-.Fn memrchr
-function behaves like
-.Fn memchr ,
-except that it locates the last occurrence of
-.Fa c
-in string
-.Fa b .
-.Sh RETURN VALUES
-The
-.Fn memchr
-and
-.Fn memrchr
-functions return a pointer to the byte located, or
-.Dv NULL
-if no such byte exists within
-.Fa len
-bytes.
-.Sh SEE ALSO
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr wmemchr 3
-.Sh STANDARDS
-The
-.Fn memchr
-function conforms to
-.St -ansiC .
-.Pp
-The
-.Fn memrchr
-function is an
-.Ox
-extension.
-.Sh HISTORY
-The
-.Fn memchr
-function first appeared in
-.At V
-and was reimplemented for
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/string/memchr.c b/src/lib/libc/string/memchr.c
deleted file mode 100644
index a6a4bd60d0..0000000000
--- a/src/lib/libc/string/memchr.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*      $OpenBSD: memchr.c,v 1.8 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-void *
-memchr(const void *s, int c, size_t n)
-{
-        if (n != 0) {
-                const unsigned char *p = s;
-
-                do {
-                        if (*p++ == (unsigned char)c)
-                                return ((void *)(p - 1));
-                } while (--n != 0);
-        }
-        return (NULL);
-}
-DEF_STRONG(memchr);
diff --git a/src/lib/libc/string/memcmp.3 b/src/lib/libc/string/memcmp.3
deleted file mode 100644
index 25d308e617..0000000000
--- a/src/lib/libc/string/memcmp.3
+++ /dev/null
@@ -1,86 +0,0 @@
-.\"     $OpenBSD: memcmp.3,v 1.9 2014/06/13 02:12:17 matthew Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 13 2014 $
-.Dt MEMCMP 3
-.Os
-.Sh NAME
-.Nm memcmp
-.Nd compare byte string
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn memcmp "const void *b1" "const void *b2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memcmp
-function compares byte string
-.Fa b1
-against byte string
-.Fa b2 .
-Both strings are assumed to be
-.Fa len
-bytes long.
-.Sh RETURN VALUES
-The
-.Fn memcmp
-function returns zero if the two strings are identical,
-otherwise returns the difference between the first two differing bytes
-(treated as
-.Li unsigned char
-values, so that
-.Sq Li \e200
-is greater than
-.Sq Li \&\e0 ,
-for example).
-Zero-length strings are always identical.
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3 ,
-.Xr timingsafe_memcmp 3 ,
-.Xr wmemcmp 3
-.Sh STANDARDS
-The
-.Fn memcmp
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn memcmp
-function first appeared in
-.At V
-and was reimplemented for
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/string/memcmp.c b/src/lib/libc/string/memcmp.c
deleted file mode 100644
index 0df2c54d2a..0000000000
--- a/src/lib/libc/string/memcmp.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*      $OpenBSD: memcmp.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-/*
- * Compare memory regions.
- */
-int
-memcmp(const void *s1, const void *s2, size_t n)
-{
-        if (n != 0) {
-                const unsigned char *p1 = s1, *p2 = s2;
-
-                do {
-                        if (*p1++ != *p2++)
-                                return (*--p1 - *--p2);
-                } while (--n != 0);
-        }
-        return (0);
-}
-DEF_STRONG(memcmp);
diff --git a/src/lib/libc/string/memcpy.3 b/src/lib/libc/string/memcpy.3
deleted file mode 100644
index 8df2a785b9..0000000000
--- a/src/lib/libc/string/memcpy.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"     $OpenBSD: memcpy.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt MEMCPY 3
-.Os
-.Sh NAME
-.Nm memcpy
-.Nd copy bytes
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memcpy "void *dst" "const void *src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memcpy
-function copies
-.Fa len
-bytes from buffer
-.Fa src
-to buffer
-.Fa dst .
-If the two buffers may overlap,
-.Xr memmove 3
-must be used instead.
-.Sh RETURN VALUES
-The
-.Fn memcpy
-function returns the original value of
-.Fa dst .
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memccpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3 ,
-.Xr strlcpy 3 ,
-.Xr wmemcpy 3
-.Sh STANDARDS
-The
-.Fn memcpy
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn memcpy
-function first appeared in
-.At V
-and was reimplemented for
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/string/memcpy.c b/src/lib/libc/string/memcpy.c
deleted file mode 100644
index 19fddc0ab5..0000000000
--- a/src/lib/libc/string/memcpy.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*      $OpenBSD: memcpy.c,v 1.4 2017/11/29 05:13:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-#include <stdlib.h>
-#include <syslog.h>
-
-/*
- * sizeof(word) MUST BE A POWER OF TWO
- * SO THAT wmask BELOW IS ALL ONES
- */
-typedef long word;              /* "word" used for optimal copy speed */
-
-#define wsize   sizeof(word)
-#define wmask   (wsize - 1)
-
-static const char backwards_msg[] = ": backwards memcpy";
-
-/*
- * Copy a block of memory, not handling overlap.
- */
-void *
-memcpy(void *dst0, const void *src0, size_t length)
-{
-        char *dst = dst0;
-        const char *src = src0;
-        size_t t;
-
-        if (length == 0 || dst == src)          /* nothing to do */
-                goto done;
-
-        if ((dst < src && dst + length > src) ||
-            (src < dst && src + length > dst)) {
-                char buf[1024];
-
-                /* <10> is LOG_CRIT */
-                strlcpy(buf, "<10>", sizeof buf);
-
-                /* Make sure progname does not fill the whole buffer */
-                strlcat(buf, __progname, sizeof(buf) - sizeof backwards_msg);
-                strlcat(buf, backwards_msg, sizeof buf);
-
-                sendsyslog(buf, strlen(buf), LOG_CONS);
-                abort();
-        }
-
-        /*
-         * Macros: loop-t-times; and loop-t-times, t>0
-         */
-#define TLOOP(s) if (t) TLOOP1(s)
-#define TLOOP1(s) do { s; } while (--t)
-
-        /*
-         * Copy forward.
-         */
-        t = (long)src;  /* only need low bits */
-        if ((t | (long)dst) & wmask) {
-                /*
-                 * Try to align operands.  This cannot be done
-                 * unless the low bits match.
-                 */
-                if ((t ^ (long)dst) & wmask || length < wsize)
-                        t = length;
-                else
-                        t = wsize - (t & wmask);
-                length -= t;
-                TLOOP1(*dst++ = *src++);
-        }
-        /*
-         * Copy whole words, then mop up any trailing bytes.
-         */
-        t = length / wsize;
-        TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
-        t = length & wmask;
-        TLOOP(*dst++ = *src++);
-done:
-        return (dst0);
-}
-DEF_BUILTIN(memcpy);
diff --git a/src/lib/libc/string/memmem.3 b/src/lib/libc/string/memmem.3
deleted file mode 100644
index 3f17859083..0000000000
--- a/src/lib/libc/string/memmem.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"     $OpenBSD: memmem.3,v 1.3 2020/04/16 12:40:41 claudio Exp $
-.\"
-.\" Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com>
-.\"
-.\" 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 not be used to endorse or promote
-.\"    products derived from this software without specific prior written
-.\"    permission.
-.\"
-.\" 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 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)
-.\" 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 $Mdocdate: April 16 2020 $
-.Dt MEMMEM 3
-.Os
-.Sh NAME
-.Nm memmem
-.Nd locate a byte substring in a byte string
-.Sh SYNOPSIS
-.In string.h
-.Ft "void *"
-.Fo memmem
-.Fa "const void *big" "size_t big_len"
-.Fa "const void *little" "size_t little_len"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn memmem
-function
-locates the first occurrence of the byte string
-.Fa little
-in the byte string
-.Fa big .
-.Sh RETURN VALUES
-If
-.Fa little
-is zero length,
-.Fa big
-is returned; if
-.Fa little
-occurs nowhere in
-.Fa big ,
-.Dv NULL
-is returned;
-otherwise a pointer to the first character of the first occurrence of
-.Fa little
-is returned.
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strstr 3
-.Sh STANDARDS
-.Fn memmem
-is a GNU extension.
-.Sh HISTORY
-The
-.Fn memmem
-function first appeared in
-.Ox 5.4 .
diff --git a/src/lib/libc/string/memmem.c b/src/lib/libc/string/memmem.c
deleted file mode 100644
index 3b180b4a62..0000000000
--- a/src/lib/libc/string/memmem.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*      $OpenBSD: memmem.c,v 1.5 2020/04/16 12:39:28 claudio Exp $ */
-
-/*
- * Copyright (c) 2005-2020 Rich Felker, et al.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <string.h>
-#include <stdint.h>
-
-static char *
-twobyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
-{
-        uint16_t nw = n[0]<<8 | n[1], hw = h[0]<<8 | h[1];
-        for (h+=2, k-=2; k; k--, hw = hw<<8 | *h++)
-                if (hw == nw) return (char *)h-2;
-        return hw == nw ? (char *)h-2 : 0;
-}
-
-static char *
-threebyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
-{
-        uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8;
-        uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8;
-        for (h+=3, k-=3; k; k--, hw = (hw|*h++)<<8)
-                if (hw == nw) return (char *)h-3;
-        return hw == nw ? (char *)h-3 : 0;
-}
-
-static char *
-fourbyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
-{
-        uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8 | n[3];
-        uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8 | h[3];
-        for (h+=4, k-=4; k; k--, hw = hw<<8 | *h++)
-                if (hw == nw) return (char *)h-4;
-        return hw == nw ? (char *)h-4 : 0;
-}
-
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#define MIN(a,b) ((a)<(b)?(a):(b))
-
-#define BITOP(a,b,op) \
- ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a))))
-
-/*
- * Maxime Crochemore and Dominique Perrin, Two-way string-matching,
- * Journal of the ACM, 38(3):651-675, July 1991.
- */
-static char *
-twoway_memmem(const unsigned char *h, const unsigned char *z,
-    const unsigned char *n, size_t l)
-{
-        size_t i, ip, jp, k, p, ms, p0, mem, mem0;
-        size_t byteset[32 / sizeof(size_t)] = { 0 };
-        size_t shift[256];
-
-        /* Computing length of needle and fill shift table */
-        for (i=0; i<l; i++)
-                BITOP(byteset, n[i], |=), shift[n[i]] = i+1;
-
-        /* Compute maximal suffix */
-        ip = -1; jp = 0; k = p = 1;
-        while (jp+k<l) {
-                if (n[ip+k] == n[jp+k]) {
-                        if (k == p) {
-                                jp += p;
-                                k = 1;
-                        } else k++;
-                } else if (n[ip+k] > n[jp+k]) {
-                        jp += k;
-                        k = 1;
-                        p = jp - ip;
-                } else {
-                        ip = jp++;
-                        k = p = 1;
-                }
-        }
-        ms = ip;
-        p0 = p;
-
-        /* And with the opposite comparison */
-        ip = -1; jp = 0; k = p = 1;
-        while (jp+k<l) {
-                if (n[ip+k] == n[jp+k]) {
-                        if (k == p) {
-                                jp += p;
-                                k = 1;
-                        } else k++;
-                } else if (n[ip+k] < n[jp+k]) {
-                        jp += k;
-                        k = 1;
-                        p = jp - ip;
-                } else {
-                        ip = jp++;
-                        k = p = 1;
-                }
-        }
-        if (ip+1 > ms+1) ms = ip;
-        else p = p0;
-
-        /* Periodic needle? */
-        if (memcmp(n, n+p, ms+1)) {
-                mem0 = 0;
-                p = MAX(ms, l-ms-1) + 1;
-        } else mem0 = l-p;
-        mem = 0;
-
-        /* Search loop */
-        for (;;) {
-                /* If remainder of haystack is shorter than needle, done */
-                if (z-h < l) return 0;
-
-                /* Check last byte first; advance by shift on mismatch */
-                if (BITOP(byteset, h[l-1], &)) {
-                        k = l-shift[h[l-1]];
-                        if (k) {
-                                if (k < mem) k = mem;
-                                h += k;
-                                mem = 0;
-                                continue;
-                        }
-                } else {
-                        h += l;
-                        mem = 0;
-                        continue;
-                }
-
-                /* Compare right half */
-                for (k=MAX(ms+1,mem); k<l && n[k] == h[k]; k++);
-                if (k < l) {
-                        h += k-ms;
-                        mem = 0;
-                        continue;
-                }
-                /* Compare left half */
-                for (k=ms+1; k>mem && n[k-1] == h[k-1]; k--);
-                if (k <= mem) return (char *)h;
-                h += p;
-                mem = mem0;
-        }
-}
-
-void *
-memmem(const void *h0, size_t k, const void *n0, size_t l)
-{
-        const unsigned char *h = h0, *n = n0;
-
-        /* Return immediately on empty needle */
-        if (!l) return (void *)h;
-
-        /* Return immediately when needle is longer than haystack */
-        if (k<l) return 0;
-
-        /* Use faster algorithms for short needles */
-        h = memchr(h0, *n, k);
-        if (!h || l==1) return (void *)h;
-        k -= h - (const unsigned char *)h0;
-        if (k<l) return 0;
-        if (l==2) return twobyte_memmem(h, k, n);
-        if (l==3) return threebyte_memmem(h, k, n);
-        if (l==4) return fourbyte_memmem(h, k, n);
-
-        return twoway_memmem(h, h+k, n, l);
-}
-DEF_WEAK(memmem);
diff --git a/src/lib/libc/string/memmove.3 b/src/lib/libc/string/memmove.3
deleted file mode 100644
index 8665e4abcf..0000000000
--- a/src/lib/libc/string/memmove.3
+++ /dev/null
@@ -1,76 +0,0 @@
-.\"     $OpenBSD: memmove.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt MEMMOVE 3
-.Os
-.Sh NAME
-.Nm memmove
-.Nd copy bytes
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memmove "void *dst" "const void *src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memmove
-function copies
-.Fa len
-bytes from buffer
-.Fa src
-to buffer
-.Fa dst .
-The two buffers may overlap;
-the copy is always done in a non-destructive manner.
-.Sh RETURN VALUES
-The
-.Fn memmove
-function returns the original value of
-.Fa dst .
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memccpy 3 ,
-.Xr memcpy 3 ,
-.Xr strcpy 3 ,
-.Xr strlcpy 3 ,
-.Xr wmemmove 3
-.Sh STANDARDS
-The
-.Fn memmove
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn memmove
-function first appeared in
-.Bx 4.3 Reno .
diff --git a/src/lib/libc/string/memmove.c b/src/lib/libc/string/memmove.c
deleted file mode 100644
index 1cd1086ab9..0000000000
--- a/src/lib/libc/string/memmove.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*      $OpenBSD: memmove.c,v 1.3 2017/11/29 05:13:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-/*
- * sizeof(word) MUST BE A POWER OF TWO
- * SO THAT wmask BELOW IS ALL ONES
- */
-typedef long word;              /* "word" used for optimal copy speed */
-
-#define wsize   sizeof(word)
-#define wmask   (wsize - 1)
-
-/*
- * Copy a block of memory, handling overlap.
- */
-void *
-memmove(void *dst0, const void *src0, size_t length)
-{
-        char *dst = dst0;
-        const char *src = src0;
-        size_t t;
-
-        if (length == 0 || dst == src)          /* nothing to do */
-                goto done;
-
-        /*
-         * Macros: loop-t-times; and loop-t-times, t>0
-         */
-#define TLOOP(s) if (t) TLOOP1(s)
-#define TLOOP1(s) do { s; } while (--t)
-
-        if ((unsigned long)dst < (unsigned long)src) {
-                /*
-                 * Copy forward.
-                 */
-                t = (long)src;  /* only need low bits */
-                if ((t | (long)dst) & wmask) {
-                        /*
-                         * Try to align operands.  This cannot be done
-                         * unless the low bits match.
-                         */
-                        if ((t ^ (long)dst) & wmask || length < wsize)
-                                t = length;
-                        else
-                                t = wsize - (t & wmask);
-                        length -= t;
-                        TLOOP1(*dst++ = *src++);
-                }
-                /*
-                 * Copy whole words, then mop up any trailing bytes.
-                 */
-                t = length / wsize;
-                TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
-                t = length & wmask;
-                TLOOP(*dst++ = *src++);
-        } else {
-                /*
-                 * Copy backwards.  Otherwise essentially the same.
-                 * Alignment works as before, except that it takes
-                 * (t&wmask) bytes to align, not wsize-(t&wmask).
-                 */
-                src += length;
-                dst += length;
-                t = (long)src;
-                if ((t | (long)dst) & wmask) {
-                        if ((t ^ (long)dst) & wmask || length <= wsize)
-                                t = length;
-                        else
-                                t &= wmask;
-                        length -= t;
-                        TLOOP1(*--dst = *--src);
-                }
-                t = length / wsize;
-                TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src);
-                t = length & wmask;
-                TLOOP(*--dst = *--src);
-        }
-done:
-        return (dst0);
-}
-DEF_BUILTIN(memmove);
diff --git a/src/lib/libc/string/memrchr.c b/src/lib/libc/string/memrchr.c
deleted file mode 100644
index e123bc1737..0000000000
--- a/src/lib/libc/string/memrchr.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*      $OpenBSD: memrchr.c,v 1.4 2019/01/25 00:19:25 millert Exp $     */
-
-/*
- * Copyright (c) 2007 Todd C. Miller <millert@openbsd.org>
- *
- * 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 <string.h>
-
-/*
- * Reverse memchr()
- * Find the last occurrence of 'c' in the buffer 's' of size 'n'.
- */
-void *
-memrchr(const void *s, int c, size_t n)
-{
-        const unsigned char *cp;
-
-        if (n != 0) {
-                cp = (unsigned char *)s + n;
-                do {
-                        if (*(--cp) == (unsigned char)c)
-                                return((void *)cp);
-                } while (--n != 0);
-        }
-        return(NULL);
-}
-DEF_WEAK(memrchr);
diff --git a/src/lib/libc/string/memset.3 b/src/lib/libc/string/memset.3
deleted file mode 100644
index ac5b7e90ad..0000000000
--- a/src/lib/libc/string/memset.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"     $OpenBSD: memset.3,v 1.8 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt MEMSET 3
-.Os
-.Sh NAME
-.Nm memset
-.Nd write a byte to byte string
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memset "void *b" "int c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memset
-function writes
-.Fa len
-bytes of value
-.Fa c
-(converted to an
-.Li unsigned char )
-to the string
-.Fa b .
-.Sh RETURN VALUES
-The
-.Fn memset
-function returns the original value of
-.Fa b .
-.Sh SEE ALSO
-.Xr bzero 3 ,
-.Xr swab 3 ,
-.Xr wmemset 3
-.Sh STANDARDS
-The
-.Fn memset
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn memset
-function first appeared in
-.At V
-and was reimplemented for
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/string/memset.c b/src/lib/libc/string/memset.c
deleted file mode 100644
index 0c261f0965..0000000000
--- a/src/lib/libc/string/memset.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*      $OpenBSD: memset.c,v 1.8 2017/11/29 05:13:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-void *
-memset(void *dst, int c, size_t n)
-{
-        if (n != 0) {
-                unsigned char *d = dst;
-
-                do
-                        *d++ = (unsigned char)c;
-                while (--n != 0);
-        }
-        return (dst);
-}
-DEF_BUILTIN(memset);
diff --git a/src/lib/libc/string/stpcpy.3 b/src/lib/libc/string/stpcpy.3
deleted file mode 100644
index 973eebecdd..0000000000
--- a/src/lib/libc/string/stpcpy.3
+++ /dev/null
@@ -1,184 +0,0 @@
-.\"     $OpenBSD: stpcpy.3,v 1.6 2014/02/23 23:09:34 schwarze Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: February 23 2014 $
-.Dt STPCPY 3
-.Os
-.Sh NAME
-.Nm stpcpy ,
-.Nm stpncpy
-.Nd copy strings
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn stpcpy "char *dst" "const char *src"
-.Ft char *
-.Fn stpncpy "char *dst" "const char *src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn stpcpy
-and
-.Fn stpncpy
-functions copy the string
-.Fa src
-to
-.Fa dst
-(including the terminating
-.Ql \e0
-character).
-.Pp
-The
-.Fn stpncpy
-function copies not more than
-.Fa len
-characters into
-.Fa dst ,
-appending
-.Ql \e0
-characters if
-.Fa src
-is less than
-.Fa len
-characters long, and
-.Em not
-terminating
-.Fa dst
-if the length of
-.Fa src
-is greater than or equal to
-.Fa len .
-.Pp
-If the
-.Fa src
-and
-.Fa dst
-strings overlap, the behavior is undefined.
-.Sh RETURN VALUES
-The
-.Fn stpcpy
-function returns a pointer to the terminating
-.Ql \e0
-character written into
-.Fa dst .
-.Pp
-The
-.Fn stpncpy
-function returns a pointer to the first
-.Ql \e0
-character written into
-.Fa dst ,
-or to
-.Fa &dst[len]
-if the length of
-.Fa src
-is greater than or equal to
-.Fa len .
-.Sh EXAMPLES
-The most common use of
-.Fn stpcpy
-is to build up a string from multiple elements.
-The following example builds up a pathname from
-directory and file components using
-.Fn stpcpy :
-.Bd -literal -offset indent
-char *dir, *file, pname[PATH_MAX];
-
-\&...
-
-if (strlen(dir) + strlen("/") + strlen(file) >= sizeof(pname))
-        goto toolong;
-stpcpy(stpcpy(stpcpy(pname, dir), "/"), file);
-.Ed
-.Pp
-However, the size check required to avoid a buffer overflow is error
-prone since the check can become out of sync with the code that
-performs the copy.
-.Pp
-One might expect that
-.Fn stpncpy
-could be safely used instead, but it suffers from the same defects as
-.Fn strncpy .
-The example below using
-.Fn stpncpy
-is even more prone to error and will not detect when truncation occurs:
-.Bd -literal -offset indent
-char *dir, *file, pname[PATH_MAX];
-char *p1, *p2;
-
-\&...
-
-p1 = stpncpy(pname, dir, sizeof(pname) - 1);
-p2 = stpncpy(p1, "/", sizeof(pname) - 1 - (p1 - pname));
-stpncpy(p2, file, sizeof(pname) - 1 - (p2 - pname));
-pname[sizeof(pname) - 1] = '\e0';
-.Ed
-.Pp
-A safer (and simpler) approach is to use
-.Fn snprintf :
-.Bd -literal -offset indent
-char *dir, *file, pname[PATH_MAX];
-int len;
-
-\&...
-
-len = snprintf(pname, sizeof(pname), "%s/%s", dir, file);
-if (len >= sizeof(pname))
-        goto toolong;
-.Ed
-.Pp
-In most cases, it is better to use
-.Fn snprintf ,
-.Fn strlcpy ,
-or
-.Fn strlcat .
-.Sh SEE ALSO
-.Xr snprintf 3 ,
-.Xr strcpy 3 ,
-.Xr strlcpy 3 ,
-.Xr strncpy 3
-.Sh STANDARDS
-The
-.Fn stpcpy
-and
-.Fn stpncpy
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The function
-.Fn stpcpy
-first appeared in the Lattice C AmigaDOS compiler (1986 or earlier).
-The function
-.Fn stpncpy
-first appeared in the GNU C library version 1.07 (1993).
-Both functions have been available since
-.Ox 5.1 .
diff --git a/src/lib/libc/string/stpcpy.c b/src/lib/libc/string/stpcpy.c
deleted file mode 100644
index 5a86541f08..0000000000
--- a/src/lib/libc/string/stpcpy.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*      $OpenBSD: stpcpy.c,v 1.3 2017/11/28 06:55:49 tb 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 <string.h>
-
-#if defined(APIWARN)
-__warn_references(stpcpy,
-    "stpcpy() is dangerous; do not use it");
-#endif
-
-char *
-stpcpy(char *to, const char *from)
-{
-        for (; (*to = *from) != '\0'; ++from, ++to);
-        return(to);
-}
diff --git a/src/lib/libc/string/stpncpy.c b/src/lib/libc/string/stpncpy.c
deleted file mode 100644
index 6bdee5de16..0000000000
--- a/src/lib/libc/string/stpncpy.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*      $OpenBSD: stpncpy.c,v 1.3 2015/08/31 02:53:57 guenther Exp $    */
-
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-char *
-stpncpy(char *dst, const char *src, size_t n)
-{
-        if (n != 0) {
-                char *d = dst;
-                const char *s = src;
-
-                dst = &dst[n];
-                do {
-                        if ((*d++ = *s++) == 0) {
-                                dst = d - 1;
-                                /* NUL pad the remaining n-1 bytes */
-                                while (--n != 0)
-                                        *d++ = 0;
-                                break;
-                        }
-                } while (--n != 0);
-        }
-        return (dst);
-}
-DEF_WEAK(stpncpy);
diff --git a/src/lib/libc/string/strcasecmp.3 b/src/lib/libc/string/strcasecmp.3
deleted file mode 100644
index bb39df895a..0000000000
--- a/src/lib/libc/string/strcasecmp.3
+++ /dev/null
@@ -1,128 +0,0 @@
-.\"     $OpenBSD: strcasecmp.3,v 1.14 2017/09/05 03:16:13 schwarze Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"     The Regents of the University of California.  All rights reserved.
-.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
-.\"
-.\" 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.
-.\"
-.\"     @(#)strcasecmp.3        8.1 (Berkeley) 6/9/93
-.\"
-.Dd $Mdocdate: September 5 2017 $
-.Dt STRCASECMP 3
-.Os
-.Sh NAME
-.Nm strcasecmp ,
-.Nm strcasecmp_l ,
-.Nm strncasecmp ,
-.Nm strncasecmp_l
-.Nd compare strings, ignoring case
-.Sh SYNOPSIS
-.In strings.h
-.Ft int
-.Fo strcasecmp
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fc
-.Ft int
-.Fo strcasecmp_l
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fa "locale_t locale"
-.Fc
-.Ft int
-.Fo strncasecmp
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fa "size_t len"
-.Fc
-.Ft int
-.Fo strncasecmp_l
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fa "size_t len"
-.Fa "locale_t locale"
-.Fc
-.Sh DESCRIPTION
-These functions compare the NUL-terminated strings
-.Fa s1
-and
-.Fa s2
-and return an integer greater than, equal to, or less than 0,
-according to whether
-.Fa s1
-is lexicographically greater than, equal to, or less than
-.Fa s2
-after translation of each corresponding character to lower-case.
-The strings themselves are not modified.
-The comparison is done using unsigned characters, so that
-.Sq Li \e200
-is greater than
-.Ql \e0 .
-.Pp
-.Fn strncasecmp
-and
-.Fn strncasecmp_l
-compare at most
-.Fa len
-characters.
-.Pp
-On
-.Ox ,
-these functions always use the C locale and ignore
-the global locale, the thread-specific locale, and the
-.Fa locale
-argument.
-.Sh ENVIRONMENT
-On other operating systems, the behaviour of
-.Fn strcasecmp
-and
-.Fn strncasecmp
-may depend on the
-.Dv LC_CTYPE
-.Xr locale 1 .
-.Sh SEE ALSO
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3 ,
-.Xr wcscasecmp 3
-.Sh STANDARDS
-These functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn strcasecmp
-and
-.Fn strncasecmp
-functions have been available since
-.Bx 4.3 Tahoe ,
-and
-.Fn strcasecmp_l
-and
-.Fn strncasecmp_l
-since
-.Ox 6.2 .
diff --git a/src/lib/libc/string/strcasecmp.c b/src/lib/libc/string/strcasecmp.c
deleted file mode 100644
index edbd638722..0000000000
--- a/src/lib/libc/string/strcasecmp.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*      $OpenBSD: strcasecmp.c,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
-
-/*
- * Copyright (c) 1987, 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 <string.h>
-
-typedef unsigned char u_char;
-
-/*
- * This array is designed for mapping upper and lower case letter
- * together for a case independent comparison.  The mappings are
- * based upon ascii character sequences.
- */
-static const u_char charmap[] = {
-        '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-        '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-        '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-        '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-        '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-        '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-        '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-        '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-        '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-        '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-        '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-        '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-        '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-        '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-        '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-        '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-        '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-        '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-        '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-        '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-        '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-        '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-        '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-        '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-        '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
-        '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
-        '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
-        '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
-        '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-        '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-        '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-        '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
-};
-
-int
-strcasecmp(const char *s1, const char *s2)
-{
-        const u_char *cm = charmap;
-        const u_char *us1 = (const u_char *)s1;
-        const u_char *us2 = (const u_char *)s2;
-
-        while (cm[*us1] == cm[*us2++])
-                if (*us1++ == '\0')
-                        return (0);
-        return (cm[*us1] - cm[*--us2]);
-}
-DEF_WEAK(strcasecmp);
-
-int
-strncasecmp(const char *s1, const char *s2, size_t n)
-{
-        if (n != 0) {
-                const u_char *cm = charmap;
-                const u_char *us1 = (const u_char *)s1;
-                const u_char *us2 = (const u_char *)s2;
-
-                do {
-                        if (cm[*us1] != cm[*us2++])
-                                return (cm[*us1] - cm[*--us2]);
-                        if (*us1++ == '\0')
-                                break;
-                } while (--n != 0);
-        }
-        return (0);
-}
-DEF_WEAK(strncasecmp);
diff --git a/src/lib/libc/string/strcasecmp_l.c b/src/lib/libc/string/strcasecmp_l.c
deleted file mode 100644
index a9543dda11..0000000000
--- a/src/lib/libc/string/strcasecmp_l.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*      $OpenBSD: strcasecmp_l.c,v 1.1 2017/09/05 03:16:13 schwarze Exp $ */
-/*
- * Written in 2017 by Ingo Schwarze <schwarze@openbsd.org>.
- * Released into the public domain.
- */
-
-#include <string.h>
-
-int
-strcasecmp_l(const char *s1, const char *s2,
-    locale_t locale __attribute__((__unused__)))
-{
-        return strcasecmp(s1, s2);
-}
-
-int
-strncasecmp_l(const char *s1, const char *s2, size_t n,
-    locale_t locale __attribute__((__unused__)))
-{
-        return strncasecmp(s1, s2, n);
-}
diff --git a/src/lib/libc/string/strcasestr.c b/src/lib/libc/string/strcasestr.c
deleted file mode 100644
index abb3e15549..0000000000
--- a/src/lib/libc/string/strcasestr.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*      $OpenBSD: strcasestr.c,v 1.4 2015/08/31 02:53:57 guenther Exp $ */
-/*      $NetBSD: strcasestr.c,v 1.2 2005/02/09 21:35:47 kleink Exp $    */
-
-/*-
- * Copyright (c) 1990, 1993
- *      The 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 <ctype.h>
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s, ignore case.
- */
-char *
-strcasestr(const char *s, const char *find)
-{
-        char c, sc;
-        size_t len;
-
-        if ((c = *find++) != 0) {
-                c = (char)tolower((unsigned char)c);
-                len = strlen(find);
-                do {
-                        do {
-                                if ((sc = *s++) == 0)
-                                        return (NULL);
-                        } while ((char)tolower((unsigned char)sc) != c);
-                } while (strncasecmp(s, find, len) != 0);
-                s--;
-        }
-        return ((char *)s);
-}
-DEF_WEAK(strcasestr);
diff --git a/src/lib/libc/string/strcat.3 b/src/lib/libc/string/strcat.3
deleted file mode 100644
index 76032c8e8f..0000000000
--- a/src/lib/libc/string/strcat.3
+++ /dev/null
@@ -1,78 +0,0 @@
-.\"     $OpenBSD: strcat.3,v 1.18 2016/05/26 21:30:13 millert Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: May 26 2016 $
-.Dt STRCAT 3
-.Os
-.Sh NAME
-.Nm strcat
-.Nd concatenate two strings without bounds checking
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strcat "char *dst" "const char *append"
-.Sh DESCRIPTION
-The
-.Fn strcat
-function appends a copy of the NUL-terminated string
-.Fa append
-to the end of the NUL-terminated string
-.Fa dst ,
-then adds a terminating
-.Ql \e0 .
-.Pp
-No bounds checking is performed.
-If the buffer
-.Fa dst
-is not large enough to hold the result,
-subsequent memory will be damaged.
-.Sh RETURN VALUES
-The
-.Fn strcat
-function return the pointer
-.Fa dst .
-.Sh SEE ALSO
-.Xr strlcpy 3 ,
-.Xr wcscat 3 ,
-.Xr wcslcpy 3
-.Sh STANDARDS
-The
-.Fn strcat
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn strcat
-function first appeared in the Programmer's Workbench (PWB/UNIX)
-and was ported to
-.At v7 .
diff --git a/src/lib/libc/string/strcat.c b/src/lib/libc/string/strcat.c
deleted file mode 100644
index 73da22f75d..0000000000
--- a/src/lib/libc/string/strcat.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*      $OpenBSD: strcat.c,v 1.10 2017/11/28 06:55:49 tb 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 <string.h>
-
-#if defined(APIWARN)
-__warn_references(strcat,
-    "strcat() is almost always misused, please use strlcat()");
-#endif
-
-char *
-strcat(char *s, const char *append)
-{
-        char *save = s;
-
-        for (; *s; ++s);
-        while ((*s++ = *append++) != '\0');
-        return(save);
-}
diff --git a/src/lib/libc/string/strchr.3 b/src/lib/libc/string/strchr.3
deleted file mode 100644
index 07e7f29f5b..0000000000
--- a/src/lib/libc/string/strchr.3
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"     $OpenBSD: strchr.3,v 1.13 2018/10/01 06:37:37 martijn Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: October 1 2018 $
-.Dt STRCHR 3
-.Os
-.Sh NAME
-.Nm strchr ,
-.Nm index
-.Nd locate first occurrence of a character in a string
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strchr "const char *s" "int c"
-.In strings.h
-.Ft char *
-.Fn index "const char *s" "int c"
-.Sh DESCRIPTION
-The
-.Fn strchr
-function locates the first occurrence of the character
-.Fa c
-.Pq converted to a char
-in the string
-.Fa s .
-The terminating NUL character is considered part of the string.
-If
-.Fa c
-is
-.Ql \e0 ,
-.Fn strchr
-locates the terminating
-.Ql \e0 .
-.Pp
-The
-.Fn index
-function is an old synonym for
-.Fn strchr .
-.Sh RETURN VALUES
-The
-.Fn strchr
-function returns a pointer to the located character or
-.Dv NULL
-if the character does not appear in the string.
-.Sh EXAMPLES
-After the following call to
-.Fn strchr ,
-.Va p
-will point to the string
-.Qq oobar :
-.Bd -literal -offset indent
-char *p;
-char *s = "foobar";
-
-p = strchr(s, 'o');
-.Ed
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr wcschr 3
-.Sh STANDARDS
-The
-.Fn strchr
-function conforms to
-.St -ansiC .
-.Pp
-The
-.Fn index
-function is deprecated and shouldn't be used in new code.
-.Sh HISTORY
-The
-.Fn index
-function first appeared in
-.At v7 .
-The
-.Fn strchr
-function first appeared in
-.At III
-and was reimplemented for
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/string/strchr.c b/src/lib/libc/string/strchr.c
deleted file mode 100644
index 8bfa7ac3aa..0000000000
--- a/src/lib/libc/string/strchr.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*      $OpenBSD: strchr.c,v 1.4 2018/10/01 06:37:37 martijn 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 <string.h>
-
-__weak_alias(index, strchr);
-
-char *
-strchr(const char *p, int ch)
-{
-        for (;; ++p) {
-                if (*p == (char) ch)
-                        return((char *)p);
-                if (!*p)
-                        return((char *)NULL);
-        }
-        /* NOTREACHED */
-}
-DEF_STRONG(strchr);
diff --git a/src/lib/libc/string/strcmp.3 b/src/lib/libc/string/strcmp.3
deleted file mode 100644
index 63dc7fed2d..0000000000
--- a/src/lib/libc/string/strcmp.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"     $OpenBSD: strcmp.3,v 1.14 2013/07/17 05:42:11 schwarze Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: July 17 2013 $
-.Dt STRCMP 3
-.Os
-.Sh NAME
-.Nm strcmp ,
-.Nm strncmp
-.Nd compare strings
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn strcmp "const char *s1" "const char *s2"
-.Ft int
-.Fn strncmp "const char *s1" "const char *s2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn strcmp
-and
-.Fn strncmp
-functions lexicographically compare the NUL-terminated strings
-.Fa s1
-and
-.Fa s2 .
-The
-.Fn strncmp
-function compares at most
-.Fa len
-characters.
-.Sh RETURN VALUES
-The
-.Fn strcmp
-and
-.Fn strncmp
-functions return an integer greater than, equal to, or less than 0, according
-to whether the string
-.Fa s1
-is greater than, equal to, or less than the string
-.Fa s2 .
-The comparison is done using unsigned characters, so that
-.Ql \e200
-is greater than
-.Ql \e0 .
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr memcmp 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3 ,
-.Xr wcscmp 3
-.Sh STANDARDS
-The
-.Fn strcmp
-and
-.Fn strncmp
-functions conform to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn strcmp
-function first appeared in the Programmer's Workbench (PWB/UNIX)
-and was ported to
-.At v7 ;
-.Fn strncmp
-first appeared in
-.At v7 .
diff --git a/src/lib/libc/string/strcmp.c b/src/lib/libc/string/strcmp.c
deleted file mode 100644
index be175563d4..0000000000
--- a/src/lib/libc/string/strcmp.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*      $OpenBSD: strcmp.c,v 1.9 2015/08/31 02:53:57 guenther Exp $     */
-
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-/*
- * Compare strings.
- */
-int
-strcmp(const char *s1, const char *s2)
-{
-        while (*s1 == *s2++)
-                if (*s1++ == 0)
-                        return (0);
-        return (*(unsigned char *)s1 - *(unsigned char *)--s2);
-}
-DEF_STRONG(strcmp);
diff --git a/src/lib/libc/string/strcoll.3 b/src/lib/libc/string/strcoll.3
deleted file mode 100644
index 9daa6cd93f..0000000000
--- a/src/lib/libc/string/strcoll.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\"     $OpenBSD: strcoll.3,v 1.11 2019/01/18 07:43:36 schwarze Exp $
-.\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
-.\" 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.
-.\"
-.Dd $Mdocdate: January 18 2019 $
-.Dt STRCOLL 3
-.Os
-.Sh NAME
-.Nm strcoll ,
-.Nm strcoll_l
-.Nd compare strings according to current collation
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn strcoll "const char *s1" "const char *s2"
-.Ft int
-.Fn strcoll_l "const char *s1" "const char *s2" "locale_t locale"
-.Sh DESCRIPTION
-The
-.Fn strcoll
-and
-.Fn strcoll_l
-functions lexicographically compare the NUL-terminated strings
-.Fa s1
-and
-.Fa s2
-according to the current locale collation
-and return an integer greater than, equal to, or less than 0,
-according to whether
-.Fa s1
-is greater than, equal to, or less than
-.Fa s2 .
-.Pp
-On
-.Ox ,
-they have the same effect as
-.Xr strcmp 3 ,
-and the global locale, the thread-specific locale, and the
-.Fa locale
-argument are ignored.
-On other operating systems, results may depend on the
-.Dv LC_CTYPE
-and
-.Dv LC_COLLATE
-locale categories set with
-.Xr setlocale 3 ,
-.Xr uselocale 3 ,
-or
-.Xr newlocale 3 .
-.Sh SEE ALSO
-.Xr newlocale 3 ,
-.Xr setlocale 3 ,
-.Xr strcmp 3 ,
-.Xr strxfrm 3 ,
-.Xr wcscoll 3
-.Sh STANDARDS
-The
-.Fn strcoll
-function conforms to
-.St -ansiC ,
-and
-.Fn strcoll_l
-to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn strcoll
-function has been available since
-.Bx 4.3 Reno ,
-and
-.Fn strcoll_l
-since
-.Ox 6.2 .
diff --git a/src/lib/libc/string/strcoll.c b/src/lib/libc/string/strcoll.c
deleted file mode 100644
index 47a6ea4f24..0000000000
--- a/src/lib/libc/string/strcoll.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*      $OpenBSD: strcoll.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-/*
- * Compare strings according to LC_COLLATE category of current locale.
- */
-int
-strcoll(const char *s1, const char *s2)
-{
-        /* LC_COLLATE is unimplemented, hence always "C" */
-        return (strcmp(s1, s2));
-}
-DEF_STRONG(strcoll);
diff --git a/src/lib/libc/string/strcoll_l.c b/src/lib/libc/string/strcoll_l.c
deleted file mode 100644
index bcd5b0f417..0000000000
--- a/src/lib/libc/string/strcoll_l.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*      $OpenBSD: strcoll_l.c,v 1.1 2017/09/05 03:16:13 schwarze Exp $ */
-/*
- * Written in 2017 by Ingo Schwarze <schwarze@openbsd.org>.
- * Released into the public domain.
- */
-
-#include <string.h>
-
-int
-strcoll_l(const char *s1, const char *s2,
-    locale_t locale __attribute__((__unused__)))
-{
-        return strcmp(s1, s2);
-}
diff --git a/src/lib/libc/string/strcpy.3 b/src/lib/libc/string/strcpy.3
deleted file mode 100644
index 7174f7c963..0000000000
--- a/src/lib/libc/string/strcpy.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"     $OpenBSD: strcpy.3,v 1.21 2014/04/19 11:30:40 deraadt Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: April 19 2014 $
-.Dt STRCPY 3
-.Os
-.Sh NAME
-.Nm strcpy
-.Nd copy a string without bounds checking
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strcpy "char *dst" "const char *src"
-.Sh DESCRIPTION
-The
-.Fn strcpy
-function copies the string
-.Fa src
-(including the terminating
-.Ql \e0
-character) to the buffer
-.Fa dst .
-.Pp
-No bounds checking is performed.
-If the buffer
-.Fa dst
-is not large enough to hold the result,
-subsequent memory will be damaged.
-.Pp
-If the
-.Fa src
-string is inside the
-.Fa dst
-buffer, the behavior is undefined.
-.Sh RETURN VALUES
-The
-.Fn strcpy
-function returns
-.Fa dst .
-.Sh SEE ALSO
-.Xr strlcpy 3 ,
-.Xr wcscpy 3 ,
-.Xr wcslcpy 3
-.Sh STANDARDS
-The
-.Fn strcpy
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn strcpy
-function first appeared in the Programmer's Workbench (PWB/UNIX)
-and was ported to
-.At v7 .
diff --git a/src/lib/libc/string/strcpy.c b/src/lib/libc/string/strcpy.c
deleted file mode 100644
index 290eefeabf..0000000000
--- a/src/lib/libc/string/strcpy.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*      $OpenBSD: strcpy.c,v 1.10 2017/11/28 06:55:49 tb 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 <string.h>
-
-#if defined(APIWARN)
-__warn_references(strcpy,
-    "strcpy() is almost always misused, please use strlcpy()");
-#endif
-
-char *
-strcpy(char *to, const char *from)
-{
-        char *save = to;
-
-        for (; (*to = *from) != '\0'; ++from, ++to);
-        return(save);
-}
diff --git a/src/lib/libc/string/strcspn.3 b/src/lib/libc/string/strcspn.3
deleted file mode 100644
index 07eb9ca26f..0000000000
--- a/src/lib/libc/string/strcspn.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\"     $OpenBSD: strcspn.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt STRCSPN 3
-.Os
-.Sh NAME
-.Nm strcspn
-.Nd span the complement of a string
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strcspn "const char *s" "const char *charset"
-.Sh DESCRIPTION
-The
-.Fn strcspn
-function spans the initial part of the NUL-terminated string
-.Fa s
-as long as the characters from
-.Fa s
-do not occur in string
-.Fa charset
-(it spans the
-.Em complement
-of
-.Fa charset ) .
-.Sh RETURN VALUES
-The
-.Fn strcspn
-function returns the number of characters spanned.
-.Sh EXAMPLES
-The following call to
-.Fn strcspn
-will return 3, since the first three characters of string
-.Fa s
-do not occur in string
-.Fa charset :
-.Bd -literal -offset indent
-char *s = "foobar";
-char *charset = "bar";
-size_t span;
-
-span = strcspn(s, charset);
-.Ed
-.Pp
-The following removes the first (if any) newline character from string
-.Fa line .
-This is useful for trimming the newline after a
-.Xr fgets 3
-call.
-.Bd -literal -offset indent
-char line[BUFSIZ];
-
-if (fgets(line, sizeof(line), fp) != NULL)
-        line[strcspn(line, "\en")] = '\e0';
-.Ed
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr wcscspn 3
-.Sh STANDARDS
-The
-.Fn strcspn
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn strcspn
-function first appeared in
-.At III
-and was reimplemented for
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/string/strcspn.c b/src/lib/libc/string/strcspn.c
deleted file mode 100644
index 3c1f5a4cec..0000000000
--- a/src/lib/libc/string/strcspn.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*      $OpenBSD: strcspn.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-/*
- * Span the complement of string s2.
- */
-size_t
-strcspn(const char *s1, const char *s2)
-{
-        const char *p, *spanp;
-        char c, sc;
-
-        /*
-         * Stop as soon as we find any character from s2.  Note that there
-         * must be a NUL in s2; it suffices to stop when we find that, too.
-         */
-        for (p = s1;;) {
-                c = *p++;
-                spanp = s2;
-                do {
-                        if ((sc = *spanp++) == c)
-                                return (p - 1 - s1);
-                } while (sc != 0);
-        }
-        /* NOTREACHED */
-}
-DEF_STRONG(strcspn);
diff --git a/src/lib/libc/string/strdup.3 b/src/lib/libc/string/strdup.3
deleted file mode 100644
index 283f3bc0ea..0000000000
--- a/src/lib/libc/string/strdup.3
+++ /dev/null
@@ -1,119 +0,0 @@
-.\"     $OpenBSD: strdup.3,v 1.22 2015/12/01 01:32:48 mmcc 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.
-.\"
-.\"     @(#)strdup.3    8.1 (Berkeley) 6/9/93
-.\"
-.Dd $Mdocdate: December 1 2015 $
-.Dt STRDUP 3
-.Os
-.Sh NAME
-.Nm strdup ,
-.Nm strndup
-.Nd save a copy of a string
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strdup "const char *s"
-.Ft char *
-.Fn strndup "const char *s" "size_t maxlen"
-.Sh DESCRIPTION
-The
-.Fn strdup
-function allocates sufficient memory for a copy of the string
-.Fa s ,
-does the copy, and returns a pointer to it.
-The pointer may subsequently be used as an argument to the function
-.Xr free 3 .
-.Pp
-The
-.Fn strndup
-function behaves similarly to
-.Nm strdup
-but only copies up to
-.Fa maxlen
-characters from
-.Fa s .
-The resulting string is always NUL-terminated.
-.Pp
-If the memory allocation fails,
-.Dv NULL
-is returned.
-.Sh EXAMPLES
-The following will point
-.Va p
-to an allocated area of memory containing the NUL-terminated string
-.Qq foobar :
-.Bd -literal -offset indent
-char *p;
-
-p = strdup("foobar");
-if (p == NULL)
-        err(1, NULL);
-.Ed
-.Sh ERRORS
-The
-.Fn strdup
-and
-.Fn strndup
-functions may fail and set the external variable
-.Va errno
-for any of the errors specified for the library function
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr strcpy 3 ,
-.Xr strlcpy 3 ,
-.Xr strlen 3 ,
-.Xr wcsdup 3
-.Sh STANDARDS
-The
-.Fn strdup
-and
-.Fn strndup
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-A
-.Fn strdup
-macro was first used in the
-.Bx 4.1c
-debugger,
-.Sy dbx .
-It was rewritten as a C function for the
-.Bx 4.3
-.Xr inetd 8
-and first appeared in the C library of
-.Bx 4.3 Reno .
-The
-.Fn strndup
-function appeared in glibc 2.0, was reimplemented for
-.Nx 4.0 ,
-and ported to
-.Ox 4.8 .
diff --git a/src/lib/libc/string/strdup.c b/src/lib/libc/string/strdup.c
deleted file mode 100644
index 9aebf399c1..0000000000
--- a/src/lib/libc/string/strdup.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*      $OpenBSD: strdup.c,v 1.7 2015/08/31 02:53:57 guenther Exp $     */
-
-/*
- * Copyright (c) 1988, 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 <sys/types.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-strdup(const char *str)
-{
-        size_t siz;
-        char *copy;
-
-        siz = strlen(str) + 1;
-        if ((copy = malloc(siz)) == NULL)
-                return(NULL);
-        (void)memcpy(copy, str, siz);
-        return(copy);
-}
-DEF_WEAK(strdup);
diff --git a/src/lib/libc/string/strerror.3 b/src/lib/libc/string/strerror.3
deleted file mode 100644
index 6c5b890fa4..0000000000
--- a/src/lib/libc/string/strerror.3
+++ /dev/null
@@ -1,154 +0,0 @@
-.\"     $OpenBSD: strerror.3,v 1.16 2019/05/16 13:35:16 schwarze Exp $
-.\"
-.\" Copyright (c) 1980, 1991 Regents of the University of California.
-.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" 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.
-.\"
-.Dd $Mdocdate: May 16 2019 $
-.Dt STRERROR 3
-.Os
-.Sh NAME
-.Nm strerror ,
-.Nm strerror_l ,
-.Nm strerror_r
-.Nd get error message string
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strerror "int errnum"
-.Ft char *
-.Fn strerror_l "int errnum" "locale_t locale"
-.Ft int
-.Fn strerror_r "int errnum" "char *strerrbuf" "size_t buflen"
-.Sh DESCRIPTION
-These functions map the error number
-.Fa errnum
-to an error message string.
-.Pp
-.Fn strerror
-and
-.Fn strerror_l
-return a string containing a maximum of
-.Dv NL_TEXTMAX
-characters, including the trailing NUL.
-This string is not to be modified by the calling program.
-The string returned by
-.Fn strerror
-may be overwritten by subsequent calls to
-.Fn strerror
-in any thread.
-The string returned by
-.Fn strerror_l
-may be overwritten by subsequent calls to
-.Fn strerror_l
-in the same thread.
-.Pp
-.Fn strerror_r
-is a thread safe version of
-.Fn strerror
-that places the error message in the specified buffer
-.Fa strerrbuf .
-.Pp
-On
-.Ox ,
-the global locale, the thread-specific locale, and the
-.Fa locale
-argument are ignored.
-.Sh RETURN VALUES
-.Fn strerror
-and
-.Fn strerror_l
-return a pointer to the error message string.
-If an error occurs, the error code is stored in
-.Va errno .
-.Pp
-.Fn strerror_r
-returns zero upon successful completion.
-If an error occurs, the error code is stored in
-.Va errno
-and the error code is returned.
-.Sh ERRORS
-All these functions may fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Fa errnum
-is not a valid error number.
-The returned error string will consist of an error message that includes
-.Fa errnum .
-.El
-.Pp
-.Fn strerror_r
-may also fail if:
-.Bl -tag -width Er
-.It Bq Er ERANGE
-The error message is larger than
-.Fa buflen
-characters.
-The message will be truncated to fit.
-.El
-.Sh SEE ALSO
-.Xr intro 2 ,
-.Xr newlocale 3 ,
-.Xr perror 3 ,
-.Xr setlocale 3
-.Sh STANDARDS
-The
-.Fn strerror
-function conforms to
-.St -isoC-99 .
-The
-.Fn strerror_l
-and
-.Fn strerror_r
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn strerror
-function has been available since
-.Bx 4.3 Reno ,
-.Fn strerror_r
-since
-.Ox 3.3 ,
-and
-.Fn strerror_l
-since
-.Ox 6.2 .
-.Sh CAVEATS
-On systems other than
-.Ox ,
-the
-.Dv LC_MESSAGES
-.Xr locale 1
-category can cause different strings to be returned instead of the
-normal error messages; see CAVEATS in
-.Xr setlocale 3
-for details.
diff --git a/src/lib/libc/string/strerror.c b/src/lib/libc/string/strerror.c
deleted file mode 100644
index c6f05446fd..0000000000
--- a/src/lib/libc/string/strerror.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*      $OpenBSD: strerror.c,v 1.8 2015/08/31 02:53:57 guenther 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 <string.h>
-#include <limits.h>
-
-char *
-strerror(int num)
-{
-        static char buf[NL_TEXTMAX];
-
-        (void)strerror_r(num, buf, sizeof(buf));
-        return (buf);
-}
-DEF_STRONG(strerror);
diff --git a/src/lib/libc/string/strerror_l.c b/src/lib/libc/string/strerror_l.c
deleted file mode 100644
index c16be7a0cc..0000000000
--- a/src/lib/libc/string/strerror_l.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*      $OpenBSD: strerror_l.c,v 1.1 2017/09/05 03:16:13 schwarze Exp $ */
-/*
- * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
- *
- * 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 <limits.h>
-#include <string.h>
-
-#include "thread_private.h"
-
-char *
-strerror_l(int errnum, locale_t locale)
-{
-        static char sel_buf[NL_TEXTMAX];
-        _THREAD_PRIVATE_KEY(strerror_l);
-        char *p = _THREAD_PRIVATE(strerror_l, sel_buf, NULL);
-
-        return p == NULL ? "no buffer available in strerror_l" :
-            strerror_r(errnum, p, sizeof(sel_buf)) ?
-            "strerror_r failure" : p;
-}
diff --git a/src/lib/libc/string/strerror_r.c b/src/lib/libc/string/strerror_r.c
deleted file mode 100644
index b45dee12d8..0000000000
--- a/src/lib/libc/string/strerror_r.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* $OpenBSD: strerror_r.c,v 1.13 2016/10/19 16:26:16 bluhm Exp $ */
-/* Public Domain <marc@snafu.org> */
-
-#include <errno.h>
-#include <limits.h>
-#include <signal.h>
-#include <string.h>
-
-static size_t
-__digits10(unsigned int num)
-{
-        size_t i = 0;
-
-        do {
-                num /= 10;
-                i++;
-        } while (num != 0);
-
-        return i;
-}
-
-static int
-__itoa(int num, int sign, char *buffer, size_t start, size_t end)
-{
-        size_t pos;
-        unsigned int a;
-        int neg;
-
-        if (sign && num < 0) {
-                a = -num;
-                neg = 1;
-        }
-        else {
-                a = num;
-                neg = 0;
-        }
-
-        pos = start + __digits10(a);
-        if (neg)
-            pos++;
-
-        if (pos < end)
-                buffer[pos] = '\0';
-        else
-                return ERANGE;
-        pos--;
-        do {
-                buffer[pos] = (a % 10) + '0';
-                pos--;
-                a /= 10;
-        } while (a != 0);
-        if (neg)
-                buffer[pos] = '-';
-        return 0;
-}
-
-
-static int
-__num2string(int num, int sign, int setid, char *buf, size_t buflen,
-    const char * const list[], size_t max, const char *def)
-{
-        int ret = 0;
-        size_t len;
-
-        if (0 <= num && num < max) {
-                len = strlcpy(buf, list[num], buflen);
-                if (len >= buflen)
-                        ret = ERANGE;
-        } else {
-                len = strlcpy(buf, def, buflen);
-                if (len >= buflen)
-                        ret = ERANGE;
-                else {
-                        ret = __itoa(num, sign, buf, len, buflen);
-                        if (ret == 0)
-                                ret = EINVAL;
-                }
-        }
-
-        return ret;
-}
-
-#define UPREFIX "Unknown error: "
-
-int
-strerror_r(int errnum, char *strerrbuf, size_t buflen)
-{
-        int ret_errno;
-
-        ret_errno = __num2string(errnum, 1, 1, strerrbuf, buflen,
-            sys_errlist, sys_nerr, UPREFIX);
-
-        if (ret_errno)
-                errno = ret_errno;
-        return (ret_errno);
-}
-DEF_WEAK(strerror_r);
-
-#define USIGPREFIX "Unknown signal: "
-
-char *
-__strsignal(int num, char *buf)
-{
-        __num2string(num, 0, 2, buf, NL_TEXTMAX, sys_siglist, NSIG,
-            USIGPREFIX);
-        return buf;
-}
diff --git a/src/lib/libc/string/strlcat.c b/src/lib/libc/string/strlcat.c
deleted file mode 100644
index aa3db7ab37..0000000000
--- a/src/lib/libc/string/strlcat.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*      $OpenBSD: strlcat.c,v 1.19 2019/01/25 00:19:25 millert Exp $    */
-
-/*
- * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
- *
- * 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 <sys/types.h>
-#include <string.h>
-
-/*
- * Appends src to string dst of size dsize (unlike strncat, dsize is the
- * full size of dst, not space left).  At most dsize-1 characters
- * will be copied.  Always NUL terminates (unless dsize <= strlen(dst)).
- * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
- * If retval >= dsize, truncation occurred.
- */
-size_t
-strlcat(char *dst, const char *src, size_t dsize)
-{
-        const char *odst = dst;
-        const char *osrc = src;
-        size_t n = dsize;
-        size_t dlen;
-
-        /* Find the end of dst and adjust bytes left but don't go past end. */
-        while (n-- != 0 && *dst != '\0')
-                dst++;
-        dlen = dst - odst;
-        n = dsize - dlen;
-
-        if (n-- == 0)
-                return(dlen + strlen(src));
-        while (*src != '\0') {
-                if (n != 0) {
-                        *dst++ = *src;
-                        n--;
-                }
-                src++;
-        }
-        *dst = '\0';
-
-        return(dlen + (src - osrc));    /* count does not include NUL */
-}
-DEF_WEAK(strlcat);
diff --git a/src/lib/libc/string/strlcpy.3 b/src/lib/libc/string/strlcpy.3
deleted file mode 100644
index a14145e199..0000000000
--- a/src/lib/libc/string/strlcpy.3
+++ /dev/null
@@ -1,188 +0,0 @@
-.\"     $OpenBSD: strlcpy.3,v 1.27 2019/01/25 00:19:25 millert Exp $
-.\"
-.\" Copyright (c) 1998, 2000 Todd C. Miller <millert@openbsd.org>
-.\"
-.\" 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 $Mdocdate: January 25 2019 $
-.Dt STRLCPY 3
-.Os
-.Sh NAME
-.Nm strlcpy ,
-.Nm strlcat
-.Nd size-bounded string copying and concatenation
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strlcpy "char *dst" "const char *src" "size_t dstsize"
-.Ft size_t
-.Fn strlcat "char *dst" "const char *src" "size_t dstsize"
-.Sh DESCRIPTION
-The
-.Fn strlcpy
-and
-.Fn strlcat
-functions copy and concatenate strings with the
-same input parameters and output result as
-.Xr snprintf 3 .
-They are designed to be safer, more consistent, and less error
-prone replacements for the easily misused functions
-.Xr strncpy 3
-and
-.Xr strncat 3 .
-.Pp
-.Fn strlcpy
-and
-.Fn strlcat
-take the full size of the destination buffer and guarantee
-NUL-termination if there is room.
-Note that room for the NUL should be included in
-.Fa dstsize .
-.Pp
-.Fn strlcpy
-copies up to
-.Fa dstsize
-\- 1 characters from the string
-.Fa src
-to
-.Fa dst ,
-NUL-terminating the result if
-.Fa dstsize
-is not 0.
-.Pp
-.Fn strlcat
-appends string
-.Fa src
-to the end of
-.Fa dst .
-It will append at most
-.Fa dstsize
-\- strlen(dst) \- 1 characters.
-It will then NUL-terminate, unless
-.Fa dstsize
-is 0 or the original
-.Fa dst
-string was longer than
-.Fa dstsize
-(in practice this should not happen
-as it means that either
-.Fa dstsize
-is incorrect or that
-.Fa dst
-is not a proper string).
-.Pp
-If the
-.Fa src
-and
-.Fa dst
-strings overlap, the behavior is undefined.
-.Sh RETURN VALUES
-Besides quibbles over the return type
-.Pf ( Va size_t
-versus
-.Va int )
-and signal handler safety
-.Pf ( Xr snprintf 3
-is not entirely safe on some systems), the
-following two are equivalent:
-.Bd -literal -offset indent
-n = strlcpy(dst, src, len);
-n = snprintf(dst, len, "%s", src);
-.Ed
-.Pp
-Like
-.Xr snprintf 3 ,
-the
-.Fn strlcpy
-and
-.Fn strlcat
-functions return the total length of the string they tried to create.
-For
-.Fn strlcpy
-that means the length of
-.Fa src .
-For
-.Fn strlcat
-that means the initial length of
-.Fa dst
-plus
-the length of
-.Fa src .
-.Pp
-If the return value is
-.Cm >=
-.Va dstsize ,
-the output string has been truncated.
-It is the caller's responsibility to handle this.
-.Sh EXAMPLES
-The following code fragment illustrates the simple case:
-.Bd -literal -offset indent
-char *s, *p, buf[BUFSIZ];
-
-\&...
-
-(void)strlcpy(buf, s, sizeof(buf));
-(void)strlcat(buf, p, sizeof(buf));
-.Ed
-.Pp
-To detect truncation, perhaps while building a pathname, something
-like the following might be used:
-.Bd -literal -offset indent
-char *dir, *file, pname[PATH_MAX];
-
-\&...
-
-if (strlcpy(pname, dir, sizeof(pname)) >= sizeof(pname))
-        goto toolong;
-if (strlcat(pname, file, sizeof(pname)) >= sizeof(pname))
-        goto toolong;
-.Ed
-.Pp
-Since it is known how many characters were copied the first time, things
-can be sped up a bit by using a copy instead of an append:
-.Bd -literal -offset indent
-char *dir, *file, pname[PATH_MAX];
-size_t n;
-
-\&...
-
-n = strlcpy(pname, dir, sizeof(pname));
-if (n >= sizeof(pname))
-        goto toolong;
-if (strlcpy(pname + n, file, sizeof(pname) - n) >= sizeof(pname) - n)
-        goto toolong;
-.Ed
-.Pp
-However, one may question the validity of such optimizations, as they
-defeat the whole purpose of
-.Fn strlcpy
-and
-.Fn strlcat .
-As a matter of fact, the first version of this manual page got it wrong.
-.Sh SEE ALSO
-.Xr snprintf 3 ,
-.Xr strncat 3 ,
-.Xr strncpy 3 ,
-.Xr wcslcpy 3
-.Sh HISTORY
-.Fn strlcpy
-and
-.Fn strlcat
-first appeared in
-.Ox 2.4 .
-.Sh AUTHORS
-.Fn strlcpy
-and
-.Fn strlcat
-were created by
-.An Todd C. Miller Aq Mt millert@openbsd.org .
diff --git a/src/lib/libc/string/strlcpy.c b/src/lib/libc/string/strlcpy.c
deleted file mode 100644
index 7e3b9aef6f..0000000000
--- a/src/lib/libc/string/strlcpy.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*      $OpenBSD: strlcpy.c,v 1.16 2019/01/25 00:19:25 millert Exp $    */
-
-/*
- * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
- *
- * 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 <sys/types.h>
-#include <string.h>
-
-/*
- * Copy string src to buffer dst of size dsize.  At most dsize-1
- * chars will be copied.  Always NUL terminates (unless dsize == 0).
- * Returns strlen(src); if retval >= dsize, truncation occurred.
- */
-size_t
-strlcpy(char *dst, const char *src, size_t dsize)
-{
-        const char *osrc = src;
-        size_t nleft = dsize;
-
-        /* Copy as many bytes as will fit. */
-        if (nleft != 0) {
-                while (--nleft != 0) {
-                        if ((*dst++ = *src++) == '\0')
-                                break;
-                }
-        }
-
-        /* Not enough room in dst, add NUL and traverse rest of src. */
-        if (nleft == 0) {
-                if (dsize != 0)
-                        *dst = '\0';            /* NUL-terminate dst */
-                while (*src++)
-                        ;
-        }
-
-        return(src - osrc - 1); /* count does not include NUL */
-}
-DEF_WEAK(strlcpy);
diff --git a/src/lib/libc/string/strlen.3 b/src/lib/libc/string/strlen.3
deleted file mode 100644
index 81ce52e509..0000000000
--- a/src/lib/libc/string/strlen.3
+++ /dev/null
@@ -1,104 +0,0 @@
-.\"     $OpenBSD: strlen.3,v 1.13 2014/12/09 14:41:00 jmc Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: December 9 2014 $
-.Dt STRLEN 3
-.Os
-.Sh NAME
-.Nm strlen ,
-.Nm strnlen
-.Nd find length of a string
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strlen "const char *s"
-.Ft size_t
-.Fn strnlen "const char *s" "size_t maxlen"
-.Sh DESCRIPTION
-The
-.Fn strlen
-function computes the length of the string
-.Fa s .
-.Pp
-The
-.Fn strnlen
-function computes the length of the string
-.Fa s ,
-up to
-.Fa maxlen
-characters.
-The
-.Fn strnlen
-function will never attempt to address more than
-.Fa maxlen
-characters, making it suitable for use with character arrays that are
-not guaranteed to be NUL-terminated.
-.Sh RETURN VALUES
-The
-.Fn strlen
-function returns the number of characters that precede the terminating
-.Tn NUL
-character.
-.Pp
-The
-.Fn strnlen
-function returns the number of characters that precede the terminating
-.Tn NUL
-or
-.Fa maxlen ,
-whichever is smaller.
-.Sh SEE ALSO
-.Xr wcslen 3
-.Sh STANDARDS
-The
-.Fn strlen
-function conforms to
-.St -ansiC .
-.Pp
-The
-.Fn strlen
-and
-.Fn strnlen
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn strlen
-function first appeared in the Programmer's Workbench (PWB/UNIX)
-and was ported to
-.At v7 .
-The
-.Fn strnlen
-function appeared in glibc 2.0
-and was reimplemented for
-.Ox 4.8 .
diff --git a/src/lib/libc/string/strlen.c b/src/lib/libc/string/strlen.c
deleted file mode 100644
index a5721d3e7f..0000000000
--- a/src/lib/libc/string/strlen.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*      $OpenBSD: strlen.c,v 1.9 2015/08/31 02:53:57 guenther 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 <string.h>
-
-size_t
-strlen(const char *str)
-{
-        const char *s;
-
-        for (s = str; *s; ++s)
-                ;
-        return (s - str);
-}
-
-DEF_STRONG(strlen);
diff --git a/src/lib/libc/string/strmode.3 b/src/lib/libc/string/strmode.3
deleted file mode 100644
index 8135d30ba1..0000000000
--- a/src/lib/libc/string/strmode.3
+++ /dev/null
@@ -1,153 +0,0 @@
-.\" $OpenBSD: strmode.3,v 1.17 2017/07/05 11:44:35 tb 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.
-.\"
-.\"     @(#)strmode.3   8.3 (Berkeley) 7/28/94
-.\"
-.Dd $Mdocdate: July 5 2017 $
-.Dt STRMODE 3
-.Os
-.Sh NAME
-.Nm strmode
-.Nd convert inode status information into a symbolic string
-.Sh SYNOPSIS
-.In string.h
-.Ft void
-.Fn strmode "mode_t mode" "char *bp"
-.Sh DESCRIPTION
-The
-.Fn strmode
-function converts a file
-.Fa mode
-(the type and permission information associated with an inode, see
-.Xr stat 2 )
-into a symbolic string which is stored in the location referenced by
-.Fa bp .
-This stored string is eleven characters in length plus a trailing NUL byte.
-.Pp
-The first character is the inode type, and will be one of the following:
-.Pp
-.Bl -tag -width flag -offset indent -compact
-.It \-
-regular file
-.It b
-block special
-.It c
-character special
-.It d
-directory
-.It l
-symbolic link
-.It p
-FIFO
-.It s
-socket
-.It \&?
-unknown inode type
-.El
-.Pp
-The next nine characters encode three sets of permissions, in three
-characters each.
-The first three characters are the permissions for the owner of the
-file, the second three for the group the file belongs to, and the
-third for the
-.Dq other ,
-or default, set of users.
-.Pp
-Permission checking is done as specifically as possible.
-If read permission is denied to the owner of a file in the first set
-of permissions, the owner of the file will not be able to read the file.
-This is true even if the owner is in the file's group and the group
-permissions allow reading or the
-.Dq other
-permissions allow reading.
-.Pp
-If the first character of the three character set is an
-.Sq r ,
-the file is readable for that set of users; if a dash
-.Pq Ql - ,
-it is not readable.
-.Pp
-If the second character of the three character set is a
-.Sq w ,
-the file is writable for that set of users; if a dash
-.Pq Ql - ,
-it is not writable.
-.Pp
-The third character is the first of the following characters that apply:
-.Bl -tag -width xxxx
-.It S
-If the character is part of the owner permissions and the file is not
-executable or the directory is not searchable by the owner, and the
-set-user-ID bit is set.
-.It S
-If the character is part of the group permissions and the file is not
-executable or the directory is not searchable by the group, and the
-set-group-ID bit is set.
-.It T
-If the character is part of the other permissions and the file is not
-executable or the directory is not searchable by others, and the
-.Dq sticky
-.Pq Dv S_ISVTX
-bit is set.
-.It s
-If the character is part of the owner permissions and the file is
-executable or the directory searchable by the owner, and the set-user-ID
-bit is set.
-.It s
-If the character is part of the group permissions and the file is
-executable or the directory searchable by the group, and the set-group-ID
-bit is set.
-.It t
-If the character is part of the other permissions and the file is
-executable or the directory searchable by others, and the
-.Dq sticky
-.Pq Dv S_ISVTX
-bit is set.
-.It x
-The file is executable or the directory is searchable.
-.It \-
-None of the above apply.
-.El
-.Pp
-The last character is a plus sign
-.Pq Ql +
-if there are any alternate
-or additional access control methods associated with the inode, otherwise
-it will be a space.
-.Sh SEE ALSO
-.Xr chmod 1 ,
-.Xr find 1 ,
-.Xr stat 2 ,
-.Xr getmode 3 ,
-.Xr setmode 3
-.Sh HISTORY
-The
-.Fn strmode
-function first appeared in
-.Bx 4.3 Reno .
diff --git a/src/lib/libc/string/strmode.c b/src/lib/libc/string/strmode.c
deleted file mode 100644
index 609b8931fb..0000000000
--- a/src/lib/libc/string/strmode.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*      $OpenBSD: strmode.c,v 1.8 2015/08/31 02:53:57 guenther 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 <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-
-/* XXX mode should be mode_t */
-
-void
-strmode(int mode, char *p)
-{
-         /* print type */
-        switch (mode & S_IFMT) {
-        case S_IFDIR:                   /* directory */
-                *p++ = 'd';
-                break;
-        case S_IFCHR:                   /* character special */
-                *p++ = 'c';
-                break;
-        case S_IFBLK:                   /* block special */
-                *p++ = 'b';
-                break;
-        case S_IFREG:                   /* regular */
-                *p++ = '-';
-                break;
-        case S_IFLNK:                   /* symbolic link */
-                *p++ = 'l';
-                break;
-        case S_IFSOCK:                  /* socket */
-                *p++ = 's';
-                break;
-#ifdef S_IFIFO
-        case S_IFIFO:                   /* fifo */
-                *p++ = 'p';
-                break;
-#endif
-        default:                        /* unknown */
-                *p++ = '?';
-                break;
-        }
-        /* usr */
-        if (mode & S_IRUSR)
-                *p++ = 'r';
-        else
-                *p++ = '-';
-        if (mode & S_IWUSR)
-                *p++ = 'w';
-        else
-                *p++ = '-';
-        switch (mode & (S_IXUSR | S_ISUID)) {
-        case 0:
-                *p++ = '-';
-                break;
-        case S_IXUSR:
-                *p++ = 'x';
-                break;
-        case S_ISUID:
-                *p++ = 'S';
-                break;
-        case S_IXUSR | S_ISUID:
-                *p++ = 's';
-                break;
-        }
-        /* group */
-        if (mode & S_IRGRP)
-                *p++ = 'r';
-        else
-                *p++ = '-';
-        if (mode & S_IWGRP)
-                *p++ = 'w';
-        else
-                *p++ = '-';
-        switch (mode & (S_IXGRP | S_ISGID)) {
-        case 0:
-                *p++ = '-';
-                break;
-        case S_IXGRP:
-                *p++ = 'x';
-                break;
-        case S_ISGID:
-                *p++ = 'S';
-                break;
-        case S_IXGRP | S_ISGID:
-                *p++ = 's';
-                break;
-        }
-        /* other */
-        if (mode & S_IROTH)
-                *p++ = 'r';
-        else
-                *p++ = '-';
-        if (mode & S_IWOTH)
-                *p++ = 'w';
-        else
-                *p++ = '-';
-        switch (mode & (S_IXOTH | S_ISVTX)) {
-        case 0:
-                *p++ = '-';
-                break;
-        case S_IXOTH:
-                *p++ = 'x';
-                break;
-        case S_ISVTX:
-                *p++ = 'T';
-                break;
-        case S_IXOTH | S_ISVTX:
-                *p++ = 't';
-                break;
-        }
-        *p++ = ' ';             /* will be a '+' if ACL's implemented */
-        *p = '\0';
-}
-DEF_WEAK(strmode);
diff --git a/src/lib/libc/string/strncat.3 b/src/lib/libc/string/strncat.3
deleted file mode 100644
index d314a9999a..0000000000
--- a/src/lib/libc/string/strncat.3
+++ /dev/null
@@ -1,132 +0,0 @@
-.\"     $OpenBSD: strncat.3,v 1.4 2014/04/19 16:50:46 jmc Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: April 19 2014 $
-.Dt STRNCAT 3
-.Os
-.Sh NAME
-.Nm strncat
-.Nd concatenate a string with part of another
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strncat "char *dst" "const char *append" "size_t count"
-.Sh DESCRIPTION
-The
-.Fn strncat
-function appends not more than
-.Fa count
-characters of the string
-.Fa append
-to the end of the string found in the buffer
-.Fa dst .
-Space for the terminating
-.Ql \e0
-should not be included in
-.Fa count .
-.Pp
-Bounds checking must be performed manually with great care.
-If the buffer
-.Fa dst
-is not large enough to hold the result,
-subsequent memory will be damaged.
-.Sh RETURN VALUES
-The
-.Fn strncat
-function returns the pointer
-.Fa dst .
-.Sh EXAMPLES
-The following example shows how to use
-.Fn strncat
-in conjunction with
-.Xr strncpy 3 :
-.Bd -literal -offset indent
-char buf[BUFSIZ];
-char *base, *suffix;
-
-(void)strncpy(buf, base, sizeof(buf) - 1);
-buf[sizeof(buf) - 1] = '\e0';
-(void)strncat(buf, suffix, sizeof(buf) - 1 - strlen(buf));
-.Ed
-.Pp
-The above will copy as many characters from
-.Va base
-to
-.Va buf
-as will fit.
-It then appends as many characters from
-.Va suffix
-as will fit.
-If either
-.Va base
-or
-.Va suffix
-are too large, truncation will occur without detection.
-.Pp
-The above example shows dangerous coding patterns, including an
-inability to detect truncation.
-.Fn strncat
-and
-.Fn strncpy
-are dangerously easy to misuse.
-The
-.Xr strlcpy 3
-and
-.Xr strlcat 3
-functions are safer for this kind of operation:
-.Bd -literal -offset indent
-if (strlcpy(buf, base, sizeof(buf)) >= sizeof(buf) ||
-    strlcat(buf, suffix, sizeof(buf)) >= sizeof(buf))
-        goto toolong;
-
-.Ed
-or for greatest portability,
-.Bd -literal -offset indent
-if (snprintf(buf, sizeof(buf), "%s%s",
-    base, suffix) >= sizeof(buf))
-        goto toolong;
-.Ed
-.Sh SEE ALSO
-.Xr strlcpy 3 ,
-.Xr wcscat 3 ,
-.Xr wcslcpy 3
-.Sh STANDARDS
-The
-.Fn strncat
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn strncat
-function first appeared in
-.At v7 .
diff --git a/src/lib/libc/string/strncat.c b/src/lib/libc/string/strncat.c
deleted file mode 100644
index b3388accf3..0000000000
--- a/src/lib/libc/string/strncat.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*      $OpenBSD: strncat.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-/*
- * Concatenate src on the end of dst.  At most strlen(dst)+n+1 bytes
- * are written at dst (at most n+1 bytes being appended).  Return dst.
- */
-char *
-strncat(char *dst, const char *src, size_t n)
-{
-        if (n != 0) {
-                char *d = dst;
-                const char *s = src;
-
-                while (*d != 0)
-                        d++;
-                do {
-                        if ((*d = *s++) == 0)
-                                break;
-                        d++;
-                } while (--n != 0);
-                *d = 0;
-        }
-        return (dst);
-}
-DEF_STRONG(strncat);
diff --git a/src/lib/libc/string/strncmp.c b/src/lib/libc/string/strncmp.c
deleted file mode 100644
index 535d2a60fd..0000000000
--- a/src/lib/libc/string/strncmp.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*      $OpenBSD: strncmp.c,v 1.9 2015/08/31 02:53:57 guenther Exp $    */
-
-/*
- * Copyright (c) 1989 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 <string.h>
-
-int
-strncmp(const char *s1, const char *s2, size_t n)
-{
-
-        if (n == 0)
-                return (0);
-        do {
-                if (*s1 != *s2++)
-                        return (*(unsigned char *)s1 - *(unsigned char *)--s2);
-                if (*s1++ == 0)
-                        break;
-        } while (--n != 0);
-        return (0);
-}
-DEF_STRONG(strncmp);
diff --git a/src/lib/libc/string/strncpy.3 b/src/lib/libc/string/strncpy.3
deleted file mode 100644
index 3a68a0bd5b..0000000000
--- a/src/lib/libc/string/strncpy.3
+++ /dev/null
@@ -1,138 +0,0 @@
-.\"     $OpenBSD: strncpy.3,v 1.2 2014/04/19 11:30:40 deraadt Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: April 19 2014 $
-.Dt STRNCPY 3
-.Os
-.Sh NAME
-.Nm strncpy
-.Nd copy part of a string to another
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strncpy "char *dst" "const char *src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn strncpy
-function copies not more than
-.Fa len
-characters from the string
-.Fa src
-to the buffer
-.Fa dst .
-If
-.Fa src
-is less than
-.Fa len
-characters long,
-it fills the remaining buffer with
-.Ql \e0
-characters.
-If the length of
-.Fa src
-is greater than or equal to
-.Fa len ,
-.Fa dst
-will
-.Em not
-be NUL-terminated.
-.Pp
-.Fn strncpy
-.Em only
-NUL terminates the destination string when the length of the source
-string is less than the length parameter.
-.Pp
-If the
-.Fa src
-and
-.Fa dst
-strings overlap, the behavior is undefined.
-.Sh RETURN VALUES
-The
-.Fn strncpy
-function returns
-.Fa dst .
-.Sh EXAMPLES
-The following sets
-.Va chararray
-to
-.Dq abc\e0\e0\e0 :
-.Bd -literal -offset indent
-(void)strncpy(chararray, "abc", 6);
-.Ed
-.Pp
-The following sets
-.Va chararray
-to
-.Dq abcdef ,
-without a NUL-terminator:
-.Bd -literal -offset indent
-(void)strncpy(chararray, "abcdefgh", 6);
-.Ed
-.Pp
-The following sequence copies as many characters from
-.Va input
-to
-.Va buf
-as will fit, and then NUL terminates the result by hand:
-.Bd -literal -offset indent
-char buf[BUFSIZ];
-
-(void)strncpy(buf, input, sizeof(buf) - 1);
-buf[sizeof(buf) - 1] = '\e0';
-.Ed
-.Pp
-By now it is clear that
-.Nm strncpy
-is dangerously easy to misuse.
-The
-.Xr strlcpy 3
-function is safer for this kind of operation:
-.Bd -literal -offset indent
-if (strlcpy(buf, input, sizeof(buf)) >= sizeof(buf))
-        goto toolong;
-.Ed
-.Sh SEE ALSO
-.Xr strlcpy 3 ,
-.Xr wcscpy 3 ,
-.Xr wcslcpy 3
-.Sh STANDARDS
-The
-.Fn strncpy
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn strncpy
-function first appeared in
-.At v7 .
diff --git a/src/lib/libc/string/strncpy.c b/src/lib/libc/string/strncpy.c
deleted file mode 100644
index d6d8647fc7..0000000000
--- a/src/lib/libc/string/strncpy.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*      $OpenBSD: strncpy.c,v 1.8 2015/08/31 02:53:57 guenther Exp $    */
-
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-/*
- * Copy src to dst, truncating or null-padding to always copy n bytes.
- * Return dst.
- */
-char *
-strncpy(char *dst, const char *src, size_t n)
-{
-        if (n != 0) {
-                char *d = dst;
-                const char *s = src;
-
-                do {
-                        if ((*d++ = *s++) == 0) {
-                                /* NUL pad the remaining n-1 bytes */
-                                while (--n != 0)
-                                        *d++ = 0;
-                                break;
-                        }
-                } while (--n != 0);
-        }
-        return (dst);
-}
-DEF_STRONG(strncpy);
diff --git a/src/lib/libc/string/strndup.c b/src/lib/libc/string/strndup.c
deleted file mode 100644
index 499f9a028a..0000000000
--- a/src/lib/libc/string/strndup.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*      $OpenBSD: strndup.c,v 1.3 2019/01/25 00:19:25 millert Exp $     */
-
-/*
- * Copyright (c) 2010 Todd C. Miller <millert@openbsd.org>
- *
- * 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 <sys/types.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-strndup(const char *str, size_t maxlen)
-{
-        char *copy;
-        size_t len;
-
-        len = strnlen(str, maxlen);
-        copy = malloc(len + 1);
-        if (copy != NULL) {
-                (void)memcpy(copy, str, len);
-                copy[len] = '\0';
-        }
-
-        return copy;
-}
-DEF_WEAK(strndup);
diff --git a/src/lib/libc/string/strnlen.c b/src/lib/libc/string/strnlen.c
deleted file mode 100644
index d50a927f28..0000000000
--- a/src/lib/libc/string/strnlen.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*      $OpenBSD: strnlen.c,v 1.9 2019/01/25 00:19:25 millert Exp $     */
-
-/*
- * Copyright (c) 2010 Todd C. Miller <millert@openbsd.org>
- *
- * 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 <sys/types.h>
-
-#include <string.h>
-
-size_t
-strnlen(const char *str, size_t maxlen)
-{
-        const char *cp;
-
-        for (cp = str; maxlen != 0 && *cp != '\0'; cp++, maxlen--)
-                ;
-
-        return (size_t)(cp - str);
-}
-DEF_WEAK(strnlen);
diff --git a/src/lib/libc/string/strpbrk.3 b/src/lib/libc/string/strpbrk.3
deleted file mode 100644
index b758df6854..0000000000
--- a/src/lib/libc/string/strpbrk.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\"     $OpenBSD: strpbrk.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt STRPBRK 3
-.Os
-.Sh NAME
-.Nm strpbrk
-.Nd locate multiple characters in string
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strpbrk "const char *s" "const char *charset"
-.Sh DESCRIPTION
-The
-.Fn strpbrk
-function locates in the NUL-terminated string
-.Fa s
-the first occurrence of any character in the string
-.Fa charset
-and returns a pointer to this character.
-If no characters from
-.Fa charset
-occur anywhere in
-.Fa s ,
-.Fn strpbrk
-returns
-.Dv NULL .
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr wcspbrk 3
-.Sh STANDARDS
-The
-.Fn strpbrk
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn strpbrk
-function first appeared in
-.At III
-and was reimplemented for
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/string/strpbrk.c b/src/lib/libc/string/strpbrk.c
deleted file mode 100644
index 336c22dedd..0000000000
--- a/src/lib/libc/string/strpbrk.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*      $OpenBSD: strpbrk.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
-/*
- * Copyright (c) 1985 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 <string.h>
-
-/*
- * Find the first occurrence in s1 of a character in s2 (excluding NUL).
- */
-char *
-strpbrk(const char *s1, const char *s2)
-{
-        const char *scanp;
-        int c, sc;
-
-        while ((c = *s1++) != 0) {
-                for (scanp = s2; (sc = *scanp++) != 0;)
-                        if (sc == c)
-                                return ((char *)(s1 - 1));
-        }
-        return (NULL);
-}
-DEF_STRONG(strpbrk);
diff --git a/src/lib/libc/string/strrchr.3 b/src/lib/libc/string/strrchr.3
deleted file mode 100644
index 5abb88ec70..0000000000
--- a/src/lib/libc/string/strrchr.3
+++ /dev/null
@@ -1,118 +0,0 @@
-.\"     $OpenBSD: strrchr.3,v 1.12 2018/10/01 06:37:37 martijn Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: October 1 2018 $
-.Dt STRRCHR 3
-.Os
-.Sh NAME
-.Nm strrchr ,
-.Nm rindex
-.Nd locate last occurrence of a character in a string
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strrchr "const char *s" "int c"
-.In strings.h
-.Ft char *
-.Fn rindex "const char *s" "int c"
-.Sh DESCRIPTION
-The
-.Fn strrchr
-function locates the last occurrence of the character
-.Fa c
-.Pq converted to a char
-in the string
-.Fa s .
-The terminating
-.Tn NUL
-character is considered part of the string.
-If
-.Fa c
-is
-.Ql \e0 ,
-.Fn strrchr
-locates the terminating
-.Ql \e0 .
-.Pp
-The
-.Fn rindex
-function is an old synonym for
-.Fn strrchr .
-.Sh RETURN VALUES
-The
-.Fn strrchr
-function returns a pointer to the located character or
-.Dv NULL
-if the character does not appear in the string.
-.Sh EXAMPLES
-After the following call to
-.Fn strrchr ,
-.Va p
-will point to the string
-.Qq obar :
-.Bd -literal -offset indent
-char *p;
-char *s = "foobar";
-
-p = strrchr(s, 'o');
-.Ed
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr wcsrchr 3
-.Sh STANDARDS
-The
-.Fn strrchr
-function conforms to
-.St -ansiC .
-.Pp
-The
-.Fn rindex
-function is deprecated and shouldn't be used in new code.
-.Sh HISTORY
-The
-.Fn rindex
-function first appeared in
-.At v7 .
-The
-.Fn strrchr
-function first appeared in
-.At III
-and was reimplemented for
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/string/strrchr.c b/src/lib/libc/string/strrchr.c
deleted file mode 100644
index 848d1ad22e..0000000000
--- a/src/lib/libc/string/strrchr.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*      $OpenBSD: strrchr.c,v 1.4 2018/10/01 06:37:37 martijn 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 <string.h>
-
-__weak_alias(rindex, strrchr);
-
-char *
-strrchr(const char *p, int ch)
-{
-        char *save;
-
-        for (save = NULL;; ++p) {
-                if (*p == (char) ch)
-                        save = (char *)p;
-                if (!*p)
-                        return(save);
-        }
-        /* NOTREACHED */
-}
-DEF_STRONG(strrchr);
diff --git a/src/lib/libc/string/strsep.3 b/src/lib/libc/string/strsep.3
deleted file mode 100644
index 77053f66d7..0000000000
--- a/src/lib/libc/string/strsep.3
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" $OpenBSD: strsep.3,v 1.14 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"     The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\"
-.\" 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.
-.\"
-.\"     @(#)strsep.3    8.1 (Berkeley) 6/9/93
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt STRSEP 3
-.Os
-.Sh NAME
-.Nm strsep
-.Nd separate strings
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strsep "char **stringp" "const char *delim"
-.Sh DESCRIPTION
-The
-.Fn strsep
-function locates, in the string referenced by
-.Fa *stringp ,
-the first occurrence of any character in the string
-.Fa delim
-(or the terminating
-.Ql \e0
-character) and replaces it with a
-.Ql \e0 .
-The location of the next character after the delimiter character
-(or
-.Dv NULL ,
-if the end of the string was reached) is stored in
-.Fa *stringp .
-The original value of
-.Fa *stringp
-is returned.
-.Pp
-An
-.Dq empty
-field, i.e., one caused by two adjacent delimiter characters,
-can be detected by comparing the location referenced by the pointer returned
-by
-.Fn strsep
-to
-.Ql \e0 .
-.Pp
-If
-.Fa *stringp
-is initially
-.Dv NULL ,
-.Fn strsep
-returns
-.Dv NULL .
-.Sh EXAMPLES
-The following uses
-.Fn strsep
-to parse a string, containing tokens delimited by whitespace, into an
-argument vector:
-.Bd -literal -offset indent
-char **ap, *argv[10], *inputstring;
-
-for (ap = argv; ap < &argv[9] &&
-    (*ap = strsep(&inputstring, " \et")) != NULL;) {
-        if (**ap != '\e0')
-                ap++;
-}
-*ap = NULL;
-.Ed
-.Sh HISTORY
-The
-.Fn strsep
-function first appeared in
-.Bx 4.3 Reno .
-It is intended as a replacement for the
-.Xr strtok 3
-function.
-While the
-.Xr strtok 3
-function should be preferred for portability reasons (it conforms to
-.St -ansiC )
-it is unable to handle empty fields, i.e., detect fields delimited by
-two adjacent delimiter characters, or to be used for more than a single
-string at a time.
diff --git a/src/lib/libc/string/strsep.c b/src/lib/libc/string/strsep.c
deleted file mode 100644
index 97c3cbf1f5..0000000000
--- a/src/lib/libc/string/strsep.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*      $OpenBSD: strsep.c,v 1.8 2015/08/31 02:53:57 guenther 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 <string.h>
-
-/*
- * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.  
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, strsep returns NULL.
- */
-char *
-strsep(char **stringp, const char *delim)
-{
-        char *s;
-        const char *spanp;
-        int c, sc;
-        char *tok;
-
-        if ((s = *stringp) == NULL)
-                return (NULL);
-        for (tok = s;;) {
-                c = *s++;
-                spanp = delim;
-                do {
-                        if ((sc = *spanp++) == c) {
-                                if (c == 0)
-                                        s = NULL;
-                                else
-                                        s[-1] = 0;
-                                *stringp = s;
-                                return (tok);
-                        }
-                } while (sc != 0);
-        }
-        /* NOTREACHED */
-}
-DEF_WEAK(strsep);
diff --git a/src/lib/libc/string/strsignal.3 b/src/lib/libc/string/strsignal.3
deleted file mode 100644
index b46be893b5..0000000000
--- a/src/lib/libc/string/strsignal.3
+++ /dev/null
@@ -1,78 +0,0 @@
-.\" Copyright (c) 1980, 1991 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
-.\" 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: strsignal.3,v 1.9 2019/05/16 13:35:16 schwarze Exp $
-.\"
-.Dd $Mdocdate: May 16 2019 $
-.Dt STRSIGNAL 3
-.Os
-.Sh NAME
-.Nm strsignal
-.Nd get signal description string
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strsignal "int sig"
-.Sh DESCRIPTION
-The
-.Fn strsignal
-function returns a pointer to the string describing the signal
-.Fa sig .
-.Pp
-The array pointed to is not to be modified by the program, but may be
-overwritten by subsequent calls to
-.Fn strsignal .
-.Sh SEE ALSO
-.Xr intro 2 ,
-.Xr psignal 3 ,
-.Xr setlocale 3
-.Sh STANDARDS
-The
-.Fn strsignal
-function conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn strsignal
-function first appeared in
-.At V.4
-and was reimplemented for
-.Nx 1.0 .
-.Sh CAVEATS
-On systems other than
-.Ox ,
-the
-.Dv LC_MESSAGES
-.Xr locale 1
-category can cause different strings to be returned instead of the
-normal signal descriptions; see CAVEATS in
-.Xr setlocale 3
-for details.
diff --git a/src/lib/libc/string/strsignal.c b/src/lib/libc/string/strsignal.c
deleted file mode 100644
index fe2a747943..0000000000
--- a/src/lib/libc/string/strsignal.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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 <string.h>
-#include <limits.h>
-
-char *
-strsignal(int sig)
-{
-        static char buf[NL_TEXTMAX];
-
-        return __strsignal(sig, buf);
-}
-DEF_WEAK(strsignal);
diff --git a/src/lib/libc/string/strspn.3 b/src/lib/libc/string/strspn.3
deleted file mode 100644
index e339d9b6af..0000000000
--- a/src/lib/libc/string/strspn.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\"     $OpenBSD: strspn.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt STRSPN 3
-.Os
-.Sh NAME
-.Nm strspn
-.Nd span a string
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strspn "const char *s" "const char *charset"
-.Sh DESCRIPTION
-The
-.Fn strspn
-function spans the initial part of the NUL-terminated string
-.Fa s
-as long as the characters from
-.Fa s
-occur in string
-.Fa charset .
-.Sh RETURN VALUES
-The
-.Fn strspn
-function returns the number of characters spanned.
-.Sh EXAMPLES
-The following call to
-.Fn strspn
-will return 3, since the first three characters of string
-.Fa s
-are part of string
-.Fa charset :
-.Bd -literal -offset indent
-char *s = "foobar";
-char *charset = "of";
-size_t span;
-
-span = strspn(s, charset);
-.Ed
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr wcsspn 3
-.Sh STANDARDS
-The
-.Fn strspn
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn strspn
-function first appeared in
-.At III
-and was reimplemented for
-.Bx 4.3 Tahoe .
diff --git a/src/lib/libc/string/strspn.c b/src/lib/libc/string/strspn.c
deleted file mode 100644
index 0ce41cbb49..0000000000
--- a/src/lib/libc/string/strspn.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*      $OpenBSD: strspn.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
-/*
- * Copyright (c) 1989 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 <string.h>
-
-/*
- * Span the string s2 (skip characters that are in s2).
- */
-size_t
-strspn(const char *s1, const char *s2)
-{
-        const char *p = s1, *spanp;
-        char c, sc;
-
-        /*
-         * Skip any characters in s2, excluding the terminating \0.
-         */
-cont:
-        c = *p++;
-        for (spanp = s2; (sc = *spanp++) != 0;)
-                if (sc == c)
-                        goto cont;
-        return (p - 1 - s1);
-}
-DEF_STRONG(strspn);
diff --git a/src/lib/libc/string/strstr.3 b/src/lib/libc/string/strstr.3
deleted file mode 100644
index 60d2a721a7..0000000000
--- a/src/lib/libc/string/strstr.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"     $OpenBSD: strstr.3,v 1.13 2016/05/11 17:51:50 schwarze Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: May 11 2016 $
-.Dt STRSTR 3
-.Os
-.Sh NAME
-.Nm strstr , strcasestr
-.Nd locate a substring in a string
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strstr "const char *big" "const char *little"
-.Ft char *
-.Fn strcasestr "const char *big" "const char *little"
-.Sh DESCRIPTION
-The
-.Fn strstr
-function locates the first occurrence of the NUL-terminated string
-.Fa little
-in the NUL-terminated string
-.Fa big .
-.Pp
-The
-.Fn strcasestr
-function is similar to
-.Fn strstr
-but ignores the case of both strings.
-.Sh RETURN VALUES
-If
-.Fa little
-is an empty string,
-.Fa big
-is returned;
-if
-.Fa little
-occurs nowhere in
-.Fa big ,
-.Dv NULL
-is returned;
-otherwise a pointer to the first character of the first occurrence of
-.Fa little
-is returned.
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr memmem 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strtok 3 ,
-.Xr wcsstr 3
-.Sh STANDARDS
-The
-.Fn strstr
-function conforms to
-.St -ansiC .
-.Sh HISTORY
-The
-.Fn strstr
-function first appeared in
-.Bx 4.3 Reno .
-The
-.Fn strcasestr
-function appeared in glibc 2.1,
-was reimplemented for
-.Fx 4.5
-and ported to
-.Ox 3.8 .
diff --git a/src/lib/libc/string/strstr.c b/src/lib/libc/string/strstr.c
deleted file mode 100644
index 241a080e7a..0000000000
--- a/src/lib/libc/string/strstr.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*      $OpenBSD: strstr.c,v 1.9 2020/04/16 12:37:52 claudio Exp $ */
-
-/*
- * Copyright (c) 2005-2018 Rich Felker
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <string.h>
-#include <stdint.h>
-
-static char *
-twobyte_strstr(const unsigned char *h, const unsigned char *n)
-{
-        uint16_t nw = n[0]<<8 | n[1], hw = h[0]<<8 | h[1];
-        for (h++; *h && hw != nw; hw = hw<<8 | *++h);
-        return *h ? (char *)h-1 : 0;
-}
-
-static char *
-threebyte_strstr(const unsigned char *h, const unsigned char *n)
-{
-        uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8;
-        uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8;
-        for (h+=2; *h && hw != nw; hw = (hw|*++h)<<8);
-        return *h ? (char *)h-2 : 0;
-}
-
-static char *
-fourbyte_strstr(const unsigned char *h, const unsigned char *n)
-{
-        uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8 | n[3];
-        uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8 | h[3];
-        for (h+=3; *h && hw != nw; hw = hw<<8 | *++h);
-        return *h ? (char *)h-3 : 0;
-}
-
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#define MIN(a,b) ((a)<(b)?(a):(b))
-
-#define BITOP(a,b,op) \
- ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a))))
-
-/*
- * Maxime Crochemore and Dominique Perrin, Two-way string-matching,
- * Journal of the ACM, 38(3):651-675, July 1991.
- */
-static char *
-twoway_strstr(const unsigned char *h, const unsigned char *n)
-{
-        const unsigned char *z;
-        size_t l, ip, jp, k, p, ms, p0, mem, mem0;
-        size_t byteset[32 / sizeof(size_t)] = { 0 };
-        size_t shift[256];
-
-        /* Computing length of needle and fill shift table */
-        for (l=0; n[l] && h[l]; l++)
-                BITOP(byteset, n[l], |=), shift[n[l]] = l+1;
-        if (n[l]) return 0; /* hit the end of h */
-
-        /* Compute maximal suffix */
-        ip = -1; jp = 0; k = p = 1;
-        while (jp+k<l) {
-                if (n[ip+k] == n[jp+k]) {
-                        if (k == p) {
-                                jp += p;
-                                k = 1;
-                        } else k++;
-                } else if (n[ip+k] > n[jp+k]) {
-                        jp += k;
-                        k = 1;
-                        p = jp - ip;
-                } else {
-                        ip = jp++;
-                        k = p = 1;
-                }
-        }
-        ms = ip;
-        p0 = p;
-
-        /* And with the opposite comparison */
-        ip = -1; jp = 0; k = p = 1;
-        while (jp+k<l) {
-                if (n[ip+k] == n[jp+k]) {
-                        if (k == p) {
-                                jp += p;
-                                k = 1;
-                        } else k++;
-                } else if (n[ip+k] < n[jp+k]) {
-                        jp += k;
-                        k = 1;
-                        p = jp - ip;
-                } else {
-                        ip = jp++;
-                        k = p = 1;
-                }
-        }
-        if (ip+1 > ms+1) ms = ip;
-        else p = p0;
-
-        /* Periodic needle? */
-        if (memcmp(n, n+p, ms+1)) {
-                mem0 = 0;
-                p = MAX(ms, l-ms-1) + 1;
-        } else mem0 = l-p;
-        mem = 0;
-
-        /* Initialize incremental end-of-haystack pointer */
-        z = h;
-
-        /* Search loop */
-        for (;;) {
-                /* Update incremental end-of-haystack pointer */
-                if (z-h < l) {
-                        /* Fast estimate for MIN(l,63) */
-                        size_t grow = l | 63;
-                        const unsigned char *z2 = memchr(z, 0, grow);
-                        if (z2) {
-                                z = z2;
-                                if (z-h < l) return 0;
-                        } else z += grow;
-                }
-
-                /* Check last byte first; advance by shift on mismatch */
-                if (BITOP(byteset, h[l-1], &)) {
-                        k = l-shift[h[l-1]];
-                        if (k) {
-                                if (k < mem) k = mem;
-                                h += k;
-                                mem = 0;
-                                continue;
-                        }
-                } else {
-                        h += l;
-                        mem = 0;
-                        continue;
-                }
-
-                /* Compare right half */
-                for (k=MAX(ms+1,mem); n[k] && n[k] == h[k]; k++);
-                if (n[k]) {
-                        h += k-ms;
-                        mem = 0;
-                        continue;
-                }
-                /* Compare left half */
-                for (k=ms+1; k>mem && n[k-1] == h[k-1]; k--);
-                if (k <= mem) return (char *)h;
-                h += p;
-                mem = mem0;
-        }
-}
-
-char *
-strstr(const char *h, const char *n)
-{
-        /* Return immediately on empty needle */
-        if (!n[0]) return (char *)h;
-
-        /* Use faster algorithms for short needles */
-        h = strchr(h, *n);
-        if (!h || !n[1]) return (char *)h;
-        if (!h[1]) return 0;
-        if (!n[2]) return twobyte_strstr((void *)h, (void *)n);
-        if (!h[2]) return 0;
-        if (!n[3]) return threebyte_strstr((void *)h, (void *)n);
-        if (!h[3]) return 0;
-        if (!n[4]) return fourbyte_strstr((void *)h, (void *)n);
-
-        return twoway_strstr((void *)h, (void *)n);
-}
-DEF_STRONG(strstr);
diff --git a/src/lib/libc/string/strtok.3 b/src/lib/libc/string/strtok.3
deleted file mode 100644
index 0f1f359ec4..0000000000
--- a/src/lib/libc/string/strtok.3
+++ /dev/null
@@ -1,169 +0,0 @@
-.\"     $OpenBSD: strtok.3,v 1.23 2017/09/02 13:56:44 schwarze Exp $
-.\"
-.\" Copyright (c) 1988, 1991 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
-.\" 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.
-.\"
-.Dd $Mdocdate: September 2 2017 $
-.Dt STRTOK 3
-.Os
-.Sh NAME
-.Nm strtok ,
-.Nm strtok_r
-.Nd string token operations
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strtok "char *str" "const char *sep"
-.Ft char *
-.Fn strtok_r "char *str" "const char *sep" "char **last"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr strsep 3 .
-.Ef
-.Pp
-The
-.Fn strtok
-function is used to isolate sequential tokens in a NUL-terminated string,
-.Fa str .
-These tokens are separated in the string by at least one of the
-characters in
-.Fa sep .
-The first time that
-.Fn strtok
-is called,
-.Fa str
-should be specified; subsequent calls, wishing to obtain further tokens
-from the same string, should pass a null pointer instead.
-The separator string,
-.Fa sep ,
-must be supplied each time, and may change between calls.
-.Pp
-The
-.Fn strtok_r
-function is a version of
-.Fn strtok
-that takes an explicit context argument and is reentrant.
-.Pp
-Since
-.Fn strtok
-and
-.Fn strtok_r
-modify the string,
-.Fa str
-should not point to an area in the initialized data segment.
-.Sh RETURN VALUES
-The
-.Fn strtok
-and
-.Fn strtok_r
-functions return a pointer to the beginning of each subsequent token
-in the string, after replacing the separator character itself with
-a NUL character.
-When no more tokens remain, a null pointer is returned.
-.Sh EXAMPLES
-The following will construct an array of pointers to each individual word in
-the string
-.Va s :
-.Bd -literal -offset indent
-#define MAXTOKENS       128
-
-char s[512], *p, *tokens[MAXTOKENS];
-char *last;
-int i = 0;
-
-snprintf(s, sizeof(s), "cat dog horse cow");
-
-for ((p = strtok_r(s, " ", &last)); p;
-    (p = strtok_r(NULL, " ", &last))) {
-        if (i < MAXTOKENS - 1)
-                tokens[i++] = p;
-}
-tokens[i] = NULL;
-.Ed
-.Pp
-That is,
-.Li tokens[0]
-will point to
-.Qq cat ,
-.Li tokens[1]
-will point to
-.Qq dog ,
-.Li tokens[2]
-will point to
-.Qq horse ,
-and
-.Li tokens[3]
-will point to
-.Qq cow .
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr wcstok 3
-.Sh STANDARDS
-The
-.Fn strtok
-function conforms to
-.St -ansiC .
-The
-.Fn strtok_r
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn strtok
-function first appeared in
-.At III
-and was reimplemented for
-.Bx 4.3 Tahoe .
-The
-.Fn strtok_r
-function first appeared in
-.Nx 1.3
-and was reimplemented for
-.Ox 2.7 .
-.Sh BUGS
-The System V
-.Fn strtok ,
-if handed a string containing only delimiter characters,
-will not alter the next starting point, so that a call to
-.Fn strtok
-with a different (or empty) delimiter string
-may return a non-null value.
-Since this implementation always alters the next starting point,
-such a sequence of calls would always return
-.Dv NULL .
diff --git a/src/lib/libc/string/strtok.c b/src/lib/libc/string/strtok.c
deleted file mode 100644
index c5765756fc..0000000000
--- a/src/lib/libc/string/strtok.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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 <string.h>
-
-char *
-strtok(char *s, const char *delim)
-{
-        static char *last;
-
-        return strtok_r(s, delim, &last);
-}
-DEF_STRONG(strtok);
-
-char *
-strtok_r(char *s, const char *delim, char **last)
-{
-        const char *spanp;
-        int c, sc;
-        char *tok;
-
-        if (s == NULL && (s = *last) == NULL)
-                return (NULL);
-
-        /*
-         * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
-         */
-cont:
-        c = *s++;
-        for (spanp = delim; (sc = *spanp++) != 0;) {
-                if (c == sc)
-                        goto cont;
-        }
-
-        if (c == 0) {           /* no non-delimiter characters */
-                *last = NULL;
-                return (NULL);
-        }
-        tok = s - 1;
-
-        /*
-         * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
-         * Note that delim must have one NUL; we stop if we see that, too.
-         */
-        for (;;) {
-                c = *s++;
-                spanp = delim;
-                do {
-                        if ((sc = *spanp++) == c) {
-                                if (c == 0)
-                                        s = NULL;
-                                else
-                                        s[-1] = '\0';
-                                *last = s;
-                                return (tok);
-                        }
-                } while (sc != 0);
-        }
-        /* NOTREACHED */
-}
-DEF_WEAK(strtok_r);
diff --git a/src/lib/libc/string/strxfrm.3 b/src/lib/libc/string/strxfrm.3
deleted file mode 100644
index dab3673f38..0000000000
--- a/src/lib/libc/string/strxfrm.3
+++ /dev/null
@@ -1,105 +0,0 @@
-.\"     $OpenBSD: strxfrm.3,v 1.12 2019/01/18 07:43:36 schwarze Exp $
-.\"
-.\" Copyright (c) 1990, 1991 The Regents of the University of California.
-.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
-.\" 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.
-.\"
-.Dd $Mdocdate: January 18 2019 $
-.Dt STRXFRM 3
-.Os
-.Sh NAME
-.Nm strxfrm ,
-.Nm strxfrm_l
-.Nd transform a string under locale
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strxfrm "char *dst" "const char *src" "size_t n"
-.Ft size_t
-.Fn strxfrm_l "char *dst" "const char *src" "size_t n" "locale_t locale"
-.Sh DESCRIPTION
-The idea of
-.Fn strxfrm
-and
-.Fn strxfrm_l
-is to
-.Dq un-localize
-a string: the functions transform
-.Ar src ,
-storing the result in
-.Ar dst ,
-such that
-.Xr strcmp 3
-on transformed strings returns what
-.Xr strcoll 3
-on the original untransformed strings would return.
-.Pp
-On
-.Ox ,
-both have the same effect as
-.Xr strlcpy 3 ,
-and the global locale, the thread-specific locale, and the
-.Fa locale
-argument are ignored.
-On other operating systems, the behaviour may depend on the
-.Dv LC_CTYPE
-and
-.Dv LC_COLLATE
-locale categories set with
-.Xr setlocale 3 ,
-.Xr uselocale 3 ,
-or
-.Xr newlocale 3 .
-.Sh SEE ALSO
-.Xr newlocale 3 ,
-.Xr setlocale 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strlcpy 3 ,
-.Xr wcsxfrm 3
-.Sh STANDARDS
-The
-.Fn strxfrm
-function conforms to
-.St -ansiC ,
-and
-.Fn strxfrm_l
-to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn strxfrm
-function has been available since
-.Bx 4.3 Reno ,
-and
-.Fn strxfrm_l
-since
-.Ox 6.2 .
diff --git a/src/lib/libc/string/strxfrm.c b/src/lib/libc/string/strxfrm.c
deleted file mode 100644
index 97df097b29..0000000000
--- a/src/lib/libc/string/strxfrm.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*      $OpenBSD: strxfrm.c,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990 The 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 <string.h>
-
-/*
- * Transform src, storing the result in dst, such that
- * strcmp() on transformed strings returns what strcoll()
- * on the original untransformed strings would return.
- */
-size_t
-strxfrm(char *dst, const char *src, size_t n)
-{
-
-        /*
-         * Since locales are unimplemented, this is just a copy.
-         */
-        if (n == 0)
-                return (strlen(src));
-        return (strlcpy(dst, src, n));
-}
-DEF_STRONG(strxfrm);
diff --git a/src/lib/libc/string/strxfrm_l.c b/src/lib/libc/string/strxfrm_l.c
deleted file mode 100644
index ff77947953..0000000000
--- a/src/lib/libc/string/strxfrm_l.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*      $OpenBSD: strxfrm_l.c,v 1.1 2017/09/05 03:16:14 schwarze Exp $ */
-/*
- * Written in 2017 by Ingo Schwarze <schwarze@openbsd.org>.
- * Released into the public domain.
- */
-
-#include <string.h>
-
-size_t
-strxfrm_l(char *dst, const char *src, size_t n,
-    locale_t locale __attribute__((__unused__)))
-{
-        return strxfrm(dst, src, n);
-}
diff --git a/src/lib/libc/string/swab.3 b/src/lib/libc/string/swab.3
deleted file mode 100644
index 57afdd4d79..0000000000
--- a/src/lib/libc/string/swab.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\" Copyright (c) 1990, 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. 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: swab.3,v 1.9 2014/12/12 20:06:13 schwarze Exp $
-.\"
-.Dd $Mdocdate: December 12 2014 $
-.Dt SWAB 3
-.Os
-.Sh NAME
-.Nm swab
-.Nd swap adjacent bytes
-.Sh SYNOPSIS
-.In unistd.h
-.Ft void
-.Fo swab
-.Fa "const void *restrict src"
-.Fa "void *restrict dst"
-.Fa "ssize_t len"
-.Fc
-.Sh DESCRIPTION
-The function
-.Fn swab
-copies
-.Fa len
-bytes from the location referenced by
-.Fa src
-to the location referenced by
-.Fa dst ,
-swapping adjacent bytes.
-.Pp
-If
-.Fa len
-is zero or less,
-.Nm
-does nothing.
-If it is odd, what happens to the last byte is unspecified.
-If
-.Fa src
-and
-.Fa dst
-overlap, behaviour is undefined.
-.Sh SEE ALSO
-.Xr bzero 3 ,
-.Xr memset 3
-.Sh STANDARDS
-The
-.Nm
-function is compliant with the X/Open System Interfaces option of the
-.St -p1003.1-2008
-specification.
-.Sh HISTORY
-The
-.Fn swab
-function first appeared in
-.At v7 .
diff --git a/src/lib/libc/string/swab.c b/src/lib/libc/string/swab.c
deleted file mode 100644
index c7d7d72ce0..0000000000
--- a/src/lib/libc/string/swab.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*      $OpenBSD: swab.c,v 1.9 2014/12/11 23:05:38 tedu Exp $ */
-/*
- * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
- *
- * 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 <unistd.h>
-
-void
-swab(const void *__restrict from, void *__restrict to, ssize_t len)
-{
-        const unsigned char *src = from;
-        unsigned char *dst = to;
-        unsigned char t0, t1;
-
-        while (len > 1) {
-                t0 = src[0];
-                t1 = src[1];
-                dst[0] = t1;
-                dst[1] = t0;
-                src += 2;
-                dst += 2;
-                len -= 2;
-        }
-}
diff --git a/src/lib/libc/string/timingsafe_bcmp.3 b/src/lib/libc/string/timingsafe_bcmp.3
deleted file mode 100644
index 00da769157..0000000000
--- a/src/lib/libc/string/timingsafe_bcmp.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"     $OpenBSD: timingsafe_bcmp.3,v 1.2 2014/06/21 20:22:15 tedu Exp $
-.\"
-.\" Copyright (c) 2014 Google Inc.
-.\"
-.\" 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 $Mdocdate: June 21 2014 $
-.Dt TIMINGSAFE_BCMP 3
-.Os
-.Sh NAME
-.Nm timingsafe_bcmp ,
-.Nm timingsafe_memcmp
-.Nd timing-safe byte sequence comparisons
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn timingsafe_bcmp "const void *b1" "const void *b2" "size_t len"
-.Ft int
-.Fn timingsafe_memcmp "const void *b1" "const void *b2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn timingsafe_bcmp
-and
-.Fn timingsafe_memcmp
-functions lexicographically compare the first
-.Fa len
-bytes (each interpreted as an
-.Vt unsigned char )
-pointed to by
-.Fa b1
-and
-.Fa b2 .
-.Pp
-Additionally, their running times are independent of the byte sequences compared,
-making them safe to use for comparing secret values such as cryptographic MACs.
-In contrast,
-.Xr bcmp 3
-and
-.Xr memcmp 3
-may short-circuit after finding the first differing byte.
-.Sh RETURN VALUES
-The
-.Fn timingsafe_bcmp
-function returns 0 or not zero if the byte sequence pointed to by
-.Fa b1
-compares equal to or not equal to (respectively)
-the byte sequence pointed to by
-.Fa b2 .
-.Pp
-The
-.Fn timingsafe_memcmp
-function returns a negative value, 0, or positive value if the byte sequence
-pointed to by
-.Fa b1
-compares less than, equal to, or greater than (respectively)
-the byte sequence pointed to by
-.Fa b2 .
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr memcmp 3
-.Sh STANDARDS
-The
-.Fn timingsafe_bcmp
-and
-.Fn timingsafe_memcmp
-functions are
-.Ox
-extensions.
-.Sh HISTORY
-The
-.Fn timingsafe_bcmp
-function first appeared in
-.Ox 4.9 .
-.Pp
-The
-.Fn timingsafe_memcmp
-function first appeared in
-.Ox 5.6 .
diff --git a/src/lib/libc/string/timingsafe_bcmp.c b/src/lib/libc/string/timingsafe_bcmp.c
deleted file mode 100644
index 0409ec3244..0000000000
--- a/src/lib/libc/string/timingsafe_bcmp.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*      $OpenBSD: timingsafe_bcmp.c,v 1.3 2015/08/31 02:53:57 guenther Exp $    */
-/*
- * Copyright (c) 2010 Damien 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 <string.h>
-
-int
-timingsafe_bcmp(const void *b1, const void *b2, size_t n)
-{
-        const unsigned char *p1 = b1, *p2 = b2;
-        int ret = 0;
-
-        for (; n > 0; n--)
-                ret |= *p1++ ^ *p2++;
-        return (ret != 0);
-}
-DEF_WEAK(timingsafe_bcmp);
diff --git a/src/lib/libc/string/timingsafe_memcmp.c b/src/lib/libc/string/timingsafe_memcmp.c
deleted file mode 100644
index 373f8cb197..0000000000
--- a/src/lib/libc/string/timingsafe_memcmp.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*      $OpenBSD: timingsafe_memcmp.c,v 1.2 2015/08/31 02:53:57 guenther Exp $  */
-/*
- * Copyright (c) 2014 Google Inc.
- *
- * 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 <limits.h>
-#include <string.h>
-
-int
-timingsafe_memcmp(const void *b1, const void *b2, size_t len)
-{
-        const unsigned char *p1 = b1, *p2 = b2;
-        size_t i;
-        int res = 0, done = 0;
-
-        for (i = 0; i < len; i++) {
-                /* lt is -1 if p1[i] < p2[i]; else 0. */
-                int lt = (p1[i] - p2[i]) >> CHAR_BIT;
-
-                /* gt is -1 if p1[i] > p2[i]; else 0. */
-                int gt = (p2[i] - p1[i]) >> CHAR_BIT;
-
-                /* cmp is 1 if p1[i] > p2[i]; -1 if p1[i] < p2[i]; else 0. */
-                int cmp = lt - gt;
-
-                /* set res = cmp if !done. */
-                res |= cmp & ~done;
-
-                /* set done if p1[i] != p2[i]. */
-                done |= lt | gt;
-        }
-
-        return (res);
-}
-DEF_WEAK(timingsafe_memcmp);
diff --git a/src/lib/libc/string/wcscasecmp.3 b/src/lib/libc/string/wcscasecmp.3
deleted file mode 100644
index 9db4a829b9..0000000000
--- a/src/lib/libc/string/wcscasecmp.3
+++ /dev/null
@@ -1,134 +0,0 @@
-.\"     $OpenBSD: wcscasecmp.3,v 1.5 2017/09/05 03:16:14 schwarze Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"     The Regents of the University of California.  All rights reserved.
-.\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
-.\"
-.\" 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.
-.\"
-.\"     @(#)strcasecmp.3        8.1 (Berkeley) 6/9/93
-.\"
-.Dd $Mdocdate: September 5 2017 $
-.Dt WCSCASECMP 3
-.Os
-.Sh NAME
-.Nm wcscasecmp ,
-.Nm wcscasecmp_l ,
-.Nm wcsncasecmp ,
-.Nm wcsncasecmp_l
-.Nd compare wide strings, ignoring case
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fo wcscasecmp
-.Fa "const wchar_t *s1"
-.Fa "const wchar_t *s2"
-.Fc
-.Ft int
-.Fo wcscasecmp_l
-.Fa "const wchar_t *s1"
-.Fa "const wchar_t *s2"
-.Fa "locale_t locale"
-.Fc
-.Ft int
-.Fo wcsncasecmp
-.Fa "const wchar_t *s1"
-.Fa "const wchar_t *s2"
-.Fa "size_t len"
-.Fc
-.Ft int
-.Fo wcsncasecmp_l
-.Fa "const wchar_t *s1"
-.Fa "const wchar_t *s2"
-.Fa "size_t len"
-.Fa "locale_t locale"
-.Fc
-.Sh DESCRIPTION
-These functions compare the wide strings
-.Fa s1
-and
-.Fa s2
-and return an integer greater than, equal to, or less than 0,
-according to whether
-.Fa s1
-is lexicographically greater than, equal to, or less than
-.Fa s2
-after translation of each corresponding wide character to lower case.
-The wide strings themselves are not modified.
-.Pp
-For the translation to lower case,
-.Fn wcscasecmp
-and
-.Fn wcsncasecmp
-use the thread-specific locale as defined with
-.Xr uselocale 3 ,
-falling back to the global locale defined with
-.Xr setlocale 3 .
-.Fn wcscasecmp_l
-and
-.Fn wcsncasecmp_l
-use the
-.Fa locale
-argument instead.
-.Pp
-.Fn wcsncasecmp
-and
-.Fn wcsncasecmp_l
-compare at most
-.Fa len
-wide characters.
-.Sh SEE ALSO
-.Xr newlocale 3 ,
-.Xr setlocale 3 ,
-.Xr strcasecmp 3 ,
-.Xr wcscmp 3 ,
-.Xr wmemcmp 3
-.Sh STANDARDS
-These functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn wcscasecmp
-and
-.Fn wcsncasecmp
-functions have been available since
-.Ox 5.0 ,
-and
-.Fn wcscasecmp_l
-and
-.Fn wcsncasecmp_l
-since
-.Ox 6.2 .
-.Sh AUTHORS
-The
-.Ox
-versions of
-.Fn wcscasecmp
-and
-.Fn wcsncasecmp
-were implemented by
-.An Marc Espie Aq Mt espie@openbsd.org .
diff --git a/src/lib/libc/string/wcscasecmp.c b/src/lib/libc/string/wcscasecmp.c
deleted file mode 100644
index b122e720fe..0000000000
--- a/src/lib/libc/string/wcscasecmp.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*      $OpenBSD: wcscasecmp.c,v 1.3 2015/09/12 16:23:14 guenther Exp $ */
-
-/*
- * Copyright (c) 2011 Marc Espie
- *
- * 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 BY THE OPENBSD PROJECT 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 OPENBSD
- * PROJECT 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 <wchar.h>
-#include <wctype.h>
-#include "locale/runetype.h"
-
-int
-wcscasecmp(const wchar_t *s1, const wchar_t *s2)
-{
-        wchar_t l1, l2;
-
-        while ((l1 = towlower(*s1++)) == (l2 = towlower(*s2++))) {
-                if (l1 == 0)
-                        return (0);
-        }
-        /* XXX assumes wchar_t = int */
-        return ((rune_t)l1 - (rune_t)l2);
-}
-DEF_WEAK(wcscasecmp);
-
-int
-wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-        wchar_t l1, l2;
-
-        if (n == 0)
-                return (0);
-        do {
-                if (((l1 = towlower(*s1++))) != (l2 = towlower(*s2++))) {
-                        /* XXX assumes wchar_t = int */
-                        return ((rune_t)l1 - (rune_t)l2);
-                }
-                if (l1 == 0)
-                        break;
-        } while (--n != 0);
-        return (0);
-}
-DEF_WEAK(wcsncasecmp);
diff --git a/src/lib/libc/string/wcscasecmp_l.c b/src/lib/libc/string/wcscasecmp_l.c
deleted file mode 100644
index 35b99225c1..0000000000
--- a/src/lib/libc/string/wcscasecmp_l.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*      $OpenBSD: wcscasecmp_l.c,v 1.1 2017/09/05 03:16:14 schwarze Exp $ */
-
-/*
- * Copyright (c) 2011 Marc Espie
- *
- * 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 BY THE OPENBSD PROJECT 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 OPENBSD
- * PROJECT 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 <wchar.h>
-#include <wctype.h>
-#include "locale/runetype.h"
-
-int
-wcscasecmp_l(const wchar_t *s1, const wchar_t *s2, locale_t locale)
-{
-        wchar_t l1, l2;
-
-        while ((l1 = towlower_l(*s1++, locale)) ==
-            (l2 = towlower_l(*s2++, locale))) {
-                if (l1 == 0)
-                        return (0);
-        }
-        /* XXX assumes wchar_t = int */
-        return ((rune_t)l1 - (rune_t)l2);
-}
-
-int
-wcsncasecmp_l(const wchar_t *s1, const wchar_t *s2, size_t n, locale_t locale)
-{
-        wchar_t l1, l2;
-
-        if (n == 0)
-                return (0);
-        do {
-                if (((l1 = towlower_l(*s1++, locale))) !=
-                    (l2 = towlower_l(*s2++, locale))) {
-                        /* XXX assumes wchar_t = int */
-                        return ((rune_t)l1 - (rune_t)l2);
-                }
-                if (l1 == 0)
-                        break;
-        } while (--n != 0);
-        return (0);
-}
diff --git a/src/lib/libc/string/wcscat.3 b/src/lib/libc/string/wcscat.3
deleted file mode 100644
index 9b7588cf9e..0000000000
--- a/src/lib/libc/string/wcscat.3
+++ /dev/null
@@ -1,115 +0,0 @@
-.\"     $OpenBSD: wcscat.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WCSCAT 3
-.Os
-.Sh NAME
-.Nm wcscat ,
-.Nm wcsncat
-.Nd concatenate wide strings
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcscat "wchar_t * restrict s" "const wchar_t * restrict append"
-.Ft wchar_t *
-.Fo wcsncat
-.Fa "wchar_t * restrict s"
-.Fa "const wchar_t * restrict append"
-.Fa "size_t count"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn wcscat
-and
-.Fn wcsncat
-functions append a copy of the wide string
-.Fa append
-to the end of the wide string
-.Fa s ,
-then add a terminating null wide character (L'\e0').
-The wide string
-.Fa s
-must have sufficient space to hold the result.
-.Pp
-The
-.Fn wcsncat
-function appends not more than
-.Fa count
-wide characters where space for the terminating null wide character
-should not be included in
-.Fa count .
-.Sh RETURN VALUES
-The
-.Fn wcscat
-and
-.Fn wcsncat
-functions return the pointer
-.Fa s .
-.Sh SEE ALSO
-.Xr strcat 3 ,
-.Xr strlcpy 3 ,
-.Xr wcscpy 3 ,
-.Xr wcslcpy 3 ,
-.Xr wmemcpy 3 ,
-.Xr wmemmove 3
-.Sh STANDARDS
-The
-.Fn wcscat
-and
-.Fn wcsncat
-functions conform to
-.St -isoC-99
-and were first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wcscat
-and
-.Fn wcsncat
-functions were ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
-.Sh CAVEATS
-Using the functions
-.Fn wcscat
-and
-.Fn wcsncat
-is very error-prone with respect to buffer overflows;
-see the EXAMPLES section in
-.Xr strcat 3
-for correct usage.
-Using
-.Xr wcslcat 3
-is a better choice in most cases.
diff --git a/src/lib/libc/string/wcscat.c b/src/lib/libc/string/wcscat.c
deleted file mode 100644
index 0525c3cb14..0000000000
--- a/src/lib/libc/string/wcscat.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*      $OpenBSD: wcscat.c,v 1.5 2017/11/28 06:55:49 tb Exp $   */
-/*      $NetBSD: wcscat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcscat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <wchar.h>
-
-#if defined(APIWARN)
-__warn_references(wcscat,
-    "wcscat() is almost always misused, please use wcslcat()");
-#endif
-
-wchar_t *
-wcscat(wchar_t *s1, const wchar_t *s2)
-{
-        wchar_t *p;
-        wchar_t *q;
-        const wchar_t *r;
-
-        p = s1;
-        while (*p)
-                p++;
-        q = p;
-        r = s2;
-        while (*r)
-                *q++ = *r++;
-        *q = '\0';
-        return s1;
-}
-DEF_STRONG(wcscat);
diff --git a/src/lib/libc/string/wcschr.3 b/src/lib/libc/string/wcschr.3
deleted file mode 100644
index bb714b2099..0000000000
--- a/src/lib/libc/string/wcschr.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"     $OpenBSD: wcschr.3,v 1.4 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WCSCHR 3
-.Os
-.Sh NAME
-.Nm wcschr
-.Nd locate first occurrence of a wide character in a wide string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcschr "const wchar_t *s" "wchar_t c"
-.Sh DESCRIPTION
-The
-.Fn wcschr
-function locates the first occurrence of the wide character
-.Fa c
-in the wide string
-.Fa s .
-The terminating null wide character is considered part of the wide string.
-If
-.Fa c
-is the null wide character (L'\e0'),
-.Fn wcschr
-locates the terminating null wide character.
-.Sh RETURN VALUES
-The
-.Fn wcschr
-function returns a pointer to the located wide character or
-.Dv NULL
-if the wide character does not appear in the wide string.
-.Sh SEE ALSO
-.Xr strchr 3 ,
-.Xr wcscspn 3 ,
-.Xr wcspbrk 3 ,
-.Xr wcsrchr 3 ,
-.Xr wcsspn 3 ,
-.Xr wcsstr 3 ,
-.Xr wcstok 3 ,
-.Xr wmemchr 3
-.Sh STANDARDS
-The
-.Fn wcschr
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wcschr
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wcschr.c b/src/lib/libc/string/wcschr.c
deleted file mode 100644
index 709d4797bb..0000000000
--- a/src/lib/libc/string/wcschr.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*      $OpenBSD: wcschr.c,v 1.6 2015/10/01 02:32:07 guenther Exp $     */
-/*      $NetBSD: wcschr.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcschr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <wchar.h>
-
-wchar_t *
-wcschr(const wchar_t *s, wchar_t c)
-{
-        const wchar_t *p;
-
-        p = s;
-        for (;;) {
-                if (*p == c) {
-                        return (wchar_t *)p;
-                }
-                if (!*p)
-                        return NULL;
-                p++;
-        }
-        /* NOTREACHED */
-}
-DEF_STRONG(wcschr);
diff --git a/src/lib/libc/string/wcscmp.3 b/src/lib/libc/string/wcscmp.3
deleted file mode 100644
index 53cd15a1f0..0000000000
--- a/src/lib/libc/string/wcscmp.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\"     $OpenBSD: wcscmp.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WCSCMP 3
-.Os
-.Sh NAME
-.Nm wcscmp ,
-.Nm wcsncmp
-.Nd compare wide strings
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wcscmp "const wchar_t *s1" "const wchar_t *s2"
-.Ft int
-.Fn wcsncmp "const wchar_t *s1" "const wchar_t *s2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn wcscmp
-and
-.Fn wcsncmp
-functions lexicographically compare the wide strings
-.Fa s1
-and
-.Fa s2 .
-The
-.Fn wcsncmp
-function compares at most
-.Fa len
-wide characters.
-.Sh RETURN VALUES
-The
-.Fn wcscmp
-and
-.Fn wcsncmp
-functions return an integer greater than, equal to, or less than 0, according
-to whether the wide string
-.Fa s1
-is greater than, equal to, or less than the wide string
-.Fa s2 .
-.Sh SEE ALSO
-.Xr strcmp 3 ,
-.Xr wcscasecmp 3 ,
-.Xr wmemcmp 3
-.Sh STANDARDS
-The
-.Fn wcscmp
-and
-.Fn wcsncmp
-functions conform to
-.St -isoC-99
-and were first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wcscmp
-and
-.Fn wcsncmp
-functions were ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wcscmp.c b/src/lib/libc/string/wcscmp.c
deleted file mode 100644
index 42d6bca3cc..0000000000
--- a/src/lib/libc/string/wcscmp.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*      $OpenBSD: wcscmp.c,v 1.5 2015/09/12 16:23:14 guenther Exp $     */
-/*      $NetBSD: wcscmp.c,v 1.5 2003/08/07 16:43:54 agc Exp $   */
-
-/*-
- * Copyright (c) 1990, 1993
- *      The 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 <wchar.h>
-#include "locale/runetype.h"
-
-/*
- * Compare strings.
- */
-int
-wcscmp(const wchar_t *s1, const wchar_t *s2)
-{
-
-        while (*s1 == *s2++)
-                if (*s1++ == 0)
-                        return (0);
-        /* XXX assumes wchar_t = int */
-        return (*(const rune_t *)s1 - *(const rune_t *)--s2);
-}
-DEF_STRONG(wcscmp);
diff --git a/src/lib/libc/string/wcscpy.3 b/src/lib/libc/string/wcscpy.3
deleted file mode 100644
index fcf01b5c57..0000000000
--- a/src/lib/libc/string/wcscpy.3
+++ /dev/null
@@ -1,129 +0,0 @@
-.\"     $OpenBSD: wcscpy.3,v 1.5 2016/11/12 08:58:43 jmc Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: November 12 2016 $
-.Dt WCSCPY 3
-.Os
-.Sh NAME
-.Nm wcscpy ,
-.Nm wcsncpy
-.Nd copy wide strings
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcscpy "wchar_t * restrict dst" "const wchar_t * restrict src"
-.Ft wchar_t *
-.Fo wcsncpy
-.Fa "wchar_t * restrict dst"
-.Fa "const wchar_t * restrict src"
-.Fa "size_t len"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn wcscpy
-and
-.Fn wcsncpy
-functions copy the wide string
-.Fa src
-to
-.Fa dst
-(including the terminating null wide character).
-.Pp
-The
-.Fn wcsncpy
-function copies not more than
-.Fa len
-wide characters to
-.Fa dst ,
-appending null wide characters if the length of
-.Fa src
-is less than
-.Fa len ,
-and
-.Em not
-terminating
-.Fa dst
-if the length of
-.Fa src
-is greater than or equal to
-.Fa len .
-.Pp
-If the
-.Fa src
-and
-.Fa dst
-strings overlap, the behavior is undefined.
-.Sh RETURN VALUES
-The
-.Fn wcscpy
-and
-.Fn wcsncpy
-functions return
-.Fa dst .
-.Sh SEE ALSO
-.Xr strcpy 3 ,
-.Xr strlcpy 3 ,
-.Xr wcscat 3 ,
-.Xr wcslcpy 3 ,
-.Xr wmemcpy 3 ,
-.Xr wmemmove 3
-.Sh STANDARDS
-The
-.Fn wcscpy
-and
-.Fn wcsncpy
-functions conform to
-.St -isoC-99
-and were first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wcscpy
-and
-.Fn wcsncpy
-functions were ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
-.Sh CAVEATS
-Using the functions
-.Fn wcscpy
-and
-.Fn wcsncpy
-is very error-prone with respect to buffer overflows;
-see the EXAMPLES section in
-.Xr strncpy 3
-for correct usage.
-Using
-.Xr wcslcpy 3
-is a better choice in most cases.
diff --git a/src/lib/libc/string/wcscpy.c b/src/lib/libc/string/wcscpy.c
deleted file mode 100644
index f772752413..0000000000
--- a/src/lib/libc/string/wcscpy.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*      $OpenBSD: wcscpy.c,v 1.5 2017/11/28 06:55:49 tb Exp $   */
-/*      $NetBSD: wcscpy.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcscpy.c,v 1.2 2000/12/21 04:51:09 itojun Exp
- */
-
-#include <wchar.h>
-
-#if defined(APIWARN)
-__warn_references(wcscpy,
-    "wcscpy() is almost always misused, please use wcslcpy()");
-#endif
-
-wchar_t *
-wcscpy(wchar_t *s1, const wchar_t *s2)
-{
-        wchar_t *p;
-        const wchar_t *q;
-
-        p = s1;
-        q = s2;
-        while (*q)
-                *p++ = *q++;
-        *p = '\0';
-
-        return s1;
-}
diff --git a/src/lib/libc/string/wcscspn.3 b/src/lib/libc/string/wcscspn.3
deleted file mode 100644
index 520a739202..0000000000
--- a/src/lib/libc/string/wcscspn.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\"     $OpenBSD: wcscspn.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WCSCSPN 3
-.Os
-.Sh NAME
-.Nm wcscspn
-.Nd span the complement of a wide string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn wcscspn "const wchar_t *s" "const wchar_t *charset"
-.Sh DESCRIPTION
-The
-.Fn wcscspn
-function spans the initial part of the wide string
-.Fa s
-as long as the wide characters from
-.Fa s
-do not occur in string
-.Fa charset
-(it spans the
-.Em complement
-of
-.Fa charset ) .
-.Sh RETURN VALUES
-The
-.Fn wcscspn
-function returns the number of wide characters spanned.
-.Sh SEE ALSO
-.Xr strcspn 3 ,
-.Xr wcschr 3 ,
-.Xr wcspbrk 3 ,
-.Xr wcsrchr 3 ,
-.Xr wcsspn 3 ,
-.Xr wcsstr 3 ,
-.Xr wcstok 3 ,
-.Xr wmemchr 3
-.Sh STANDARDS
-The
-.Fn wcscspn
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wcscspn
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wcscspn.c b/src/lib/libc/string/wcscspn.c
deleted file mode 100644
index 23e78ab22f..0000000000
--- a/src/lib/libc/string/wcscspn.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*      $OpenBSD: wcscspn.c,v 1.4 2015/09/12 16:23:14 guenther Exp $    */
-/*      $NetBSD: wcscspn.c,v 1.2 2001/01/03 14:29:36 lukem Exp $        */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcscspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <wchar.h>
-
-size_t
-wcscspn(const wchar_t *s, const wchar_t *set)
-{
-        const wchar_t *p;
-        const wchar_t *q;
-
-        p = s;
-        while (*p) {
-                q = set;
-                while (*q) {
-                        if (*p == *q)
-                                goto done;
-                        q++;
-                }
-                p++;
-        }
-
-done:
-        return (p - s);
-}
-DEF_STRONG(wcscspn);
diff --git a/src/lib/libc/string/wcsdup.3 b/src/lib/libc/string/wcsdup.3
deleted file mode 100644
index 588a2571db..0000000000
--- a/src/lib/libc/string/wcsdup.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"     $OpenBSD: wcsdup.3,v 1.4 2011/07/25 00:38:53 schwarze Exp $
-.\"     $NetBSD: wcsdup.3,v 1.3 2010/12/16 17:42:28 wiz 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.
-.\"
-.\"     @(#)strdup.3    8.1 (Berkeley) 6/9/93
-.\"
-.Dd $Mdocdate: July 25 2011 $
-.Dt WCSDUP 3
-.Os
-.Sh NAME
-.Nm wcsdup
-.Nd save a copy of a wide string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcsdup "const wchar_t *str"
-.Sh DESCRIPTION
-The
-.Fn wcsdup
-function
-allocates sufficient memory for a copy
-of the wide-character string
-.Fa str ,
-does the copy, and returns a pointer to it.
-The pointer may subsequently be used as an
-argument to the function
-.Xr free 3 .
-.Pp
-If insufficient memory is available,
-.Dv NULL
-is returned.
-.Sh EXAMPLES
-The following will point
-.Va p
-to an allocated area of memory containing the nul-terminated string
-.Qq foobar :
-.Bd -literal -offset indent
-const char      *o = "foobar";
-wchar_t         *p, b[32];
-size_t           blen;
-
-blen = sizeof(b) / sizeof(b[0]);
-if (mbstowcs(b, o, blen) == (size_t)-1)
-        err(1, NULL);
-b[blen - 1] = 0;
-if ((p = wcsdup(b)) == NULL)
-        err(1, NULL);
-.Ed
-.Sh ERRORS
-The
-.Fn wcsdup
-function may fail and set the external variable
-.Va errno
-for any of the errors specified for the library function
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr strdup 3
-.Sh STANDARDS
-The
-.Fn wcsdup
-function conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn wcsdup
-function was ported from
-.Nx
-and first appeared in
-.Ox 5.0 .
diff --git a/src/lib/libc/string/wcsdup.c b/src/lib/libc/string/wcsdup.c
deleted file mode 100644
index 36f19186ab..0000000000
--- a/src/lib/libc/string/wcsdup.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*      $OpenBSD: wcsdup.c,v 1.3 2015/09/12 16:23:14 guenther Exp $     */
-/*      $NetBSD: wcsdup.c,v 1.3 2008/05/26 13:17:48 haad Exp $  */
-
-/*
- * Copyright (C) 2006 Aleksey Cheusov
- *
- * This material is provided "as is", with absolutely no warranty expressed
- * or implied. Any use is at your own risk.
- *
- * Permission to use or copy this software for any purpose is hereby granted
- * without fee. Permission to modify the code and to distribute modified
- * code is also granted without any restrictions.
- */
-
-#include <stdlib.h>
-#include <wchar.h>
-
-wchar_t *
-wcsdup(const wchar_t *str)
-{
-        wchar_t *copy;
-        size_t len;
-
-        len = wcslen(str) + 1;
-        copy = reallocarray(NULL, len, sizeof(wchar_t));
-
-        if (!copy)
-                return (NULL);
-
-        return (wmemcpy(copy, str, len));
-}
-DEF_WEAK(wcsdup);
diff --git a/src/lib/libc/string/wcslcat.c b/src/lib/libc/string/wcslcat.c
deleted file mode 100644
index 9949057df4..0000000000
--- a/src/lib/libc/string/wcslcat.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*      $OpenBSD: wcslcat.c,v 1.7 2019/01/25 00:19:25 millert Exp $     */
-
-/*
- * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
- *
- * 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 <sys/types.h>
-#include <wchar.h>
-
-/*
- * Appends src to string dst of size dsize (unlike strncat, dsize is the
- * full size of dst, not space left).  At most dsize-1 characters
- * will be copied.  Always NUL terminates (unless dsize <= wcslen(dst)).
- * Returns wcslen(src) + MIN(dsize, wcslen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-wcslcat(wchar_t *dst, const wchar_t *src, size_t dsize)
-{
-        const wchar_t *odst = dst;
-        const wchar_t *osrc = src;
-        size_t n = dsize;
-        size_t dlen;
-
-        /* Find the end of dst and adjust bytes left but don't go past end. */
-        while (n-- != 0 && *dst != L'\0')
-                dst++;
-        dlen = dst - odst;
-        n = dsize - dlen;
-
-        if (n-- == 0)
-                return(dlen + wcslen(src));
-        while (*src != L'\0') {
-                if (n != 0) {
-                        *dst++ = *src;
-                        n--;
-                }
-                src++;
-        }
-        *dst = L'\0';
-
-        return(dlen + (src - osrc));    /* count does not include NUL */
-}
-DEF_WEAK(wcslcat);
diff --git a/src/lib/libc/string/wcslcpy.3 b/src/lib/libc/string/wcslcpy.3
deleted file mode 100644
index 5d8721c35a..0000000000
--- a/src/lib/libc/string/wcslcpy.3
+++ /dev/null
@@ -1,153 +0,0 @@
-.\"     $OpenBSD: wcslcpy.3,v 1.7 2019/01/25 00:19:25 millert Exp $
-.\"
-.\" Copyright (c) 1998, 2000 Todd C. Miller <millert@openbsd.org>
-.\"
-.\" 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 $Mdocdate: January 25 2019 $
-.Dt WCSLCPY 3
-.Os
-.Sh NAME
-.Nm wcslcpy ,
-.Nm wcslcat
-.Nd size-bounded wide string copying and concatenation
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn wcslcpy "wchar_t *dst" "const wchar_t *src" "size_t size"
-.Ft size_t
-.Fn wcslcat "wchar_t *dst" "const wchar_t *src" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn wcslcpy
-and
-.Fn wcslcat
-functions copy and concatenate wide strings respectively.
-They are designed to be safer, more consistent, and less error prone
-replacements for
-.Xr wcsncpy 3
-and
-.Xr wcsncat 3 .
-Unlike those functions,
-.Fn wcslcpy
-and
-.Fn wcslcat
-take the full size of the buffer (not just the length) and guarantee to
-terminate the result with a null wide character (as long as
-.Fa size
-is larger than 0 or, in the case of
-.Fn wcslcat ,
-as long as there is at least one wide character free in
-.Fa dst ) .
-Note that a wide character for the null wide character should be included in
-.Fa size .
-Also note that
-.Fn wcslcpy
-and
-.Fn wcslcat
-only operate on wide strings that are terminated with a null wide character
-(L'\e0').
-This means that for
-.Fn wcslcpy
-.Fa src
-must be terminated with a null wide character and for
-.Fn wcslcat
-both
-.Fa src
-and
-.Fa dst
-must be terminated with a null wide character.
-.Pp
-The
-.Fn wcslcpy
-function copies up to
-.Fa size
-\(mi 1 wide characters from the wide string
-.Fa src
-to
-.Fa dst ,
-terminating the result with a null wide character.
-.Pp
-The
-.Fn wcslcat
-function appends the wide string
-.Fa src
-to the end of
-.Fa dst .
-It will append at most
-.Fa size
-\(mi wcslen(dst) \(mi 1 wide characters, terminating the result with a null
-wide character.
-.Pp
-If the
-.Fa src
-and
-.Fa dst
-strings overlap, the behavior is undefined.
-.Sh RETURN VALUES
-The
-.Fn wcslcpy
-and
-.Fn wcslcat
-functions return the total length of the wide string they tried to create.
-For
-.Fn wcslcpy
-that means the length of
-.Fa src .
-For
-.Fn wcslcat
-that means the initial length of
-.Fa dst
-plus
-the length of
-.Fa src .
-While this may seem somewhat confusing, it was done to make
-truncation detection simple.
-.Pp
-Note, however, that if
-.Fn wcslcat
-traverses
-.Fa size
-wide characters without finding a null wide character, the length of the
-string is considered to be
-.Fa size
-and the destination wide string will not be terminated with a null wide
-character (since there was no space for it).
-This keeps
-.Fn wcslcat
-from running off the end of a wide string.
-In practice this should not happen (as it means that either
-.Fa size
-is incorrect or that
-.Fa dst
-is not terminated with a null wide character).
-The check exists to prevent potential security problems in incorrect code.
-.Sh SEE ALSO
-.Xr strlcpy 3 ,
-.Xr swprintf 3 ,
-.Xr wcsncat 3 ,
-.Xr wcsncpy 3
-.Sh HISTORY
-The
-.Fn wcslcpy
-and
-.Fn wcslcat
-functions first appeared in
-.Ox 3.8 .
-.Sh AUTHORS
-The
-.Fn wcslcpy
-and
-.Fn wcslcat
-functions are based on code by
-.An Todd C. Miller Aq Mt millert@openbsd.org .
diff --git a/src/lib/libc/string/wcslcpy.c b/src/lib/libc/string/wcslcpy.c
deleted file mode 100644
index 9c433c83dc..0000000000
--- a/src/lib/libc/string/wcslcpy.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*      $OpenBSD: wcslcpy.c,v 1.8 2019/01/25 00:19:25 millert Exp $     */
-
-/*
- * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
- *
- * 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 <sys/types.h>
-#include <wchar.h>
-
-/*
- * Copy string src to buffer dst of size dsize.  At most dsize-1
- * chars will be copied.  Always NUL terminates (unless dsize == 0).
- * Returns wcslen(src); if retval >= dsize, truncation occurred.
- */
-size_t
-wcslcpy(wchar_t *dst, const wchar_t *src, size_t dsize)
-{
-        const wchar_t *osrc = src;
-        size_t nleft = dsize;
-
-        /* Copy as many bytes as will fit. */
-        if (nleft != 0) {
-                while (--nleft != 0) {
-                        if ((*dst++ = *src++) == L'\0')
-                                break;
-                }
-        }
-
-        /* Not enough room in dst, add NUL and traverse rest of src. */
-        if (nleft == 0) {
-                if (dsize != 0)
-                        *dst = L'\0';           /* NUL-terminate dst */
-                while (*src++)
-                        ;
-        }
-
-        return(src - osrc - 1); /* count does not include NUL */
-}
-DEF_WEAK(wcslcpy);
diff --git a/src/lib/libc/string/wcslen.3 b/src/lib/libc/string/wcslen.3
deleted file mode 100644
index 12f81763ba..0000000000
--- a/src/lib/libc/string/wcslen.3
+++ /dev/null
@@ -1,70 +0,0 @@
-.\"     $OpenBSD: wcslen.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WCSLEN 3
-.Os
-.Sh NAME
-.Nm wcslen
-.Nd find length of a wide string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn wcslen "const wchar_t *s"
-.Sh DESCRIPTION
-The
-.Fn wcslen
-function computes the length of the wide string
-.Fa s .
-.Sh RETURN VALUES
-The
-.Fn wcslen
-function returns the number of wide characters that precede the terminating
-null wide character.
-.Sh SEE ALSO
-.Xr strlen 3 ,
-.Xr wcswidth 3
-.Sh STANDARDS
-The
-.Fn wcslen
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wcslen
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wcslen.c b/src/lib/libc/string/wcslen.c
deleted file mode 100644
index 16d4bba128..0000000000
--- a/src/lib/libc/string/wcslen.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*      $OpenBSD: wcslen.c,v 1.4 2015/09/12 16:23:14 guenther Exp $     */
-/*      $NetBSD: wcslen.c,v 1.2 2001/01/03 14:29:36 lukem Exp $ */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcslen.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <wchar.h>
-
-size_t
-wcslen(const wchar_t *s)
-{
-        const wchar_t *p;
-
-        p = s;
-        while (*p)
-                p++;
-
-        return p - s;
-}
-DEF_STRONG(wcslen);
diff --git a/src/lib/libc/string/wcsncat.c b/src/lib/libc/string/wcsncat.c
deleted file mode 100644
index 2b4b9f0d49..0000000000
--- a/src/lib/libc/string/wcsncat.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*      $OpenBSD: wcsncat.c,v 1.4 2015/09/12 16:23:14 guenther Exp $    */
-/*      $NetBSD: wcsncat.c,v 1.2 2001/01/03 14:29:36 lukem Exp $        */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcsncat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <wchar.h>
-
-wchar_t *
-wcsncat(wchar_t *s1, const wchar_t *s2, size_t n)
-{
-        wchar_t *p;
-        wchar_t *q;
-        const wchar_t *r;
-
-        p = s1;
-        while (*p)
-                p++;
-        q = p;
-        r = s2;
-        while (*r && n) {
-                *q++ = *r++;
-                n--;
-        }
-        *q = '\0';
-        return s1;
-}
-DEF_STRONG(wcsncat);
diff --git a/src/lib/libc/string/wcsncmp.c b/src/lib/libc/string/wcsncmp.c
deleted file mode 100644
index bdaab33e4c..0000000000
--- a/src/lib/libc/string/wcsncmp.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*      $OpenBSD: wcsncmp.c,v 1.5 2015/09/12 16:23:14 guenther Exp $    */
-/*      $NetBSD: wcsncmp.c,v 1.5 2003/08/07 16:43:54 agc Exp $  */
-
-/*
- * Copyright (c) 1989, 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 <wchar.h>
-#include "locale/runetype.h"
-
-int
-wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-
-        if (n == 0)
-                return (0);
-        do {
-                if (*s1 != *s2++) {
-                        /* XXX assumes wchar_t = int */
-                        return (*(const rune_t *)s1 -
-                            *(const rune_t *)--s2);
-                }
-                if (*s1++ == 0)
-                        break;
-        } while (--n != 0);
-        return (0);
-}
-DEF_STRONG(wcsncmp);
diff --git a/src/lib/libc/string/wcsncpy.c b/src/lib/libc/string/wcsncpy.c
deleted file mode 100644
index 1be482b114..0000000000
--- a/src/lib/libc/string/wcsncpy.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*      $OpenBSD: wcsncpy.c,v 1.5 2015/09/12 16:23:14 guenther Exp $    */
-/*      $NetBSD: wcsncpy.c,v 1.2 2001/01/03 14:29:37 lukem Exp $        */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcsncpy.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <wchar.h>
-
-wchar_t *
-wcsncpy(wchar_t *s1, const wchar_t *s2, size_t n)
-{
-        wchar_t *p;
-
-        p = s1;
-        while (n && *s2) {
-                *p++ = *s2++;
-                n--;
-        }
-        while (n) {
-                *p++ = L'\0';
-                n--;
-        }
-
-        return s1;
-}
-DEF_STRONG(wcsncpy);
diff --git a/src/lib/libc/string/wcspbrk.3 b/src/lib/libc/string/wcspbrk.3
deleted file mode 100644
index 602bfdc3d6..0000000000
--- a/src/lib/libc/string/wcspbrk.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\"     $OpenBSD: wcspbrk.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WCSPBRK 3
-.Os
-.Sh NAME
-.Nm wcspbrk
-.Nd locate multiple wide characters in a wide string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcspbrk "const wchar_t *s" "const wchar_t *charset"
-.Sh DESCRIPTION
-The
-.Fn wcspbrk
-function locates in the wide string
-.Fa s
-the first occurrence of any wide character in the wide string
-.Fa charset
-and returns a pointer to this wide character.
-If no wide characters from
-.Fa charset
-occur anywhere in
-.Fa s ,
-.Fn wcspbrk
-returns
-.Dv NULL .
-.Sh SEE ALSO
-.Xr strpbrk 3 ,
-.Xr wcschr 3 ,
-.Xr wcscspn 3 ,
-.Xr wcsrchr 3 ,
-.Xr wcsspn 3 ,
-.Xr wcsstr 3 ,
-.Xr wcstok 3 ,
-.Xr wmemchr 3
-.Sh STANDARDS
-The
-.Fn wcspbrk
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wcspbrk
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wcspbrk.c b/src/lib/libc/string/wcspbrk.c
deleted file mode 100644
index f398fd92ab..0000000000
--- a/src/lib/libc/string/wcspbrk.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*      $OpenBSD: wcspbrk.c,v 1.5 2015/10/01 02:32:07 guenther Exp $    */
-/*      $NetBSD: wcspbrk.c,v 1.2 2001/01/03 14:29:37 lukem Exp $        */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcspbrk.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <wchar.h>
-
-wchar_t *
-wcspbrk(const wchar_t *s, const wchar_t *set)
-{
-        const wchar_t *p;
-        const wchar_t *q;
-
-        p = s;
-        while (*p) {
-                q = set;
-                while (*q) {
-                        if (*p == *q) {
-                                return (wchar_t *)p;
-                        }
-                        q++;
-                }
-                p++;
-        }
-        return NULL;
-}
-DEF_STRONG(wcspbrk);
diff --git a/src/lib/libc/string/wcsrchr.3 b/src/lib/libc/string/wcsrchr.3
deleted file mode 100644
index d4a2e7cf78..0000000000
--- a/src/lib/libc/string/wcsrchr.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"     $OpenBSD: wcsrchr.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WCSRCHR 3
-.Os
-.Sh NAME
-.Nm wcsrchr
-.Nd locate last occurrence of a wide character in a wide string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcsrchr "const wchar_t *s" "wchar_t c"
-.Sh DESCRIPTION
-The
-.Fn wcsrchr
-function locates the last occurrence of the wide character
-.Fa c
-in the wide string
-.Fa s .
-The terminating null wide character is considered part of the wide string.
-If
-.Fa c
-is the null wide character (L'\e0'),
-.Fn wcsrchr
-locates the terminating null wide character.
-.Sh RETURN VALUES
-The
-.Fn wcsrchr
-function returns a pointer to the located wide character or
-.Dv NULL
-if the wide character does not appear in the wide string.
-.Sh SEE ALSO
-.Xr strrchr 3 ,
-.Xr wcschr 3 ,
-.Xr wcscspn 3 ,
-.Xr wcspbrk 3 ,
-.Xr wcsspn 3 ,
-.Xr wcsstr 3 ,
-.Xr wcstok 3 ,
-.Xr wmemchr 3
-.Sh STANDARDS
-The
-.Fn wcsrchr
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wcsrchr
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wcsrchr.c b/src/lib/libc/string/wcsrchr.c
deleted file mode 100644
index aa936de508..0000000000
--- a/src/lib/libc/string/wcsrchr.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*      $OpenBSD: wcsrchr.c,v 1.5 2015/10/01 02:32:07 guenther Exp $    */
-/*      $NetBSD: wcsrchr.c,v 1.2 2001/01/03 14:29:37 lukem Exp $        */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcsrchr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <wchar.h>
-
-wchar_t *
-wcsrchr(const wchar_t *s, wchar_t c)
-{
-        const wchar_t *p;
-
-        p = s;
-        while (*p)
-                p++;
-        while (s <= p) {
-                if (*p == c) {
-                        return (wchar_t *)p;
-                }
-                p--;
-        }
-        return NULL;
-}
-DEF_STRONG(wcsrchr);
diff --git a/src/lib/libc/string/wcsspn.3 b/src/lib/libc/string/wcsspn.3
deleted file mode 100644
index 3be82344dd..0000000000
--- a/src/lib/libc/string/wcsspn.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"     $OpenBSD: wcsspn.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WCSSPN 3
-.Os
-.Sh NAME
-.Nm wcsspn
-.Nd span a wide string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn wcsspn "const wchar_t *s" "const wchar_t *charset"
-.Sh DESCRIPTION
-The
-.Fn wcsspn
-function spans the initial part of the wide string
-.Fa s
-as long as the wide characters from
-.Fa s
-occur in the wide string
-.Fa charset .
-.Sh RETURN VALUES
-The
-.Fn wcsspn
-function returns the number of wide characters spanned.
-.Sh SEE ALSO
-.Xr strspn 3 ,
-.Xr wcschr 3 ,
-.Xr wcscspn 3 ,
-.Xr wcspbrk 3 ,
-.Xr wcsrchr 3 ,
-.Xr wcsstr 3 ,
-.Xr wcstok 3 ,
-.Xr wmemchr 3
-.Sh STANDARDS
-The
-.Fn wcsspn
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wcsspn
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wcsspn.c b/src/lib/libc/string/wcsspn.c
deleted file mode 100644
index a3f28e3a49..0000000000
--- a/src/lib/libc/string/wcsspn.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*      $OpenBSD: wcsspn.c,v 1.4 2015/09/12 16:23:14 guenther Exp $     */
-/*      $NetBSD: wcsspn.c,v 1.3 2001/09/21 16:09:15 yamt Exp $  */
-
-/*-
- * Copyright (c)1999,2001 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      $Citrus: xpg4dl/FreeBSD/lib/libc/string/wcsspn.c,v 1.3 2001/09/21 16:06:43 yamt Exp $
- */
-
-#include <wchar.h>
-
-size_t
-wcsspn(const wchar_t *s, const wchar_t *set)
-{
-        const wchar_t *p;
-        const wchar_t *q;
-
-        p = s;
-        while (*p) {
-                q = set;
-                while (*q) {
-                        if (*p == *q)
-                                break;
-                        q++;
-                }
-                if (!*q)
-                        goto done;
-                p++;
-        }
-
-done:
-        return (p - s);
-}
-DEF_STRONG(wcsspn);
diff --git a/src/lib/libc/string/wcsstr.3 b/src/lib/libc/string/wcsstr.3
deleted file mode 100644
index 203a76ded3..0000000000
--- a/src/lib/libc/string/wcsstr.3
+++ /dev/null
@@ -1,88 +0,0 @@
-.\"     $OpenBSD: wcsstr.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WCSSTR 3
-.Os
-.Sh NAME
-.Nm wcsstr
-.Nd locate a wide substring in a wide string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcsstr "const wchar_t *big" "const wchar_t *little"
-.Sh DESCRIPTION
-The
-.Fn wcsstr
-function locates the first occurrence of the wide string
-.Fa little
-in the wide string
-.Fa big .
-.Pp
-If
-.Fa little
-is an empty wide string,
-.Fa big
-is returned;
-if
-.Fa little
-occurs nowhere in
-.Fa big ,
-.Dv NULL
-is returned;
-otherwise a pointer to the first wide character of the first occurrence of
-.Fa little
-is returned.
-.Sh SEE ALSO
-.Xr strstr 3 ,
-.Xr wcschr 3 ,
-.Xr wcscspn 3 ,
-.Xr wcspbrk 3 ,
-.Xr wcsrchr 3 ,
-.Xr wcsspn 3 ,
-.Xr wcstok 3 ,
-.Xr wmemchr 3
-.Sh STANDARDS
-The
-.Fn wcsstr
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wcsstr
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wcsstr.c b/src/lib/libc/string/wcsstr.c
deleted file mode 100644
index 6a7b0dac4a..0000000000
--- a/src/lib/libc/string/wcsstr.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*      $OpenBSD: wcsstr.c,v 1.5 2015/10/01 02:32:07 guenther Exp $     */
-/*      $NetBSD: wcsstr.c,v 1.3 2003/03/05 20:18:17 tshiozak Exp $      */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcsstr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <wchar.h>
-
-wchar_t *
-#ifdef WCSWCS
-wcswcs(const wchar_t *big, const wchar_t *little)
-#else
-wcsstr(const wchar_t *big, const wchar_t *little)
-#endif
-{
-        const wchar_t *p;
-        const wchar_t *q;
-        const wchar_t *r;
-
-        if (!*little) {
-                return (wchar_t *)big;
-        }
-        if (wcslen(big) < wcslen(little))
-                return NULL;
-
-        p = big;
-        q = little;
-        while (*p) {
-                q = little;
-                r = p;
-                while (*q) {
-                        if (*r != *q)
-                                break;
-                        q++;
-                        r++;
-                }
-                if (!*q) {
-                        return (wchar_t *)p;
-                }
-                p++;
-        }
-        return NULL;
-}
-#ifndef WCSWCS
-DEF_STRONG(wcsstr);
-#endif
diff --git a/src/lib/libc/string/wcstok.3 b/src/lib/libc/string/wcstok.3
deleted file mode 100644
index 33ba1318a1..0000000000
--- a/src/lib/libc/string/wcstok.3
+++ /dev/null
@@ -1,151 +0,0 @@
-.\"     $OpenBSD: wcstok.3,v 1.7 2011/07/25 00:38:53 schwarze Exp $
-.\"
-.\" $NetBSD: wcstok.3,v 1.3 2003/09/08 17:54:33 wiz Exp $
-.\"
-.\" Copyright (c) 1998 Softweyr LLC.  All rights reserved.
-.\"
-.\" strtok_r, from Berkeley strtok
-.\" Oct 13, 1998 by Wes Peters <wes@softweyr.com>
-.\"
-.\" Copyright (c) 1988, 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
-.\" 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
-.\"    notices, this list of conditions and the following disclaimer.
-.\"
-.\" 2. Redistributions in binary form must reproduce the above
-.\"    copyright notices, 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 Softweyr LLC, the
-.\"      University of California, Berkeley, and its contributors.
-.\"
-.\" 4. Neither the name of Softweyr LLC, 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
-.\"
-.\" Original version ID:
-.\" FreeBSD: src/lib/libc/string/wcstok.3,v 1.4 2002/10/15 09:49:54 tjr Exp
-.\"
-.Dd $Mdocdate: July 25 2011 $
-.Dt WCSTOK 3
-.Os
-.Sh NAME
-.Nm wcstok
-.Nd split wide-character string into tokens
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcstok "wchar_t * restrict str" "const wchar_t * restrict sep" "wchar_t ** restrict last"
-.Sh DESCRIPTION
-The
-.Fn wcstok
-function
-is used to isolate sequential tokens in a NUL-terminated wide-character
-string,
-.Fa str .
-These tokens are separated in the string by at least one of the
-characters in
-.Fa sep .
-The first time that
-.Fn wcstok
-is called,
-.Fa str
-should be specified; subsequent calls, wishing to obtain further tokens
-from the same string, should pass a null pointer instead.
-The separator string,
-.Fa sep ,
-must be supplied each time, and may change between calls.
-The context pointer
-.Fa last
-must be provided on each call.
-.Pp
-The
-.Fn wcstok
-function is the wide-character counterpart of the
-.Xr strtok_r 3
-function.
-.Pp
-Since
-.Fn wcstok
-modifies the string,
-.Fa str
-should not point to an area in the initialized data segment.
-.Sh RETURN VALUES
-The
-.Fn wcstok
-function
-returns a pointer to the beginning of each subsequent token in the string,
-after replacing the token itself with a NUL wide character (L'\e0').
-When no more tokens remain, a null pointer is returned.
-.Sh EXAMPLES
-The following code fragment splits a wide-character string on
-.Tn ASCII
-space, tab, and newline characters and writes the tokens to
-standard output:
-.Bd -literal -offset indent
-const wchar_t *seps = L" \et\en";
-wchar_t *last, *tok, text[] = L" \enone\ettwo\et\etthree  \en";
-
-for (tok = wcstok(text, seps, &last); tok != NULL;
-    tok = wcstok(NULL, seps, &last))
-        wprintf(L"%ls\en", tok);
-.Ed
-.Sh SEE ALSO
-.Xr strtok 3 ,
-.Xr wcschr 3 ,
-.Xr wcscspn 3 ,
-.Xr wcspbrk 3 ,
-.Xr wcsrchr 3 ,
-.Xr wcsspn 3 ,
-.Xr wcsstr 3 ,
-.Xr wmemchr 3
-.Sh STANDARDS
-The
-.Fn wcstok
-function
-conforms to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn wcstok
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
-.Pp
-Some early implementations of
-.Fn wcstok
-omit the
-context pointer argument,
-.Fa last ,
-and maintain state across calls in a static variable like
-.Xr strtok 3
-does.
diff --git a/src/lib/libc/string/wcstok.c b/src/lib/libc/string/wcstok.c
deleted file mode 100644
index bc1ac3e8cb..0000000000
--- a/src/lib/libc/string/wcstok.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*      $OpenBSD: wcstok.c,v 1.3 2005/08/08 08:05:37 espie Exp $        */
-/* $NetBSD: wcstok.c,v 1.3 2003/07/10 08:50:48 tshiozak Exp $ */
-
-/*-
- * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
- *
- * strtok_r, from Berkeley strtok
- * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
- *
- * Copyright (c) 1988, 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
- *    notices, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notices, 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 Softweyr LLC, 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
- *
- * Original version ID:
- * FreeBSD: src/lib/libc/string/wcstok.c,v 1.1 2002/09/07 08:16:57 tjr Exp
- */
-
-#include <wchar.h>
-
-wchar_t *
-wcstok(wchar_t * __restrict s, const wchar_t * __restrict delim, 
-    wchar_t ** __restrict last)
-{
-        const wchar_t *spanp;
-        wchar_t c, sc;
-        wchar_t *tok;
-
-        if (s == NULL && (s = *last) == NULL)
-                return (NULL);
-
-        /*
-         * Skip (span) leading delimiters (s += wcsspn(s, delim), sort of).
-         */
-cont:
-        c = *s++;
-        for (spanp = delim; (sc = *spanp++) != L'\0';) {
-                if (c == sc)
-                        goto cont;
-        }
-
-        if (c == L'\0') {       /* no non-delimiter characters */
-                *last = NULL;
-                return (NULL);
-        }
-        tok = s - 1;
-
-        /*
-         * Scan token (scan for delimiters: s += wcscspn(s, delim), sort of).
-         * Note that delim must have one NUL; we stop if we see that, too.
-         */
-        for (;;) {
-                c = *s++;
-                spanp = delim;
-                do {
-                        if ((sc = *spanp++) == c) {
-                                if (c == L'\0')
-                                        s = NULL;
-                                else
-                                        s[-1] = L'\0';
-                                *last = s;
-                                return (tok);
-                        }
-                } while (sc != L'\0');
-        }
-        /* NOTREACHED */
-}
diff --git a/src/lib/libc/string/wcswcs.c b/src/lib/libc/string/wcswcs.c
deleted file mode 100644
index bd35605547..0000000000
--- a/src/lib/libc/string/wcswcs.c
+++ /dev/null
@@ -1,5 +0,0 @@
-/*      $OpenBSD: wcswcs.c,v 1.1 2005/04/13 16:35:58 espie Exp $        */
-/* $NetBSD: wcswcs.c,v 1.1 2003/03/05 20:18:17 tshiozak Exp $ */
-
-#define WCSWCS
-#include "wcsstr.c"
diff --git a/src/lib/libc/string/wcswidth.3 b/src/lib/libc/string/wcswidth.3
deleted file mode 100644
index a2a5b2df86..0000000000
--- a/src/lib/libc/string/wcswidth.3
+++ /dev/null
@@ -1,69 +0,0 @@
-.\"     $OpenBSD: wcswidth.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
-.\"
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" 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 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 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)
-.\" 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 $Mdocdate: July 25 2011 $
-.Dt WCSWIDTH 3
-.Os
-.Sh NAME
-.Nm wcswidth
-.Nd number of column positions in wide-character string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wcswidth "const wchar_t *pwcs" "size_t n"
-.Sh DESCRIPTION
-The
-.Fn wcswidth
-function determines the number of column positions required for the first
-.Fa n
-characters of
-.Fa pwcs ,
-or until a null wide character (L'\e0') is encountered.
-.Sh RETURN VALUES
-The
-.Fn wcswidth
-function returns 0 if
-.Fa pwcs
-is an empty string (L""),
-\-1 if a non-printing wide character is encountered,
-otherwise it returns the number of column positions occupied.
-.Sh SEE ALSO
-.Xr iswprint 3 ,
-.Xr strlen 3 ,
-.Xr wcslen 3 ,
-.Xr wcwidth 3
-.Sh STANDARDS
-The
-.Fn wcswidth
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn wcswidth
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wcswidth.c b/src/lib/libc/string/wcswidth.c
deleted file mode 100644
index 9f003f96c7..0000000000
--- a/src/lib/libc/string/wcswidth.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*      $OpenBSD: wcswidth.c,v 1.5 2015/09/12 16:23:14 guenther Exp $   */
-/*      $NetBSD: wcswidth.c,v 1.2 2001/01/03 14:29:37 lukem Exp $       */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wcswidth.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <wchar.h>
-
-int
-wcswidth(const wchar_t *s, size_t n)
-{
-        int w, q;
-
-        w = 0;
-        while (n && *s) {
-                q = wcwidth(*s);
-                if (q == -1)
-                        return (-1);
-                w += q;
-                s++;
-                n--;
-        }
-
-        return w;
-}
-DEF_WEAK(wcswidth);
diff --git a/src/lib/libc/string/wmemchr.3 b/src/lib/libc/string/wmemchr.3
deleted file mode 100644
index 17fbc9dbc5..0000000000
--- a/src/lib/libc/string/wmemchr.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\"     $OpenBSD: wmemchr.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WMEMCHR 3
-.Os
-.Sh NAME
-.Nm wmemchr
-.Nd locate wide character in wide string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wmemchr "const wchar_t *b" "wchar_t c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn wmemchr
-function locates the first occurrence of
-.Fa c
-in wide string
-.Fa b .
-.Sh RETURN VALUES
-The
-.Fn wmemchr
-function returns a pointer to the wide character located, or
-.Dv NULL
-if no such wide character exists within
-.Fa len
-wide characters.
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr wcschr 3 ,
-.Xr wcscspn 3 ,
-.Xr wcspbrk 3 ,
-.Xr wcsrchr 3 ,
-.Xr wcsspn 3 ,
-.Xr wcsstr 3 ,
-.Xr wcstok 3
-.Sh STANDARDS
-The
-.Fn wmemchr
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wmemchr
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wmemchr.c b/src/lib/libc/string/wmemchr.c
deleted file mode 100644
index 556a0b35cc..0000000000
--- a/src/lib/libc/string/wmemchr.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*      $OpenBSD: wmemchr.c,v 1.5 2015/10/01 02:32:07 guenther Exp $    */
-/*      $NetBSD: wmemchr.c,v 1.2 2001/01/03 14:29:37 lukem Exp $        */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wmemchr.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <wchar.h>
-
-wchar_t *
-wmemchr(const wchar_t *s, wchar_t c, size_t n)
-{
-        size_t i;
-
-        for (i = 0; i < n; i++) {
-                if (*s == c) {
-                        return (wchar_t *)s;
-                }
-                s++;
-        }
-        return NULL;
-}
-DEF_STRONG(wmemchr);
diff --git a/src/lib/libc/string/wmemcmp.3 b/src/lib/libc/string/wmemcmp.3
deleted file mode 100644
index bd8ddfd120..0000000000
--- a/src/lib/libc/string/wmemcmp.3
+++ /dev/null
@@ -1,78 +0,0 @@
-.\"     $OpenBSD: wmemcmp.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WMEMCMP 3
-.Os
-.Sh NAME
-.Nm wmemcmp
-.Nd compare wide strings
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wmemcmp "const wchar_t *s1" "const wchar_t *s2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn wmemcmp
-function compares the wide string
-.Fa s1
-against the wide string
-.Fa s2 .
-Both wide strings are assumed to be
-.Fa len
-wide characters long.
-.Sh RETURN VALUES
-The
-.Fn wmemcmp
-function returns zero if the two wide strings are identical,
-otherwise the difference between the first two differing wide characters is
-returned.
-Zero-length wide strings are always identical.
-.Sh SEE ALSO
-.Xr memcmp 3 ,
-.Xr wcscasecmp 3 ,
-.Xr wcscmp 3
-.Sh STANDARDS
-The
-.Fn wmemcmp
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wmemcmp
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wmemcmp.c b/src/lib/libc/string/wmemcmp.c
deleted file mode 100644
index 46617e29cf..0000000000
--- a/src/lib/libc/string/wmemcmp.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*      $OpenBSD: wmemcmp.c,v 1.5 2015/09/12 16:23:14 guenther Exp $    */
-/*      $NetBSD: wmemcmp.c,v 1.3 2003/04/06 18:33:23 tshiozak Exp $     */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wmemcmp.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <wchar.h>
-#include "locale/runetype.h"
-
-int
-wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-        size_t i;
-
-        for (i = 0; i < n; i++) {
-                if (*s1 != *s2) {
-                        /* wchar might be unsigned */
-                        return *(const rune_t *)s1 >
-                               *(const rune_t *)s2 ? 1 : -1;
-                }
-                s1++;
-                s2++;
-        }
-        return 0;
-}
-DEF_STRONG(wmemcmp);
diff --git a/src/lib/libc/string/wmemcpy.3 b/src/lib/libc/string/wmemcpy.3
deleted file mode 100644
index 2a6d528a1a..0000000000
--- a/src/lib/libc/string/wmemcpy.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"     $OpenBSD: wmemcpy.3,v 1.5 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WMEMCPY 3
-.Os
-.Sh NAME
-.Nm wmemcpy
-.Nd copy wide characters
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wmemcpy "wchar_t * restrict dst" "const wchar_t * restrict src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn wmemcpy
-function copies
-.Fa len
-wide characters from buffer
-.Fa src
-to buffer
-.Fa dst .
-If the two buffers may overlap,
-.Xr wmemmove 3
-must be used instead.
-.Sh RETURN VALUES
-The
-.Fn wmemcpy
-function returns the original value of
-.Fa dst .
-.Sh SEE ALSO
-.Xr memcpy 3 ,
-.Xr wcscpy 3 ,
-.Xr wcslcpy 3 ,
-.Xr wmemmove 3
-.Sh STANDARDS
-The
-.Fn wmemcpy
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wmemcpy
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wmemcpy.c b/src/lib/libc/string/wmemcpy.c
deleted file mode 100644
index cf02ab9d56..0000000000
--- a/src/lib/libc/string/wmemcpy.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*      $OpenBSD: wmemcpy.c,v 1.4 2015/09/12 16:23:14 guenther Exp $    */
-/*      $NetBSD: wmemcpy.c,v 1.2 2001/01/03 14:29:37 lukem Exp $        */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wmemcpy.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <string.h>
-#include <wchar.h>
-
-wchar_t *
-wmemcpy(wchar_t *d, const wchar_t *s, size_t n)
-{
-
-        return (wchar_t *)memcpy(d, s, n * sizeof(wchar_t));
-}
-DEF_STRONG(wmemcpy);
diff --git a/src/lib/libc/string/wmemmove.3 b/src/lib/libc/string/wmemmove.3
deleted file mode 100644
index 46942e7928..0000000000
--- a/src/lib/libc/string/wmemmove.3
+++ /dev/null
@@ -1,78 +0,0 @@
-.\"     $OpenBSD: wmemmove.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WMEMMOVE 3
-.Os
-.Sh NAME
-.Nm wmemmove
-.Nd copy wide characters
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wmemmove "wchar_t *dst" "const wchar_t *src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn wmemmove
-function copies
-.Fa len
-wide characters from buffer
-.Fa src
-to buffer
-.Fa dst .
-The two buffers may overlap;
-the copy is always done in a non-destructive manner.
-.Sh RETURN VALUES
-The
-.Fn wmemmove
-function returns the original value of
-.Fa dst .
-.Sh SEE ALSO
-.Xr memmove 3 ,
-.Xr wcscpy 3 ,
-.Xr wcslcpy 3 ,
-.Xr wmemcpy 3
-.Sh STANDARDS
-The
-.Fn wmemmove
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wmemmove
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wmemmove.c b/src/lib/libc/string/wmemmove.c
deleted file mode 100644
index 8bf8011064..0000000000
--- a/src/lib/libc/string/wmemmove.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*      $OpenBSD: wmemmove.c,v 1.4 2015/09/12 16:23:14 guenther Exp $   */
-/*      $NetBSD: wmemmove.c,v 1.2 2001/01/03 14:29:37 lukem Exp $       */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wmemmove.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <string.h>
-#include <wchar.h>
-
-wchar_t *
-wmemmove(wchar_t *d, const wchar_t *s, size_t n)
-{
-
-        return (wchar_t *)memmove(d, s, n * sizeof(wchar_t));
-}
-DEF_STRONG(wmemmove);
diff --git a/src/lib/libc/string/wmemset.3 b/src/lib/libc/string/wmemset.3
deleted file mode 100644
index 2655d68bcb..0000000000
--- a/src/lib/libc/string/wmemset.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\"     $OpenBSD: wmemset.3,v 1.4 2013/06/05 03:39:23 tedu Exp $
-.\"
-.\" 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.
-.\"
-.Dd $Mdocdate: June 5 2013 $
-.Dt WMEMSET 3
-.Os
-.Sh NAME
-.Nm wmemset
-.Nd write a wide string
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wmemset "wchar_t *s" "wchar_t c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn wmemset
-function writes
-.Fa len
-wide characters of value
-.Fa c
-to the wide string
-.Fa s .
-.Sh RETURN VALUES
-The
-.Fn wmemset
-function returns the original value of
-.Fa s .
-.Sh SEE ALSO
-.Xr memset 3
-.Sh STANDARDS
-The
-.Fn wmemset
-function conforms to
-.St -isoC-99
-and was first introduced in
-.St -isoC-amd1 .
-.Sh HISTORY
-The
-.Fn wmemset
-function was ported from
-.Nx
-and first appeared in
-.Ox 3.8 .
diff --git a/src/lib/libc/string/wmemset.c b/src/lib/libc/string/wmemset.c
deleted file mode 100644
index a2d3295170..0000000000
--- a/src/lib/libc/string/wmemset.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*      $OpenBSD: wmemset.c,v 1.4 2015/09/12 16:23:14 guenther Exp $    */
-/*      $NetBSD: wmemset.c,v 1.2 2001/01/03 14:29:37 lukem Exp $        */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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 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 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)
- * 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.
- *
- *      citrus Id: wmemset.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <wchar.h>
-
-wchar_t *
-wmemset(wchar_t *s, wchar_t c, size_t n)
-{
-        size_t i;
-        wchar_t *p;
-
-        p = s;
-        for (i = 0; i < n; i++) {
-                *p = c;
-                p++;
-        }
-        return s;
-}
-DEF_STRONG(wmemset);