Release libbsd 0.9.1

The NetBSD implementations have different prototypes to the ones coming
from OpenBSD, which will break builds, and have caused segfaults at
run-time. We provide now both interfaces with different prototypes as
different version nodes allow selecting them at compile-time, defaulting
for now to the OpenBSD one to avoid build-time breakage, while emitting
a compile-time warning. Later on, in 0.10.0, we will be switching the
compile-time default to the NetBSD version.

Ref: http://gnats.netbsd.org/44977
Fixes: https://bugs.debian.org/899282

COPYING

@@ -1,14 +1,14 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files:
  *
 Copyright:
- Copyright © 2004-2006, 2008-2015 Guillem Jover <guillem@hadrons.org>
+ Copyright © 2004-2006, 2008-2018 Guillem Jover <guillem@hadrons.org>
 License: BSD-3-clause
 
 Files:
- man/arc4random.3
- man/tree.3
+ man/arc4random.3bsd
+ man/tree.3bsd
 Copyright:
  Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
  All rights reserved.
@@ -39,7 +39,7 @@ License: BSD-4-clause-Niels-Provos
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files:
- man/getprogname.3
+ man/getprogname.3bsd
 Copyright:
  Copyright © 2001 Christopher G. Demetriou
  All rights reserved.
@@ -90,26 +90,31 @@ Files:
  include/bsd/netinet/ip_icmp.h
  include/bsd/sys/bitstring.h
  include/bsd/sys/queue.h
+ include/bsd/sys/time.h
  include/bsd/timeconv.h
  include/bsd/vis.h
- man/bitstring.3
- man/explicit_bzero.3
- man/fgetln.3
- man/fgetwln.3
+ man/bitstring.3bsd
+ man/errc.3bsd
+ man/explicit_bzero.3bsd
+ man/fgetln.3bsd
+ man/fgetwln.3bsd
+ man/fpurge.3bsd
  man/funopen.3bsd
- man/getbsize.3
- man/heapsort.3
- man/nlist.3
+ man/getbsize.3bsd
+ man/heapsort.3bsd
+ man/nlist.3bsd
  man/queue.3bsd
- man/radixsort.3
- man/reallocarray.3
- man/reallocf.3
- man/setmode.3
- man/strmode.3
- man/strnstr.3
- man/unvis.3
- man/vis.3
- man/wcslcpy.3
+ man/radixsort.3bsd
+ man/reallocarray.3bsd
+ man/reallocf.3bsd
+ man/setmode.3bsd
+ man/strmode.3bsd
+ man/strnstr.3bsd
+ man/strtoi.3bsd
+ man/strtou.3bsd
+ man/unvis.3bsd
+ man/vis.3bsd
+ man/wcslcpy.3bsd
  src/getbsize.c
  src/heapsort.c
  src/merge.c
@@ -118,8 +123,9 @@ Files:
  src/setmode.c
  src/strmode.c
  src/strnstr.c
+ src/strtoi.c
+ src/strtou.c
  src/unvis.c
- src/vis.c
 Copyright:
  Copyright © 1980, 1982, 1986, 1989-1994
      The Regents of the University of California.  All rights reserved.
@@ -150,6 +156,33 @@ Copyright:
  Co. or Unix System Laboratories, Inc. and are reproduced herein with
  the permission of UNIX System Laboratories, Inc.
 License: BSD-3-clause-Regents
+
+Files:
+ src/vis.c
+Copyright:
+ Copyright © 1989, 1993
+     The Regents of the University of California.  All rights reserved.
+ .
+ Copyright © 1999, 2005 The NetBSD Foundation, Inc.
+ All rights reserved.
+License: BSD-3-clause-Regents and BSD-2-clause-NetBSD
+
+Files:
+ include/bsd/libutil.h
+Copyright:
+ Copyright © 1996  Peter Wemm <peter@FreeBSD.org>.
+ All rights reserved.
+ Copyright © 2002 Networks Associates Technology, Inc.
+ All rights reserved.
+License: BSD-3-clause-author
+
+Files:
+ man/timeradd.3bsd
+Copyright:
+ Copyright © 2009 Jukka Ruohonen <jruohonen@iki.fi>
+ Copyright © 1999 Kelly Yancey <kbyanc@posi.net>
+ All rights reserved.
+License: BSD-3-clause-John-Birrell
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -158,11 +191,11 @@ License: BSD-3-clause-Regents
  2. Redistributions in binary form must reproduce 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
+ 3. 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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
@@ -175,39 +208,7 @@ License: BSD-3-clause-Regents
  SUCH DAMAGE.
 
 Files:
- include/bsd/libutil.h
-Copyright:
- Copyright © 1996  Peter Wemm <peter@FreeBSD.org>.
- All rights reserved.
- Copyright © 2002 Networks Associates Technology, Inc.
- All rights reserved.
-License: BSD-3-clause-Peter-Wemm
- Redistribution and use in source and binary forms, with or without
- modification, is permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce 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.
-
-Files:
- man/setproctitle.3
+ man/setproctitle.3bsd
 Copyright:
  Copyright © 1995 Peter Wemm <peter@FreeBSD.org>
  All rights reserved.
@@ -230,14 +231,18 @@ License: BSD-5-clause-Peter-Wemm
 
 Files:
  include/bsd/stringlist.h
- man/fmtcheck.3
- man/humanize_number.3
- man/stringlist.3
+ man/fmtcheck.3bsd
+ man/humanize_number.3bsd
+ man/stringlist.3bsd
+ man/timeval.3bsd
  src/fmtcheck.c
  src/humanize_number.c
  src/stringlist.c
+ src/strtonum.c
 Copyright:
- Copyright © 1994, 1997-2000, 2002, 2008 The NetBSD Foundation, Inc.
+ Copyright © 1994, 1997-2000, 2002, 2008, 2010, 2014
+     The NetBSD Foundation, Inc.
+ Copyright © 2013 John-Mark Gurney <jmg@FreeBSD.org>
  All rights reserved.
  .
  Some code was contributed to The NetBSD Foundation by Allen Briggs.
@@ -254,35 +259,19 @@ Copyright:
  .
  Some code is derived from software contributed to The NetBSD Foundation
  by Christos Zoulas.
-License: BSD-2-clause-NetBSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must 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.
+ Some code is derived from software contributed to The NetBSD Foundation
+ by Jukka Ruohonen.
+License: BSD-2-clause-NetBSD
 
 Files:
  include/bsd/sys/endian.h
- man/expand_number.3
- man/closefrom.3
- man/flopen.3
- man/getpeereid.3
- man/pidfile.3
+ man/byteorder.3bsd
+ man/closefrom.3bsd
+ man/expand_number.3bsd
+ man/flopen.3bsd
+ man/getpeereid.3bsd
+ man/pidfile.3bsd
  src/expand_number.c
  src/hash/sha512.h
  src/hash/sha512c.c
@@ -302,6 +291,9 @@ Copyright:
  Copyright © 2002 Thomas Moestl <tmm@FreeBSD.org>
  All rights reserved.
  .
+ Copyright © 2002 Mike Barcroft <mike@FreeBSD.org>
+ All rights reserved.
+ .
  Copyright © 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  All rights reserved.
  .
@@ -325,7 +317,7 @@ License: BSD-2-clause
 Files:
  src/flopen.c
 Copyright:
- Copyright © 2007 Dag-Erling Coïdan Smørgrav
+ Copyright © 2007-2009 Dag-Erling Coïdan Smørgrav
  All rights reserved.
 License: BSD-2-clause-verbatim
  Redistribution and use in source and binary forms, with or without
@@ -352,7 +344,7 @@ License: BSD-2-clause-verbatim
 
 Files:
  include/bsd/sys/tree.h
- man/fparseln.3
+ man/fparseln.3bsd
  src/fparseln.c
 Copyright:
  Copyright © 1997 Christos Zoulas.
@@ -361,35 +353,18 @@ Copyright:
  Copyright © 2002 Niels Provos <provos@citi.umich.edu>
  All rights reserved.
 License: BSD-2-clause-author
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must 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.
 
 Files:
  include/bsd/readpassphrase.h
- man/readpassphrase.3
- man/strlcpy.3
- man/strtonum.3
+ man/readpassphrase.3bsd
+ man/strlcpy.3bsd
+ man/strtonum.3bsd
  src/arc4random.c
+ src/arc4random_linux.h
  src/arc4random_openbsd.h
  src/arc4random_uniform.c
  src/arc4random_unix.h
+ src/arc4random_win.h
  src/closefrom.c
  src/getentropy_aix.c
  src/getentropy_bsd.c
@@ -398,17 +373,17 @@ Files:
  src/getentropy_linux.c
  src/getentropy_osx.c
  src/getentropy_solaris.c
+ src/getentropy_win.c
  src/readpassphrase.c
  src/reallocarray.c
  src/strlcat.c
  src/strlcpy.c
- src/strtonum.c
 Copyright:
  Copyright © 2004 Ted Unangst and Todd Miller
  All rights reserved.
  .
  Copyright © 1996 David Mazieres <dm@uun.org>
- Copyright © 1998, 2000-2002, 2004-2005, 2007, 2010, 2012-2014
+ Copyright © 1998, 2000-2002, 2004-2005, 2007, 2010, 2012-2015
      Todd C. Miller <Todd.Miller@courtesan.com>
  Copyright © 2004 Ted Unangst
  Copyright © 2008 Damien Miller <djm@openbsd.org>
@@ -507,6 +482,56 @@ License: Beerware
  can do whatever you want with this stuff. If we meet some day, and you think
  this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 
+License: BSD-3-clause-Regents
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce 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.
+
+License: BSD-3-clause-author
+ Redistribution and use in source and binary forms, with or without
+ modification, is permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce 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.
+
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -530,6 +555,49 @@ License: BSD-3-clause
  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: BSD-2-clause-NetBSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must 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.
+
+License: BSD-2-clause-author
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must 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.
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions

README

@@ -9,7 +9,7 @@ code over and over again on each project.
 Releases
 --------
 
-  <http://libbsd.freedesktop.org/releases/>
+  <https://libbsd.freedesktop.org/releases/>
 
 
 Mailing List
@@ -17,7 +17,7 @@ Mailing List
 
 The subscription interface and web archives can be found at:
 
-  <http://lists.freedesktop.org/mailman/listinfo/libbsd>
+  <https://lists.freedesktop.org/mailman/listinfo/libbsd>
 
 The mail address is:
 
@@ -27,5 +27,10 @@ The mail address is:
 Source Repository
 -----------------
 
-  <http://cgit.freedesktop.org/libbsd>
-  <git://anongit.freedesktop.org/git/libbsd>
+The master repository can be browsed at:
+
+  <https://cgit.freedesktop.org/libbsd>
+
+and cloned from:
+
+  <https://anongit.freedesktop.org/git/libbsd>

TODO

@@ -1,3 +1,14 @@
 * Add more functions used by ported packages (check openssh).
+* Add more unit tests.
 * Add missing man pages.
+  - bsd_getopt.
+  - timeconv?
 * Add a README.import file.
+* Update man pages:
+  - Fix references to a.out(5) and inline needed struct definitions.
+  - Document when each interface was added on every BSD, and libbsd.
+* Handle LFS properly. By default the library emits LFS objects, but might
+  be used by non-LFS objects. We should either provide foo and foo64
+  functions and appropriate mappings on _FILE_OFFSET_BITS=64,
+  _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE. Or error out when the off_t
+  used by the code including us does not match a 64-bit type.

configure.ac

@@ -2,7 +2,7 @@
 
 AC_PREREQ([2.67])
 AC_INIT([libbsd], m4_esyscmd([./get-version]), [libbsd@lists.freedesktop.org])
-AC_CONFIG_SRCDIR([src/fgetln.c])
+AC_CONFIG_SRCDIR([src/strlcpy.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -12,8 +12,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
                             [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
 
 LIBBSD_ABI_MAJOR=0
-LIBBSD_ABI_MINOR=8
-LIBBSD_ABI_PATCH=2
+LIBBSD_ABI_MINOR=9
+LIBBSD_ABI_PATCH=1
 
 LIBBSD_ABI="$LIBBSD_ABI_MAJOR:$LIBBSD_ABI_MINOR:$LIBBSD_ABI_PATCH"
 AC_SUBST([LIBBSD_ABI])
@@ -44,17 +44,31 @@ AC_SUBST([TESTU01_LIBS])
 AM_CONDITIONAL([HAVE_LIBTESTU01],
                [test "x$ac_cv_lib_testu01_unif01_CreateExternGenBits" = "xyes"])
 
+AS_CASE([$host_os],
+  [*-gnu*], [
+    # In old glibc versions (< 2.17) clock_gettime() is in librt.
+    saved_LIBS="$LIBS"
+    AC_SEARCH_LIBS([clock_gettime], [rt], [CLOCK_GETTIME_LIBS="-lrt"])
+    AC_SUBST([CLOCK_GETTIME_LIBS])
+    LIBS="$saved_LIBS"
+  ],
+  [*-musl*], [
+    # Upstream refuses to define this, we will do it ourselves then.
+    AC_DEFINE([__MUSL__], [1], [Define to 1 if we are building for musl])
+  ],
+)
+
 # Checks for header files.
 AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_UID_T
 AC_C_INLINE
 AC_C_TYPEOF
 AC_TYPE_INT64_T
 AC_TYPE_MODE_T
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
+AC_TYPE_UID_T
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 
@@ -121,9 +135,8 @@ AC_LINK_IFELSE(
 
 AC_MSG_CHECKING([for __progname])
 AC_LINK_IFELSE(
-	[AC_LANG_PROGRAM([[]],
-	                 [[extern char *__progname;
-	                   const char *p = __progname;]])],
+	[AC_LANG_PROGRAM([[extern char *__progname;]],
+	                 [[printf("%s", __progname);]])],
 	[AC_DEFINE([HAVE___PROGNAME], [1], [Define to 1 if you have __progname])
 	 AC_MSG_RESULT([yes])],
 	[AC_MSG_RESULT([no])])
@@ -131,7 +144,7 @@ AC_LINK_IFELSE(
 AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \
                 getauxval getentropy getexecname getline \
                 pstat_getproc sysconf])
-AM_CONDITIONAL(HAVE_GETENTROPY, [test "x$ac_cv_func_getentropy" = "xtrue"])
+AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"])
 
 AC_CONFIG_FILES([
 	Makefile

include/Makefile.am

@@ -6,12 +6,14 @@ nobase_include_HEADERS = \
 	bsd/sys/endian.h \
 	bsd/sys/poll.h \
 	bsd/sys/queue.h \
+	bsd/sys/time.h \
 	bsd/sys/tree.h \
 	bsd/netinet/ip_icmp.h \
 	bsd/bitstring.h \
 	bsd/bsd.h \
 	bsd/err.h \
 	bsd/getopt.h \
+	bsd/inttypes.h \
 	bsd/libutil.h \
 	bsd/md5.h \
 	bsd/nlist.h \

include/bsd/inttypes.h

@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2018 Guillem Jover <guillem@hadrons.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce 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 ``AS IS'' AND ANY EXPRESS OR IMPLIED 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.
+ */
+
+#ifdef LIBBSD_OVERLAY
+#include_next <inttypes.h>
+#else
+#include <inttypes.h>
+#endif
+
+#ifndef LIBBSD_INTTYPES_H
+#define LIBBSD_INTTYPES_H
+
+#ifdef LIBBSD_OVERLAY
+#include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
+
+__BEGIN_DECLS
+intmax_t strtoi(const char *__restrict nptr, char **__restrict endptr,
+                int base, intmax_t lo, intmax_t hi, int *rstatus);
+uintmax_t strtou(const char *__restrict nptr, char **__restrict endptr,
+                 int base, uintmax_t lo, uintmax_t hi, int *rstatus);
+__END_DECLS
+
+#endif

include/bsd/libutil.h

@@ -36,22 +36,19 @@
  * $FreeBSD: src/lib/libutil/libutil.h,v 1.47 2008/04/23 00:49:12 scf Exp $
  */
 
-#ifndef _LIBUTIL_H_
-#define _LIBUTIL_H_
+#ifndef LIBBSD_LIBUTIL_H
+#define LIBBSD_LIBUTIL_H
 
-#include <features.h>
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/types.h>
 #include <stdint.h>
 #include <stdio.h>
 
-/* for pidfile.c */
-struct pidfh {
-	int	pf_fd;
-	char	*pf_path;
-	dev_t	pf_dev;
-	ino_t	pf_ino;
-};
+struct pidfh;
 
 __BEGIN_DECLS
 int humanize_number(char *buf, size_t len, int64_t bytes,
@@ -59,8 +56,10 @@ int humanize_number(char *buf, size_t len, int64_t bytes,
 int expand_number(const char *_buf, uint64_t *_num);
 
 int flopen(const char *_path, int _flags, ...);
+int flopenat(int dirfd, const char *path, int flags, ...);
 
 struct pidfh *pidfile_open(const char *path, mode_t mode, pid_t *pidptr);
+int pidfile_fileno(const struct pidfh *pfh);
 int pidfile_write(struct pidfh *pfh);
 int pidfile_close(struct pidfh *pfh);
 int pidfile_remove(struct pidfh *pfh);
@@ -68,12 +67,14 @@ int pidfile_remove(struct pidfh *pfh);
 char   *fparseln(FILE *, size_t *, size_t *, const char[3], int);
 __END_DECLS
 
-/* humanize_number(3) */
+/* Values for humanize_number(3)'s flags parameter. */
 #define HN_DECIMAL		0x01
 #define HN_NOSPACE		0x02
 #define HN_B			0x04
 #define HN_DIVISOR_1000		0x08
+#define HN_IEC_PREFIXES		0x10
 
+/* Values for humanize_number(3)'s scale parameter. */
 #define HN_GETSCALE		0x10
 #define HN_AUTOSCALE		0x20
 
@@ -86,4 +87,4 @@ __END_DECLS
 #define FPARSELN_UNESCREST	0x08
 #define FPARSELN_UNESCALL	0x0f
 
-#endif /* !_LIBUTIL_H_ */
+#endif /* !LIBBSD_LIBUTIL_H */

include/bsd/md5.h

@@ -12,8 +12,8 @@
  * with every copy.
  */
 
-#ifndef _MD5_H_
-#define _MD5_H_
+#ifndef LIBBSD_MD5_H
+#define LIBBSD_MD5_H
 
 #include <stdint.h>
 
@@ -27,7 +27,11 @@ typedef struct MD5Context {
 	uint8_t buffer[MD5_BLOCK_LENGTH];	/* input buffer */
 } MD5_CTX;
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/types.h>
 
 __BEGIN_DECLS
@@ -51,4 +55,4 @@ char	*MD5Data(const uint8_t *, size_t, char *)
 		__attribute__((__bounded__(__minbytes__,3,MD5_DIGEST_STRING_LENGTH)));
 __END_DECLS
 
-#endif /* _MD5_H_ */
+#endif /* LIBBSD_MD5_H */

include/bsd/netinet/ip_icmp.h

@@ -30,10 +30,10 @@
  * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.22 2004/04/07 20:46:13 imp Exp $
  */
 
-#ifndef _NETINET_IP_ICMP_H_
-#define _NETINET_IP_ICMP_H_
+#ifndef LIBBSD_NETINET_IP_ICMP_H
+#define LIBBSD_NETINET_IP_ICMP_H
 
-#include <sys/types.h>		/* u_int32_t, u_char */
+#include <sys/types.h>		/* uint32_t */
 #include <netinet/in.h>		/* in_addr */
 #include <netinet/in_systm.h>	/* n_short */
 #include <netinet/ip.h>		/* idi_ip */
@@ -47,19 +47,19 @@
  * Internal of an ICMP Router Advertisement
  */
 struct icmp_ra_addr {
-	u_int32_t ira_addr;
-	u_int32_t ira_preference;
+	uint32_t ira_addr;
+	uint32_t ira_preference;
 };
 
 /*
  * Structure of an icmp header.
  */
 struct icmp {
-	u_char	icmp_type;		/* type of message, see below */
-	u_char	icmp_code;		/* type sub code */
-	u_short	icmp_cksum;		/* ones complement cksum of struct */
+	unsigned char	icmp_type;	/* type of message, see below */
+	unsigned char	icmp_code;	/* type sub code */
+	unsigned short	icmp_cksum;	/* ones complement cksum of struct */
 	union {
-		u_char ih_pptr;			/* ICMP_PARAMPROB */
+		unsigned char ih_pptr;		/* ICMP_PARAMPROB */
 		struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
 		struct ih_idseq {
 			n_short	icd_id;
@@ -74,9 +74,9 @@ struct icmp {
 		} ih_pmtu;
 
 		struct ih_rtradv {
-			u_char irt_num_addrs;
-			u_char irt_wpa;
-			u_int16_t irt_lifetime;
+			unsigned char irt_num_addrs;
+			unsigned char irt_wpa;
+			uint16_t irt_lifetime;
 		} ih_rtradv;
 	} icmp_hun;
 #define	icmp_pptr	icmp_hun.ih_pptr
@@ -100,7 +100,7 @@ struct icmp {
 			/* options and then 64 bits of data */
 		} id_ip;
 		struct icmp_ra_addr id_radv;
-		u_int32_t id_mask;
+		uint32_t id_mask;
 		char	id_data[1];
 	} icmp_dun;
 #define	icmp_otime	icmp_dun.id_ts.its_otime

include/bsd/nlist.h

@@ -27,8 +27,70 @@
 #ifndef LIBBSD_NLIST_H
 #define LIBBSD_NLIST_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
-#include <a.out.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
+
+struct nlist {
+	union {
+		char *n_name;
+		struct n_list *n_next;
+		long n_strx;
+	} n_un;
+	unsigned char n_type;
+	char n_other;
+	short n_desc;
+	unsigned long n_value;
+};
+
+#define n_hash	n_desc		/* used internally by ld(1); XXX */
+
+/*
+ * Defines for n_type.
+ */
+#define N_UNDF	0x00		/* Undefined */
+#define N_ABS	0x02		/* Absolute address */
+#define N_TEXT	0x04		/* Text segment */
+#define N_DATA	0x06		/* Data segment */
+#define N_BSS	0x08		/* Bss segment */
+#define N_INDR	0x0a		/* Alias definition */
+#define N_SIZE	0x0c		/* Pseudo type, defines a symbol's size */
+#define N_COMM	0x12		/* Common reference */
+/* GNU extensions */
+#define N_SETA	0x14		/* Absolute set element symbol */
+#define N_SETT	0x16		/* Text set element symbol */
+#define N_SETD	0x18		/* Data set element symbol */
+#define N_SETB	0x1a		/* Bss set element symbol */
+#define N_SETV	0x1c		/* Set vector symbol */
+/* end GNU extensions */
+#define N_FN	0x1e		/* File name (N_EXT on) */
+#define N_WARN	0x1e		/* Warning message (N_EXT off) */
+
+#define N_EXT	0x01		/* External (global) bit, OR'ed in */
+#define N_TYPE	0x1e		/* Mask for all the type bits */
+#define N_STAB	0xe0		/* Mask for debugger symbols -- stab(5) */
+
+#define N_NAME(p)	((p)->n_un.n_name)
+
+/*
+ * Defines for n_other.  It contains the ".type" (AUX) field in the least
+ * significant 4 bits, and the binding (for weak symbols) in the most
+ * significant 4 bits.
+ */
+#define N_AUX(p)	((p)->n_other & 0xf)
+#define N_BIND(p)	(((unsigned int)(p)->n_other >> 4) & 0xf)
+#define N_OTHER(r, v)	(((unsigned int)(r) << 4) | ((v) & 0xf))
+
+#define AUX_OBJECT	1	/* Data object */
+#define AUX_FUNC	2	/* Function */
+
+/*#define BIND_LOCAL	0	Not used */
+/*#define BIND_GLOBAL	1	Not used */
+#define BIND_WEAK	2	/* Weak binding */
+
+#define N_FORMAT	"%08x"	/* namelist value format; XXX */
 
 __BEGIN_DECLS
 extern int nlist(const char *filename, struct nlist *list);

include/bsd/readpassphrase.h

@@ -20,8 +20,8 @@
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
-#ifndef _READPASSPHRASE_H_
-#define _READPASSPHRASE_H_
+#ifndef LIBBSD_READPASSPHRASE_H
+#define LIBBSD_READPASSPHRASE_H
 
 #define RPP_ECHO_OFF    0x00		/* Turn off echo (default). */
 #define RPP_ECHO_ON     0x01		/* Leave echo on. */
@@ -31,11 +31,15 @@
 #define RPP_SEVENBIT    0x10		/* Strip the high bit from input. */
 #define RPP_STDIN       0x20		/* Read from stdin, not /dev/tty */
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/types.h>
 
 __BEGIN_DECLS
 char * readpassphrase(const char *, char *, size_t, int);
 __END_DECLS
 
-#endif /* !_READPASSPHRASE_H_ */
+#endif /* !LIBBSD_READPASSPHRASE_H */

include/bsd/stdio.h

@@ -38,7 +38,11 @@
 #ifndef LIBBSD_STDIO_H
 #define LIBBSD_STDIO_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/types.h>
 
 __BEGIN_DECLS
@@ -47,9 +51,9 @@ const char *fmtcheck(const char *, const char *);
 /* XXX: The function requires cooperation from the system libc to store the
  * line buffer in the FILE struct itself. */
 char *fgetln(FILE *fp, size_t *lenp)
-	__attribute__((deprecated("This functions cannot be safely ported, "
+	LIBBSD_DEPRECATED("This functions cannot be safely ported, "
 	                  "use getline(3) instead, as it is supported "
-	                          "by GNU and POSIX.1-2008.")));
+	                  "by GNU and POSIX.1-2008.");
 
 /*
  * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations,

include/bsd/stdlib.h

@@ -42,14 +42,18 @@
 #ifndef LIBBSD_STDLIB_H
 #define LIBBSD_STDLIB_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/stat.h>
 #include <stdint.h>
 
 __BEGIN_DECLS
 uint32_t arc4random(void);
 void arc4random_stir(void);
-void arc4random_addrandom(u_char *dat, int datlen);
+void arc4random_addrandom(unsigned char *dat, int datlen);
 void arc4random_buf(void *_buf, size_t n);
 uint32_t arc4random_uniform(uint32_t upper_bound);
 
@@ -67,7 +71,10 @@ int sradixsort(const unsigned char **base, int nmemb,
                const unsigned char *table, unsigned endbyte);
 
 void *reallocf(void *ptr, size_t size);
+#if !defined(__GLIBC__) || \
+    (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE)))
 void *reallocarray(void *ptr, size_t nmemb, size_t size);
+#endif
 
 long long strtonum(const char *nptr, long long minval, long long maxval,
                    const char **errstr);

include/bsd/string.h

@@ -33,7 +33,11 @@
 #ifndef LIBBSD_STRING_H
 #define LIBBSD_STRING_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/types.h>
 
 __BEGIN_DECLS
@@ -42,7 +46,10 @@ size_t strlcat(char *dst, const char *src, size_t siz);
 char *strnstr(const char *str, const char *find, size_t str_len);
 void strmode(mode_t mode, char *str);
 
+#if !defined(__GLIBC__) || \
+    (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE)))
 void explicit_bzero(void *buf, size_t len);
+#endif
 __END_DECLS
 
 #endif

include/bsd/stringlist.h

@@ -29,9 +29,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _STRINGLIST_H
-#define _STRINGLIST_H
+#ifndef LIBBSD_STRINGLIST_H
+#define LIBBSD_STRINGLIST_H
+
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/types.h>
 
 /*
@@ -51,4 +56,4 @@ char		*sl_find(StringList *, const char *);
 int		 sl_delete(StringList *, const char *, int);
 __END_DECLS
 
-#endif /* _STRINGLIST_H */
+#endif /* LIBBSD_STRINGLIST_H */

include/bsd/sys/bitstring.h

@@ -32,8 +32,8 @@
  * $FreeBSD$
  */
 
-#ifndef _SYS_BITSTRING_H_
-#define	_SYS_BITSTRING_H_
+#ifndef LIBBSD_SYS_BITSTRING_H
+#define LIBBSD_SYS_BITSTRING_H
 
 typedef	unsigned char bitstr_t;
 
@@ -143,4 +143,4 @@ typedef	unsigned char bitstr_t;
 	*(value) = _value; \
 } while (0)
 
-#endif /* !_SYS_BITSTRING_H_ */
+#endif /* !LIBBSD_SYS_BITSTRING_H */

include/bsd/sys/cdefs.h

@@ -24,15 +24,48 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef __has_include
+#define __has_include(x) 1
+#endif
+#ifndef __has_include_next
+#define __has_include_next(x) 1
+#endif
+
 #ifdef LIBBSD_OVERLAY
+/*
+ * Some libc implementations do not have a <sys/cdefs.h>, in particular
+ * musl, try to handle this gracefully.
+ */
+#if __has_include_next(<sys/cdefs.h>)
 #include_next <sys/cdefs.h>
+#endif
 #else
+#if __has_include(<sys/cdefs.h>)
 #include <sys/cdefs.h>
 #endif
+#endif
 
 #ifndef LIBBSD_SYS_CDEFS_H
 #define LIBBSD_SYS_CDEFS_H
 
+#ifndef __BEGIN_DECLS
+#ifdef __cplusplus
+#define __BEGIN_DECLS	extern "C" {
+#define __END_DECLS	}
+#else
+#define __BEGIN_DECLS
+#define __END_DECLS
+#endif
+#endif
+
+/*
+ * On non-glibc based systems, we cannot unconditionally use the
+ * __GLIBC_PREREQ macro as it gets expanded before evaluation.
+ */
+#ifndef __GLIBC_PREREQ
+#define __GLIBC_PREREQ(maj, min) 0
+#endif
+
 /*
  * Some kFreeBSD headers expect those macros to be set for sanity checks.
  */
@@ -43,12 +76,29 @@
 #define _SYS_CDEFS_H
 #endif
 
+#define LIBBSD_CONCAT(x, y)	x ## y
+#define LIBBSD_STRING(x)	#x
+
 #ifdef __GNUC__
 #define LIBBSD_GCC_VERSION (__GNUC__ << 8 | __GNUC_MINOR__)
 #else
 #define LIBBSD_GCC_VERSION 0
 #endif
 
+#if LIBBSD_GCC_VERSION >= 0x0405
+#define LIBBSD_DEPRECATED(x) __attribute__((deprecated(x)))
+#elif LIBBSD_GCC_VERSION >= 0x0301
+#define LIBBSD_DEPRECATED(x) __attribute__((deprecated))
+#else
+#define LIBBSD_DEPRECATED(x)
+#endif
+
+#if LIBBSD_GCC_VERSION >= 0x0200
+#define LIBBSD_REDIRECT(name, proto, alias) name proto __asm__(LIBBSD_ASMNAME(#alias))
+#endif
+#define LIBBSD_ASMNAME(cname) LIBBSD_ASMNAME_PREFIX(__USER_LABEL_PREFIX__, cname)
+#define LIBBSD_ASMNAME_PREFIX(prefix, cname) LIBBSD_STRING(prefix) cname
+
 #ifndef __dead2
 # if LIBBSD_GCC_VERSION >= 0x0207
 #  define __dead2 __attribute__((__noreturn__))
@@ -114,6 +164,12 @@
 # define __bounded__(x, y, z)
 #endif
 
+/*
+ * Return the number of elements in a statically-allocated array,
+ * __x.
+ */
+#define	__arraycount(__x)	(sizeof(__x) / sizeof(__x[0]))
+
 /*
  * We define this here since <stddef.h>, <sys/queue.h>, and <sys/types.h>
  * require it.

include/bsd/sys/queue.h

@@ -30,10 +30,14 @@
  * $FreeBSD$
  */
 
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
+#ifndef LIBBSD_SYS_QUEUE_H
+#define LIBBSD_SYS_QUEUE_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 
 /*
  * This file defines four types of data structures: singly-linked lists,
@@ -691,4 +695,4 @@ struct {								\
 		(head2)->tqh_last = &(head2)->tqh_first;		\
 } while (0)
 
-#endif /* !_SYS_QUEUE_H_ */
+#endif /* !LIBBSD_SYS_QUEUE_H */

include/bsd/sys/time.h

@@ -0,0 +1,138 @@
+/*	$OpenBSD: time.h,v 1.36 2016/09/12 19:41:20 guenther Exp $	*/
+/*	$NetBSD: time.h,v 1.18 1996/04/23 10:29:33 mycroft Exp $	*/
+
+/*
+ * Copyright (c) 1982, 1986, 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.
+ *
+ *	@(#)time.h	8.2 (Berkeley) 7/10/94
+ */
+
+#ifdef LIBBSD_OVERLAY
+#include_next <sys/time.h>
+#else
+#include <sys/time.h>
+#endif
+
+#ifndef LIBBSD_SYS_TIME_H
+#define LIBBSD_SYS_TIME_H
+
+#ifndef TIMEVAL_TO_TIMESPEC
+#define	TIMEVAL_TO_TIMESPEC(tv, ts) {					\
+	(ts)->tv_sec = (tv)->tv_sec;					\
+	(ts)->tv_nsec = (tv)->tv_usec * 1000;				\
+}
+#endif
+
+#ifndef TIMESPEC_TO_TIMEVAL
+#define	TIMESPEC_TO_TIMEVAL(tv, ts) {					\
+	(tv)->tv_sec = (ts)->tv_sec;					\
+	(tv)->tv_usec = (ts)->tv_nsec / 1000;				\
+}
+#endif
+
+/* Operations on timevals. */
+#ifndef timerclear
+#define	timerclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
+#endif
+
+#ifndef timerisset
+#define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
+#endif
+
+#ifndef timercmp
+#define	timercmp(tvp, uvp, cmp)						\
+	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
+	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
+	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
+#endif
+
+#ifndef timeradd
+#define	timeradd(tvp, uvp, vvp)						\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec >= 1000000) {			\
+			(vvp)->tv_sec++;				\
+			(vvp)->tv_usec -= 1000000;			\
+		}							\
+	} while (0)
+#endif
+
+#ifndef timersub
+#define	timersub(tvp, uvp, vvp)						\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec < 0) {				\
+			(vvp)->tv_sec--;				\
+			(vvp)->tv_usec += 1000000;			\
+		}							\
+	} while (0)
+#endif
+
+/* Operations on timespecs. */
+#ifndef timespecclear
+#define	timespecclear(tsp)		(tsp)->tv_sec = (tsp)->tv_nsec = 0
+#endif
+
+#ifndef timespecisset
+#define	timespecisset(tsp)		((tsp)->tv_sec || (tsp)->tv_nsec)
+#endif
+
+#ifndef timespeccmp
+#define	timespeccmp(tsp, usp, cmp)					\
+	(((tsp)->tv_sec == (usp)->tv_sec) ?				\
+	    ((tsp)->tv_nsec cmp (usp)->tv_nsec) :			\
+	    ((tsp)->tv_sec cmp (usp)->tv_sec))
+#endif
+
+#ifndef timespecadd
+#define	timespecadd(tsp, usp, vsp)					\
+	do {								\
+		(vsp)->tv_sec = (tsp)->tv_sec + (usp)->tv_sec;		\
+		(vsp)->tv_nsec = (tsp)->tv_nsec + (usp)->tv_nsec;	\
+		if ((vsp)->tv_nsec >= 1000000000L) {			\
+			(vsp)->tv_sec++;				\
+			(vsp)->tv_nsec -= 1000000000L;			\
+		}							\
+	} while (0)
+#endif
+
+#ifndef timespecsub
+#define	timespecsub(tsp, usp, vsp)					\
+	do {								\
+		(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;		\
+		(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec;	\
+		if ((vsp)->tv_nsec < 0) {				\
+			(vsp)->tv_sec--;				\
+			(vsp)->tv_nsec += 1000000000L;			\
+		}							\
+	} while (0)
+#endif
+
+#endif

include/bsd/sys/tree.h

@@ -27,10 +27,14 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_SYS_TREE_H_
-#define	_SYS_TREE_H_
+#ifndef LIBBSD_SYS_TREE_H
+#define LIBBSD_SYS_TREE_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 
 /*
  * This file defines data structures for different types of trees:
@@ -762,4 +766,4 @@ name##_RB_MINMAX(struct name *head, int val)				\
 	    ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL);	\
 	     (x) = (y))
 
-#endif	/* _SYS_TREE_H_ */
+#endif /* LIBBSD_SYS_TREE_H */

include/bsd/timeconv.h

@@ -38,10 +38,14 @@
  * $FreeBSD$
  */
 
-#ifndef _TIMECONV_H_
-#define _TIMECONV_H_
+#ifndef LIBBSD_TIMECONV_H
+#define LIBBSD_TIMECONV_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <stdint.h>
 #include <time.h>
 
@@ -54,4 +58,4 @@ time_t _long_to_time(long tlong);
 int _time_to_int(time_t t);
 time_t _int_to_time(int tint);
 
-#endif /* _TIMECONV_H_ */
+#endif /* LIBBSD_TIMECONV_H */

include/bsd/vis.h

@@ -1,3 +1,5 @@
+/*	$NetBSD: vis.h,v 1.25 2017/04/23 01:57:36 christos Exp $	*/
+
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,36 +29,44 @@
  * SUCH DAMAGE.
  *
  *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/vis.h,v 1.11 2003/10/30 10:40:49 phk Exp $
  */
 
-#ifndef _VIS_H_
-#define	_VIS_H_
+#ifndef LIBBSD_VIS_H
+#define LIBBSD_VIS_H
 
 #include <sys/types.h>
 
 /*
  * to select alternate encoding format
  */
-#define	VIS_OCTAL	0x01	/* use octal \ddd format */
-#define	VIS_CSTYLE	0x02	/* use \[nrft0..] where appropriate */
+#define	VIS_OCTAL	0x0001	/* use octal \ddd format */
+#define	VIS_CSTYLE	0x0002	/* use \[nrft0..] where appropriate */
 
 /*
  * to alter set of characters encoded (default is to encode all
  * non-graphic except space, tab, and newline).
  */
-#define	VIS_SP		0x04	/* also encode space */
-#define	VIS_TAB		0x08	/* also encode tab */
-#define	VIS_NL		0x10	/* also encode newline */
+#define	VIS_SP		0x0004	/* also encode space */
+#define	VIS_TAB		0x0008	/* also encode tab */
+#define	VIS_NL		0x0010	/* also encode newline */
 #define	VIS_WHITE	(VIS_SP | VIS_TAB | VIS_NL)
-#define	VIS_SAFE	0x20	/* only encode "unsafe" characters */
+#define	VIS_SAFE	0x0020	/* only encode "unsafe" characters */
+#define	VIS_DQ		0x8000	/* also encode double quotes */
 
 /*
  * other
  */
-#define	VIS_NOSLASH	0x40	/* inhibit printing '\' */
-#define	VIS_HTTPSTYLE	0x80	/* http-style escape % HEX HEX */
-#define	VIS_GLOB	0x100	/* encode glob(3) magics */
+#define	VIS_NOSLASH	0x0040	/* inhibit printing '\' */
+#define	VIS_HTTP1808	0x0080	/* http-style escape % hex hex */
+#define	VIS_HTTPSTYLE	0x0080	/* http-style escape % hex hex */
+#define	VIS_MIMESTYLE	0x0100	/* mime-style escape = HEX HEX */
+#define	VIS_HTTP1866	0x0200	/* http-style &#num; or &string; */
+#define	VIS_NOESCAPE	0x0400	/* don't decode `\' */
+#define	_VIS_END	0x0800	/* for unvis */
+#define	VIS_GLOB	0x1000	/* encode glob(3) magic characters */
+#define	VIS_SHELL	0x2000	/* encode shell special characters [not glob] */
+#define	VIS_META	(VIS_WHITE | VIS_GLOB | VIS_SHELL)
+#define	VIS_NOLOCALE	0x4000	/* encode using the C locale */
 
 /*
  * unvis return codes
@@ -70,19 +80,74 @@
 /*
  * unvis flags
  */
-#define	UNVIS_END	1	/* no more characters */
+#define	UNVIS_END	_VIS_END	/* no more characters */
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
+
+/*
+ * NetBSD added an strnvis and unfortunately made it incompatible with the
+ * existing one in OpenBSD and Freedesktop's libbsd (the former having existed
+ * for over ten years). Despite this incompatibility being reported during
+ * development (see http://gnats.netbsd.org/44977) they still shipped it.
+ * Even more unfortunately FreeBSD and later MacOS picked up this incompatible
+ * implementation.
+ *
+ * Provide both implementations and default for now on the historical one to
+ * avoid breakage, we will switch to the NetBSD one in libbsd 0.10.0 or so.
+ * Define LIBBSD_NETBSD_VIS to switch to the NetBSD one now.
+ */
+#ifndef LIBBSD_NETBSD_VIS
+#warning "NetBSD added incompatible strnvis() and strnunvis(), please see <bsd/vis.h> for more detils."
+#endif
 
 __BEGIN_DECLS
 char	*vis(char *, int, int, int);
+char	*nvis(char *, size_t, int, int, int);
+
+char	*svis(char *, int, int, int, const char *);
+char	*snvis(char *, size_t, int, int, int, const char *);
+
 int	strvis(char *, const char *, int);
-int	strvisx(char *, const char *, size_t, int);
+int	stravis(char **, const char *, int);
+#ifdef LIBBSD_NETBSD_VIS
+/* NetBSD prototype. */
+int	LIBBSD_REDIRECT(strnvis, (char *, size_t, const char *, int),
+                        strnvis_netbsd);
+#else
+/* OpenBSD prototype (current default). */
 int	strnvis(char *, const char *, size_t, int);
+#endif
+
+int	strsvis(char *, const char *, int, const char *);
+int	strsnvis(char *, size_t, const char *, int, const char *);
+
+int	strvisx(char *, const char *, size_t, int);
+int	strnvisx(char *, size_t, const char *, size_t, int);
+int	strenvisx(char *, size_t, const char *, size_t, int, int *);
+
+int	strsvisx(char *, const char *, size_t, int, const char *);
+int	strsnvisx(char *, size_t, const char *, size_t, int, const char *);
+int	strsenvisx(char *, size_t, const char *, size_t , int, const char *,
+    int *);
+
 int	strunvis(char *, const char *);
-int	strunvisx(char *, const char *, int);
+#ifdef LIBBSD_NETBSD_VIS
+/* NetBSD prototype. */
+int	LIBBSD_REDIRECT(strnunvis, (char *, size_t, const char *),
+                        strnunvis_netbsd);
+#else
+/* OpenBSD prototype (current default). */
 ssize_t	strnunvis(char *, const char *, size_t);
+#endif
+
+int	strunvisx(char *, const char *, int);
+int	strnunvisx(char *, size_t, const char *, int);
+
 int	unvis(char *, int, int *, int);
 __END_DECLS
 
-#endif /* !_VIS_H_ */
+#endif /* !LIBBSD_VIS_H */

include/bsd/wchar.h

@@ -40,7 +40,11 @@
 #define LIBBSD_WCHAR_H
 
 #include <stddef.h>
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/types.h>
 
 __BEGIN_DECLS

man/.gitignore

@@ -1,2 +1 @@
-md5.3
 md5.3bsd

man/LIST_EMPTY.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_ENTRY.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_FIRST.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_FOREACH.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_FOREACH_FROM.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_FOREACH_FROM_SAFE.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_FOREACH_SAFE.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_HEAD.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_HEAD_INITIALIZER.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_INIT.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_INSERT_AFTER.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_INSERT_BEFORE.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_INSERT_HEAD.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_NEXT.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_PREV.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_REMOVE.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/LIST_SWAP.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/Makefile.am

@@ -14,50 +14,224 @@ md5.3bsd: $(srcdir)/mdX.3bsd
 	$(AM_V_GEN) sed $(SED_MD5_SUBST) $< > $@
 
 dist_man_MANS = \
-	arc4random.3 \
-	arc4random_addrandom.3 \
-	arc4random_buf.3 \
-	arc4random_stir.3 \
-	arc4random_uniform.3 \
-	bitstring.3 \
-	closefrom.3 \
-	dehumanize_number.3 \
-	expand_number.3 \
-	explicit_bzero.3 \
-	fgetln.3 \
-	fgetwln.3 \
-	flopen.3 \
-	fmtcheck.3 \
-	fparseln.3 \
+	LIST_EMPTY.3bsd \
+	LIST_ENTRY.3bsd \
+	LIST_FIRST.3bsd \
+	LIST_FOREACH.3bsd \
+	LIST_FOREACH_FROM.3bsd \
+	LIST_FOREACH_FROM_SAFE.3bsd \
+	LIST_FOREACH_SAFE.3bsd \
+	LIST_HEAD.3bsd \
+	LIST_HEAD_INITIALIZER.3bsd \
+	LIST_INIT.3bsd \
+	LIST_INSERT_AFTER.3bsd \
+	LIST_INSERT_BEFORE.3bsd \
+	LIST_INSERT_HEAD.3bsd \
+	LIST_NEXT.3bsd \
+	LIST_PREV.3bsd \
+	LIST_REMOVE.3bsd \
+	LIST_SWAP.3bsd \
+	RB_EMPTY.3bsd \
+	RB_ENTRY.3bsd \
+	RB_FIND.3bsd \
+	RB_FOREACH.3bsd \
+	RB_FOREACH_REVERSE.3bsd \
+	RB_GENERATE.3bsd \
+	RB_GENERATE_STATIC.3bsd \
+	RB_HEAD.3bsd \
+	RB_INIT.3bsd \
+	RB_INITIALIZER.3bsd \
+	RB_INSERT.3bsd \
+	RB_LEFT.3bsd \
+	RB_MAX.3bsd \
+	RB_MIN.3bsd \
+	RB_NEXT.3bsd \
+	RB_NFIND.3bsd \
+	RB_PARENT.3bsd \
+	RB_PREV.3bsd \
+	RB_PROTOTYPE.3bsd \
+	RB_PROTOTYPE_STATIC.3bsd \
+	RB_REMOVE.3bsd \
+	RB_RIGHT.3bsd \
+	RB_ROOT.3bsd \
+	SLIST_EMPTY.3bsd \
+	SLIST_ENTRY.3bsd \
+	SLIST_FIRST.3bsd \
+	SLIST_FOREACH.3bsd \
+	SLIST_FOREACH_FROM.3bsd \
+	SLIST_FOREACH_FROM_SAFE.3bsd \
+	SLIST_FOREACH_SAFE.3bsd \
+	SLIST_HEAD.3bsd \
+	SLIST_HEAD_INITIALIZER.3bsd \
+	SLIST_INIT.3bsd \
+	SLIST_INSERT_AFTER.3bsd \
+	SLIST_INSERT_HEAD.3bsd \
+	SLIST_NEXT.3bsd \
+	SLIST_REMOVE.3bsd \
+	SLIST_REMOVE_AFTER.3bsd \
+	SLIST_REMOVE_HEAD.3bsd \
+	SLIST_SWAP.3bsd \
+	SPLAY_EMPTY.3bsd \
+	SPLAY_ENTRY.3bsd \
+	SPLAY_FIND.3bsd \
+	SPLAY_FOREACH.3bsd \
+	SPLAY_GENERATE.3bsd \
+	SPLAY_HEAD.3bsd \
+	SPLAY_INIT.3bsd \
+	SPLAY_INITIALIZER.3bsd \
+	SPLAY_INSERT.3bsd \
+	SPLAY_LEFT.3bsd \
+	SPLAY_MAX.3bsd \
+	SPLAY_MIN.3bsd \
+	SPLAY_NEXT.3bsd \
+	SPLAY_PROTOTYPE.3bsd \
+	SPLAY_REMOVE.3bsd \
+	SPLAY_RIGHT.3bsd \
+	SPLAY_ROOT.3bsd \
+	STAILQ_CONCAT.3bsd \
+	STAILQ_EMPTY.3bsd \
+	STAILQ_ENTRY.3bsd \
+	STAILQ_FIRST.3bsd \
+	STAILQ_FOREACH.3bsd \
+	STAILQ_FOREACH_FROM.3bsd \
+	STAILQ_FOREACH_FROM_SAFE.3bsd \
+	STAILQ_FOREACH_SAFE.3bsd \
+	STAILQ_HEAD.3bsd \
+	STAILQ_HEAD_INITIALIZER.3bsd \
+	STAILQ_INIT.3bsd \
+	STAILQ_INSERT_AFTER.3bsd \
+	STAILQ_INSERT_HEAD.3bsd \
+	STAILQ_INSERT_TAIL.3bsd \
+	STAILQ_LAST.3bsd \
+	STAILQ_NEXT.3bsd \
+	STAILQ_REMOVE.3bsd \
+	STAILQ_REMOVE_AFTER.3bsd \
+	STAILQ_REMOVE_HEAD.3bsd \
+	STAILQ_SWAP.3bsd \
+	TAILQ_CONCAT.3bsd \
+	TAILQ_EMPTY.3bsd \
+	TAILQ_ENTRY.3bsd \
+	TAILQ_FIRST.3bsd \
+	TAILQ_FOREACH.3bsd \
+	TAILQ_FOREACH_FROM.3bsd \
+	TAILQ_FOREACH_FROM_SAFE.3bsd \
+	TAILQ_FOREACH_REVERSE.3bsd \
+	TAILQ_FOREACH_REVERSE_FROM.3bsd \
+	TAILQ_FOREACH_REVERSE_FROM_SAFE.3bsd \
+	TAILQ_FOREACH_REVERSE_SAFE.3bsd \
+	TAILQ_FOREACH_SAFE.3bsd \
+	TAILQ_HEAD.3bsd \
+	TAILQ_HEAD_INITIALIZER.3bsd \
+	TAILQ_INIT.3bsd \
+	TAILQ_INSERT_AFTER.3bsd \
+	TAILQ_INSERT_BEFORE.3bsd \
+	TAILQ_INSERT_HEAD.3bsd \
+	TAILQ_INSERT_TAIL.3bsd \
+	TAILQ_LAST.3bsd \
+	TAILQ_NEXT.3bsd \
+	TAILQ_PREV.3bsd \
+	TAILQ_REMOVE.3bsd \
+	TAILQ_SWAP.3bsd \
+	TIMESPEC_TO_TIMEVAL.3bsd \
+	TIMEVAL_TO_TIMESPEC.3bsd \
+	arc4random.3bsd \
+	arc4random_addrandom.3bsd \
+	arc4random_buf.3bsd \
+	arc4random_stir.3bsd \
+	arc4random_uniform.3bsd \
+	be16dec.3bsd \
+	be16enc.3bsd \
+	be32dec.3bsd \
+	be32enc.3bsd \
+	be64dec.3bsd \
+	be64enc.3bsd \
+	bit_alloc.3bsd \
+	bit_clear.3bsd \
+	bit_decl.3bsd \
+	bit_ffc.3bsd \
+	bit_ffs.3bsd \
+	bit_nclear.3bsd \
+	bit_nset.3bsd \
+	bit_set.3bsd \
+	bit_test.3bsd \
+	bitstr_size.3bsd \
+	bitstring.3bsd \
+	byteorder.3bsd \
+	closefrom.3bsd \
+	dehumanize_number.3bsd \
+	errc.3bsd \
+	expand_number.3bsd \
+	explicit_bzero.3bsd \
+	fgetln.3bsd \
+	fgetwln.3bsd \
+	flopen.3bsd \
+	fmtcheck.3bsd \
+	fparseln.3bsd \
+	fpurge.3bsd \
 	funopen.3bsd \
-	getbsize.3 \
-	getmode.3 \
-	getpeereid.3 \
-	getprogname.3 \
-	heapsort.3 \
-	humanize_number.3 \
+	getbsize.3bsd \
+	getmode.3bsd \
+	getpeereid.3bsd \
+	getprogname.3bsd \
+	heapsort.3bsd \
+	humanize_number.3bsd \
+	le16dec.3bsd \
+	le16enc.3bsd \
+	le32dec.3bsd \
+	le32enc.3bsd \
+	le64dec.3bsd \
+	le64enc.3bsd \
+	libbsd.7 \
 	md5.3bsd \
-	mergesort.3 \
-	nlist.3 \
-	pidfile.3 \
+	mergesort.3bsd \
+	nlist.3bsd \
+	pidfile.3bsd \
+	pidfile_close.3bsd \
+	pidfile_open.3bsd \
+	pidfile_remove.3bsd \
+	pidfile_write.3bsd \
 	queue.3bsd \
-	radixsort.3 \
-	readpassphrase.3 \
-	reallocarray.3 \
-	reallocf.3 \
-	setmode.3 \
-	setproctitle.3 \
-	setprogname.3 \
-	sradixsort.3 \
-	stringlist.3 \
-	strlcat.3 \
-	strlcpy.3 \
-	strnstr.3 \
-	strmode.3 \
-	strtonum.3 \
-	tree.3 \
-	unvis.3 \
-	vis.3 \
-	wcslcat.3 \
-	wcslcpy.3 \
+	radixsort.3bsd \
+	readpassphrase.3bsd \
+	reallocarray.3bsd \
+	reallocf.3bsd \
+	setmode.3bsd \
+	setproctitle.3bsd \
+	setproctitle_init.3bsd \
+	setprogname.3bsd \
+	sl_add.3bsd \
+	sl_delete.3bsd \
+	sl_find.3bsd \
+	sl_free.3bsd \
+	sl_init.3bsd \
+	sradixsort.3bsd \
+	stringlist.3bsd \
+	strlcat.3bsd \
+	strlcpy.3bsd \
+	strmode.3bsd \
+	strnstr.3bsd \
+	strnunvis.3bsd \
+	strnvis.3bsd \
+	strtoi.3bsd \
+	strtonum.3bsd \
+	strtou.3bsd \
+	strunvis.3bsd \
+	strvis.3bsd \
+	strvisx.3bsd \
+	timeradd.3bsd \
+	timerclear.3bsd \
+	timercmp.3bsd \
+	timerisset.3bsd \
+	timersub.3bsd \
+	timespecadd.3bsd \
+	timespecclear.3bsd \
+	timespeccmp.3bsd \
+	timespecisset.3bsd \
+	timespecsub.3bsd \
+	timeval.3bsd \
+	tree.3bsd \
+	unvis.3bsd \
+	vis.3bsd \
+	wcslcat.3bsd \
+	wcslcpy.3bsd \
 	$(nil)

man/RB_EMPTY.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_ENTRY.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_FIND.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_FOREACH.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_FOREACH_REVERSE.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_GENERATE.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_GENERATE_STATIC.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_HEAD.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_INIT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_INITIALIZER.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_INSERT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_LEFT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_MAX.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_MIN.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_NEXT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_NFIND.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_PARENT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_PREV.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_PROTOTYPE.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_PROTOTYPE_STATIC.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_REMOVE.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_RIGHT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/RB_ROOT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SLIST_EMPTY.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_ENTRY.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_FIRST.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_FOREACH.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_FOREACH_FROM.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_FOREACH_FROM_SAFE.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_FOREACH_SAFE.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_HEAD.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_HEAD_INITIALIZER.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_INIT.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_INSERT_AFTER.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_INSERT_HEAD.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_NEXT.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_REMOVE.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_REMOVE_AFTER.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_REMOVE_HEAD.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SLIST_SWAP.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd

man/SPLAY_EMPTY.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_ENTRY.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_FIND.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_FOREACH.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_GENERATE.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_HEAD.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_INIT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_INITIALIZER.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_INSERT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_LEFT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_MAX.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_MIN.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_NEXT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_PROTOTYPE.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_REMOVE.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_RIGHT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/SPLAY_ROOT.3bsd

@@ -0,0 +1 @@
+.so man3/tree.3bsd

man/STAILQ_CONCAT.3bsd

@@ -0,0 +1 @@
+.so man3/queue.3bsd