libbsd: Branch 'master' - 13 commits
Guillem Jover
guillem at kemper.freedesktop.org
Fri Jun 9 03:49:49 UTC 2017
COPYING | 72 ++++-----
TODO | 8 +
configure.ac | 12 -
include/bsd/netinet/ip_icmp.h | 22 +-
include/bsd/stdlib.h | 2
man/.gitignore | 1
man/LIST_EMPTY.3bsd | 1
man/LIST_ENTRY.3bsd | 1
man/LIST_FIRST.3bsd | 1
man/LIST_FOREACH.3bsd | 1
man/LIST_FOREACH_FROM.3bsd | 1
man/LIST_FOREACH_FROM_SAFE.3bsd | 1
man/LIST_FOREACH_SAFE.3bsd | 1
man/LIST_HEAD.3bsd | 1
man/LIST_HEAD_INITIALIZER.3bsd | 1
man/LIST_INIT.3bsd | 1
man/LIST_INSERT_AFTER.3bsd | 1
man/LIST_INSERT_BEFORE.3bsd | 1
man/LIST_INSERT_HEAD.3bsd | 1
man/LIST_NEXT.3bsd | 1
man/LIST_PREV.3bsd | 1
man/LIST_REMOVE.3bsd | 1
man/LIST_SWAP.3bsd | 1
man/Makefile.am | 244 +++++++++++++++++++++++++------
man/RB_EMPTY.3bsd | 1
man/RB_ENTRY.3bsd | 1
man/RB_FIND.3bsd | 1
man/RB_FOREACH.3bsd | 1
man/RB_FOREACH_REVERSE.3bsd | 1
man/RB_GENERATE.3bsd | 1
man/RB_GENERATE_STATIC.3bsd | 1
man/RB_HEAD.3bsd | 1
man/RB_INIT.3bsd | 1
man/RB_INITIALIZER.3bsd | 1
man/RB_INSERT.3bsd | 1
man/RB_LEFT.3bsd | 1
man/RB_MAX.3bsd | 1
man/RB_MIN.3bsd | 1
man/RB_NEXT.3bsd | 1
man/RB_NFIND.3bsd | 1
man/RB_PARENT.3bsd | 1
man/RB_PREV.3bsd | 1
man/RB_PROTOTYPE.3bsd | 1
man/RB_PROTOTYPE_STATIC.3bsd | 1
man/RB_REMOVE.3bsd | 1
man/RB_RIGHT.3bsd | 1
man/RB_ROOT.3bsd | 1
man/SLIST_EMPTY.3bsd | 1
man/SLIST_ENTRY.3bsd | 1
man/SLIST_FIRST.3bsd | 1
man/SLIST_FOREACH.3bsd | 1
man/SLIST_FOREACH_FROM.3bsd | 1
man/SLIST_FOREACH_FROM_SAFE.3bsd | 1
man/SLIST_FOREACH_SAFE.3bsd | 1
man/SLIST_HEAD.3bsd | 1
man/SLIST_HEAD_INITIALIZER.3bsd | 1
man/SLIST_INIT.3bsd | 1
man/SLIST_INSERT_AFTER.3bsd | 1
man/SLIST_INSERT_HEAD.3bsd | 1
man/SLIST_NEXT.3bsd | 1
man/SLIST_REMOVE.3bsd | 1
man/SLIST_REMOVE_AFTER.3bsd | 1
man/SLIST_REMOVE_HEAD.3bsd | 1
man/SLIST_SWAP.3bsd | 1
man/SPLAY_EMPTY.3bsd | 1
man/SPLAY_ENTRY.3bsd | 1
man/SPLAY_FIND.3bsd | 1
man/SPLAY_FOREACH.3bsd | 1
man/SPLAY_GENERATE.3bsd | 1
man/SPLAY_HEAD.3bsd | 1
man/SPLAY_INIT.3bsd | 1
man/SPLAY_INITIALIZER.3bsd | 1
man/SPLAY_INSERT.3bsd | 1
man/SPLAY_LEFT.3bsd | 1
man/SPLAY_MAX.3bsd | 1
man/SPLAY_MIN.3bsd | 1
man/SPLAY_NEXT.3bsd | 1
man/SPLAY_PROTOTYPE.3bsd | 1
man/SPLAY_REMOVE.3bsd | 1
man/SPLAY_RIGHT.3bsd | 1
man/SPLAY_ROOT.3bsd | 1
man/STAILQ_CONCAT.3bsd | 1
man/STAILQ_EMPTY.3bsd | 1
man/STAILQ_ENTRY.3bsd | 1
man/STAILQ_FIRST.3bsd | 1
man/STAILQ_FOREACH.3bsd | 1
man/STAILQ_FOREACH_FROM.3bsd | 1
man/STAILQ_FOREACH_FROM_SAFE.3bsd | 1
man/STAILQ_FOREACH_SAFE.3bsd | 1
man/STAILQ_HEAD.3bsd | 1
man/STAILQ_HEAD_INITIALIZER.3bsd | 1
man/STAILQ_INIT.3bsd | 1
man/STAILQ_INSERT_AFTER.3bsd | 1
man/STAILQ_INSERT_HEAD.3bsd | 1
man/STAILQ_INSERT_TAIL.3bsd | 1
man/STAILQ_LAST.3bsd | 1
man/STAILQ_NEXT.3bsd | 1
man/STAILQ_REMOVE.3bsd | 1
man/STAILQ_REMOVE_AFTER.3bsd | 1
man/STAILQ_REMOVE_HEAD.3bsd | 1
man/STAILQ_SWAP.3bsd | 1
man/TAILQ_CONCAT.3bsd | 1
man/TAILQ_EMPTY.3bsd | 1
man/TAILQ_ENTRY.3bsd | 1
man/TAILQ_FIRST.3bsd | 1
man/TAILQ_FOREACH.3bsd | 1
man/TAILQ_FOREACH_FROM.3bsd | 1
man/TAILQ_FOREACH_FROM_SAFE.3bsd | 1
man/TAILQ_FOREACH_REVERSE.3bsd | 1
man/TAILQ_FOREACH_REVERSE_FROM.3bsd | 1
man/TAILQ_FOREACH_REVERSE_FROM_SAFE.3bsd | 1
man/TAILQ_FOREACH_REVERSE_SAFE.3bsd | 1
man/TAILQ_FOREACH_SAFE.3bsd | 1
man/TAILQ_HEAD.3bsd | 1
man/TAILQ_HEAD_INITIALIZER.3bsd | 1
man/TAILQ_INIT.3bsd | 1
man/TAILQ_INSERT_AFTER.3bsd | 1
man/TAILQ_INSERT_BEFORE.3bsd | 1
man/TAILQ_INSERT_HEAD.3bsd | 1
man/TAILQ_INSERT_TAIL.3bsd | 1
man/TAILQ_LAST.3bsd | 1
man/TAILQ_NEXT.3bsd | 1
man/TAILQ_PREV.3bsd | 1
man/TAILQ_REMOVE.3bsd | 1
man/TAILQ_SWAP.3bsd | 1
man/arc4random.3bsd | 5
man/arc4random_addrandom.3 | 1
man/arc4random_addrandom.3bsd | 1
man/arc4random_buf.3 | 1
man/arc4random_buf.3bsd | 1
man/arc4random_stir.3 | 1
man/arc4random_stir.3bsd | 1
man/arc4random_uniform.3 | 1
man/arc4random_uniform.3bsd | 1
man/be16dec.3bsd | 1
man/be16enc.3bsd | 1
man/be32dec.3bsd | 1
man/be32enc.3bsd | 1
man/be64dec.3bsd | 1
man/be64enc.3bsd | 1
man/bit_alloc.3bsd | 1
man/bit_clear.3bsd | 1
man/bit_decl.3bsd | 1
man/bit_ffc.3bsd | 1
man/bit_ffs.3bsd | 1
man/bit_nclear.3bsd | 1
man/bit_nset.3bsd | 1
man/bit_set.3bsd | 1
man/bit_test.3bsd | 1
man/bitstr_size.3bsd | 1
man/bitstring.3bsd | 5
man/byteorder.3bsd | 86 ++++++++++
man/closefrom.3bsd | 5
man/dehumanize_number.3 | 1
man/dehumanize_number.3bsd | 1
man/errc.3bsd | 178 ++++++++++++++++++++++
man/expand_number.3bsd | 7
man/explicit_bzero.3bsd | 5
man/fgetln.3bsd | 7
man/fgetwln.3bsd | 7
man/flopen.3bsd | 5
man/fmtcheck.3bsd | 5
man/fparseln.3bsd | 5
man/fpurge.3bsd | 82 ++++++++++
man/funopen.3bsd | 5
man/getbsize.3bsd | 5
man/getmode.3 | 1
man/getmode.3bsd | 1
man/getpeereid.3bsd | 5
man/getprogname.3bsd | 7
man/heapsort.3bsd | 7
man/humanize_number.3bsd | 5
man/le16dec.3bsd | 1
man/le16enc.3bsd | 1
man/le32dec.3bsd | 1
man/le32enc.3bsd | 1
man/le64dec.3bsd | 1
man/le64enc.3bsd | 1
man/libbsd.7 | 206 ++++++++++++++++++++++++++
man/mdX.3bsd | 7
man/mergesort.3 | 1
man/mergesort.3bsd | 1
man/nlist.3bsd | 5
man/pidfile.3bsd | 11 -
man/pidfile_close.3bsd | 1
man/pidfile_open.3bsd | 1
man/pidfile_remove.3bsd | 1
man/pidfile_write.3bsd | 1
man/queue.3bsd | 7
man/radixsort.3bsd | 5
man/readpassphrase.3bsd | 5
man/reallocarray.3bsd | 5
man/reallocf.3bsd | 5
man/setmode.3bsd | 5
man/setproctitle.3bsd | 5
man/setproctitle_init.3bsd | 1
man/setprogname.3 | 1
man/setprogname.3bsd | 1
man/sl_add.3bsd | 1
man/sl_delete.3bsd | 1
man/sl_find.3bsd | 1
man/sl_free.3bsd | 1
man/sl_init.3bsd | 1
man/sradixsort.3 | 1
man/sradixsort.3bsd | 1
man/stringlist.3bsd | 5
man/strlcat.3 | 1
man/strlcat.3bsd | 1
man/strlcpy.3bsd | 5
man/strmode.3bsd | 9 -
man/strnstr.3bsd | 5
man/strnunvis.3bsd | 1
man/strnvis.3bsd | 1
man/strtonum.3bsd | 5
man/strunvis.3bsd | 1
man/strvis.3bsd | 1
man/strvisx.3bsd | 1
man/tree.3bsd | 7
man/unvis.3bsd | 9 -
man/vis.3bsd | 13 +
man/wcslcat.3 | 1
man/wcslcat.3bsd | 1
man/wcslcpy.3bsd | 11 -
src/arc4random.c | 16 +-
src/chacha_private.h | 2
src/getentropy_bsd.c | 2
src/hash/helper.c | 4
src/inet_net_pton.c | 8 -
src/merge.c | 27 +--
src/nlist.c | 2
src/radixsort.c | 64 ++++----
src/unvis.c | 7
src/vis.c | 17 +-
test/.gitignore | 1
test/Makefile.am | 1
test/strl.c | 84 ++++++++++
236 files changed, 1312 insertions(+), 232 deletions(-)
New commits:
commit 7a75f550e83d12f80ca6346db677198f45f1d9ff
Author: Guillem Jover <guillem at hadrons.org>
Date: Tue Jun 6 04:56:49 2017 +0200
Update TODO
diff --git a/TODO b/TODO
index 1e96cb5..c2922af 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,11 @@
* 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.
+* 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.
commit f1dd5f2e7179504bc18859f323b806a46d4a5aec
Author: Guillem Jover <guillem at hadrons.org>
Date: Fri Jun 9 05:13:32 2017 +0200
test: Add unit test for strlcpy() and strlcat()
diff --git a/test/.gitignore b/test/.gitignore
index e14f634..1c60a90 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -12,4 +12,5 @@ md5
overlay
proctitle-init
proctitle
+strl
strmode
diff --git a/test/Makefile.am b/test/Makefile.am
index a75c8ff..b7387c4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -41,6 +41,7 @@ check_PROGRAMS = \
fpurge \
md5 \
proctitle-init \
+ strl \
strmode \
$(nil)
diff --git a/test/strl.c b/test/strl.c
new file mode 100644
index 0000000..705f984
--- /dev/null
+++ b/test/strl.c
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2017 Guillem Jover <guillem at 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.
+ */
+
+#include <assert.h>
+#include <string.h>
+
+int
+main(int argc, char **argv)
+{
+ char buf[256];
+
+ /* Test copy to 0-sized buffer . */
+ memset(buf, 0, sizeof(buf));
+ assert(strlcpy(buf, "xyz", 0) == 3);
+ assert(strcmp(buf, "") == 0);
+
+ /* Test normal copy. */
+ memset(buf, 0, sizeof(buf));
+ assert(strlcpy(buf, "xyz", sizeof(buf)) == 3);
+ assert(strcmp(buf, "xyz") == 0);
+
+ /* Test truncated copy. */
+ memset(buf, 0, sizeof(buf));
+ assert(strlcpy(buf, "abcdefabcdef", 10) == 12);
+ assert(strcmp(buf, "abcdefabc") == 0);
+
+ /* Test concat to 0-sized buffer. */
+ memset(buf, 0, sizeof(buf));
+ assert(strlcat(buf, "abc", 0) == 3);
+ assert(strcmp(buf, "") == 0);
+
+ /* Test concat to full buffer. */
+ memset(buf, 0, sizeof(buf));
+ assert(strlcat(buf, "abcde", 6) == 5);
+ assert(strcmp(buf, "abcde") == 0);
+ assert(strlcat(buf, "xyz", 5) == 8);
+ assert(strcmp(buf, "abcde") == 0);
+
+ /* Test normal concat. */
+ memset(buf, 0, sizeof(buf));
+ assert(strlcat(buf, "abc", sizeof(buf)) == 3);
+ assert(strcmp(buf, "abc") == 0);
+ assert(strlcat(buf, "xyz", sizeof(buf)) == 6);
+ assert(strcmp(buf, "abcxyz") == 0);
+
+ /* Test truncated concat. */
+ memset(buf, 0, sizeof(buf));
+ assert(strlcat(buf, "abcabc", 10) == 6);
+ assert(strcmp(buf, "abcabc") == 0);
+ assert(strlcat(buf, "xyzxyz", 10) == 12);
+ assert(strcmp(buf, "abcabcxyz") == 0);
+
+ /* Test truncated concat w/ truncated dst. */
+ memset(buf, 0, sizeof(buf));
+ assert(strlcat(buf, "abcabc", 10) == 6);
+ assert(strcmp(buf, "abcabc") == 0);
+ assert(strlcat(buf, "xyz", 4) == 7);
+ assert(strcmp(buf, "abcabc") == 0);
+
+ return 0;
+}
commit c8a1b08b74dd0682b88ce334fcc795b727014713
Author: Guillem Jover <guillem at hadrons.org>
Date: Fri Jun 9 05:14:24 2017 +0200
build: Match any glibc and musl ABIs on the host_os AS_CASE
Reported-by: Helmut Grohne <helmut at subdivi.de>
diff --git a/configure.ac b/configure.ac
index 5fed4c9..6b3ba2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,14 +45,14 @@ AM_CONDITIONAL([HAVE_LIBTESTU01],
[test "x$ac_cv_lib_testu01_unif01_CreateExternGenBits" = "xyes"])
AS_CASE([$host_os],
- [*-gnu], [
+ [*-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], [
+ [*-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])
],
commit 4fec871c792bb6c01dc9a82dabf21374d59bd689
Author: Guillem Jover <guillem at hadrons.org>
Date: Fri Jun 9 04:52:45 2017 +0200
build: Quote the arguments to AC_CONDITIONAL
diff --git a/configure.ac b/configure.ac
index 0aa2d83..5fed4c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,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
commit 3945693ebe9919715bc3c6c139bac35e4f989a93
Author: Guillem Jover <guillem at hadrons.org>
Date: Fri Jun 9 04:52:45 2017 +0200
build: Move AC_TYPE_UID_T close to the other AC_TYPE_* checks
diff --git a/configure.ac b/configure.ac
index e2686db..0aa2d83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,13 +62,13 @@ AS_CASE([$host_os],
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
commit c253365d65c5cefeb78f20cf10b817c0f5dd910e
Author: Guillem Jover <guillem at hadrons.org>
Date: Fri Jun 9 04:52:45 2017 +0200
build: Move configure.ac comment into actual AC_CASE
diff --git a/configure.ac b/configure.ac
index 5fc132c..e2686db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,9 +44,9 @@ AC_SUBST([TESTU01_LIBS])
AM_CONDITIONAL([HAVE_LIBTESTU01],
[test "x$ac_cv_lib_testu01_unif01_CreateExternGenBits" = "xyes"])
-# In old glibc versions (< 2.17) clock_gettime() is in librt.
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])
commit 8248e5f7a61761ee057ca7e2c4f6ee618c43c5be
Author: Guillem Jover <guillem at hadrons.org>
Date: Wed Jun 7 23:09:40 2017 +0200
build: Use src/strlcpy.c in AC_CONFIG_SRCDIR
The src/fgetln.c file contains a function considered obsolete, use one
that is not.
diff --git a/configure.ac b/configure.ac
index e4d190d..5fc132c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
AC_PREREQ([2.67])
AC_INIT([libbsd], m4_esyscmd([./get-version]), [libbsd at 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])
commit c74ca099160820faaf8a50c46e8f33f48f3c9a18
Author: Guillem Jover <guillem at hadrons.org>
Date: Wed Jun 7 22:46:07 2017 +0200
man: Use .In intead of .Fd macros for includes
diff --git a/man/mdX.3bsd b/man/mdX.3bsd
index 38ed0d3..248b90a 100644
--- a/man/mdX.3bsd
+++ b/man/mdX.3bsd
@@ -27,8 +27,8 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <mdX.h>
+.In sys/types.h
+.In mdX.h
(See
.Xr libbsd 7
for include usage.)
diff --git a/man/readpassphrase.3bsd b/man/readpassphrase.3bsd
index d0237b5..56a2507 100644
--- a/man/readpassphrase.3bsd
+++ b/man/readpassphrase.3bsd
@@ -28,7 +28,7 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.Fd #include <readpassphrase.h>
+.In readpassphrase.h
(See
.Xr libbsd 7
for include usage.)
commit ba9e2a5a9cc097047517257383795a3335faea43
Author: Guillem Jover <guillem at hadrons.org>
Date: Mon Jun 5 06:33:47 2017 +0200
man: Add new libbsd(7) library overview man page
diff --git a/COPYING b/COPYING
index 3b943fd..eedf465 100644
--- a/COPYING
+++ b/COPYING
@@ -3,7 +3,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files:
*
Copyright:
- Copyright © 2004-2006, 2008-2015 Guillem Jover <guillem at hadrons.org>
+ Copyright © 2004-2006, 2008-2017 Guillem Jover <guillem at hadrons.org>
License: BSD-3-clause
Files:
diff --git a/man/arc4random.3bsd b/man/arc4random.3bsd
index 9602ad9..8958099 100644
--- a/man/arc4random.3bsd
+++ b/man/arc4random.3bsd
@@ -44,7 +44,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdlib.h
+.In stdlib.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft uint32_t
.Fn arc4random "void"
.Ft void
diff --git a/man/bitstring.3bsd b/man/bitstring.3bsd
index cd9b5bf..4eb0be3 100644
--- a/man/bitstring.3bsd
+++ b/man/bitstring.3bsd
@@ -45,7 +45,10 @@
.Nm bit_test
.Nd bit-string manipulation macros
.Sh SYNOPSIS
-.In bsd/bitstring.h
+.In bitstring.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft bitstr_t *
.Fn bit_alloc "int nbits"
.Ft void
diff --git a/man/byteorder.3bsd b/man/byteorder.3bsd
index ddb010f..21214ee 100644
--- a/man/byteorder.3bsd
+++ b/man/byteorder.3bsd
@@ -33,6 +33,9 @@
.Nd byte order operations
.Sh SYNOPSIS
.In sys/endian.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft uint16_t
.Fn be16dec "const void *"
.Ft uint32_t
diff --git a/man/closefrom.3bsd b/man/closefrom.3bsd
index 472c985..1af7e67 100644
--- a/man/closefrom.3bsd
+++ b/man/closefrom.3bsd
@@ -35,7 +35,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/unistd.h
+.In unistd.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft void
.Fn closefrom "int lowfd"
.Sh DESCRIPTION
diff --git a/man/errc.3bsd b/man/errc.3bsd
index 1b1579f..6b8b3fd 100644
--- a/man/errc.3bsd
+++ b/man/errc.3bsd
@@ -41,6 +41,9 @@
.Lb libbsd
.Sh SYNOPSIS
.In err.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft void
.Fn errc "int status" "int code" "const char *fmt" "..."
.Ft void
diff --git a/man/expand_number.3bsd b/man/expand_number.3bsd
index b97f5e5..cd36ab9 100644
--- a/man/expand_number.3bsd
+++ b/man/expand_number.3bsd
@@ -35,7 +35,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/libutil.h
+.In libutil.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft int
.Fo expand_number
.Fa "const char *buf" "uint64_t *num"
diff --git a/man/explicit_bzero.3bsd b/man/explicit_bzero.3bsd
index 2bed62a..bfe583a 100644
--- a/man/explicit_bzero.3bsd
+++ b/man/explicit_bzero.3bsd
@@ -39,7 +39,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/string.h
+.In string.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft void
.Fn explicit_bzero "void *buf" "size_t len"
.Sh DESCRIPTION
diff --git a/man/fgetln.3bsd b/man/fgetln.3bsd
index cc7b735..992e245 100644
--- a/man/fgetln.3bsd
+++ b/man/fgetln.3bsd
@@ -38,7 +38,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdio.h
+.In stdio.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft char *
.Fn fgetln "FILE *stream" "size_t *len"
.Sh DESCRIPTION
diff --git a/man/fgetwln.3bsd b/man/fgetwln.3bsd
index 7557d52..5c05388 100644
--- a/man/fgetwln.3bsd
+++ b/man/fgetwln.3bsd
@@ -39,7 +39,10 @@
.Lb libbsd
.Sh SYNOPSIS
.In stdio.h
-.In bsd/wchar.h
+.In wchar.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft wchar_t *
.Fn fgetwln "FILE * restrict stream" "size_t * restrict len"
.Sh DESCRIPTION
diff --git a/man/flopen.3bsd b/man/flopen.3bsd
index f430dc0..4bb23b2 100644
--- a/man/flopen.3bsd
+++ b/man/flopen.3bsd
@@ -36,7 +36,10 @@
.Lb libbsd
.Sh SYNOPSIS
.In sys/fcntl.h
-.In bsd/libutil.h
+.In libutil.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft int
.Fn flopen "const char *path" "int flags"
.Ft int
diff --git a/man/fmtcheck.3bsd b/man/fmtcheck.3bsd
index 7bf5d39..0a1797f 100644
--- a/man/fmtcheck.3bsd
+++ b/man/fmtcheck.3bsd
@@ -37,7 +37,10 @@ format string
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdio.h
+.In stdio.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft const char *
.Fn fmtcheck "const char *fmt_suspect" "const char *fmt_default"
.Sh DESCRIPTION
diff --git a/man/fparseln.3bsd b/man/fparseln.3bsd
index 9170417..a3fd325 100644
--- a/man/fparseln.3bsd
+++ b/man/fparseln.3bsd
@@ -32,7 +32,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdio.h
+.In stdio.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft "char *"
.Fo "fparseln"
.Fa "FILE *stream" "size_t *len" "size_t *lineno"
diff --git a/man/fpurge.3bsd b/man/fpurge.3bsd
index d4d0b89..96a4017 100644
--- a/man/fpurge.3bsd
+++ b/man/fpurge.3bsd
@@ -42,6 +42,9 @@
.Lb libbsd
.Sh SYNOPSIS
.In stdio.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft int
.Fn fpurge "FILE *stream"
.Sh DESCRIPTION
diff --git a/man/funopen.3bsd b/man/funopen.3bsd
index 123c124..7c867b6 100644
--- a/man/funopen.3bsd
+++ b/man/funopen.3bsd
@@ -42,7 +42,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdio.h
+.In stdio.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft FILE *
.Fn funopen "const void *cookie" "int (*readfn)(void *, char *, int)" "int (*writefn)(void *, const char *, int)" "off_t (*seekfn)(void *, off_t, int)" "int (*closefn)(void *)"
.Ft FILE *
diff --git a/man/getbsize.3bsd b/man/getbsize.3bsd
index 38ec41a..817711e 100644
--- a/man/getbsize.3bsd
+++ b/man/getbsize.3bsd
@@ -38,7 +38,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdlib.h
+.In stdlib.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft char *
.Fn getbsize "int *headerlenp" "long *blocksizep"
.Sh DESCRIPTION
diff --git a/man/getpeereid.3bsd b/man/getpeereid.3bsd
index 84c776e..9292ed3 100644
--- a/man/getpeereid.3bsd
+++ b/man/getpeereid.3bsd
@@ -36,7 +36,10 @@
.Lb libbsd
.Sh SYNOPSIS
.In sys/types.h
-.In bsd/unistd.h
+.In unistd.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft int
.Fn getpeereid "int s" "uid_t *euid" "gid_t *egid"
.Sh DESCRIPTION
diff --git a/man/getprogname.3bsd b/man/getprogname.3bsd
index fe32efb..d29064f 100644
--- a/man/getprogname.3bsd
+++ b/man/getprogname.3bsd
@@ -42,7 +42,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdlib.h
+.In stdlib.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft const char *
.Fn getprogname "void"
.Ft void
diff --git a/man/heapsort.3bsd b/man/heapsort.3bsd
index eefe157..48b4d8f 100644
--- a/man/heapsort.3bsd
+++ b/man/heapsort.3bsd
@@ -42,7 +42,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdlib.h
+.In stdlib.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft int
.Fo heapsort
.Fa "void *base"
diff --git a/man/humanize_number.3bsd b/man/humanize_number.3bsd
index e0ffdf0..5d5472a 100644
--- a/man/humanize_number.3bsd
+++ b/man/humanize_number.3bsd
@@ -38,7 +38,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdlib.h
+.In stdlib.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft int
.Fn dehumanize_number "const char *str" "int64_t *result"
.Ft int
diff --git a/man/libbsd.7 b/man/libbsd.7
new file mode 100644
index 0000000..216bc01
--- /dev/null
+++ b/man/libbsd.7
@@ -0,0 +1,206 @@
+.\" libbsd man page
+.\"
+.\" Copyright © 2017 Gullem Jover <guillem at 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.
+.\"
+.Dd May 31 2017
+.Dt LIBBSD 7
+.Os
+.Sh NAME
+.Nm libbsd
+.Nd utility functions from BSD systems
+.Sh DESCRIPTION
+The
+.Nm libbsd
+library provides a set if compatibility macros and functions commonly found
+on BSD-based systems.
+Its purpose is to make those available on non-BSD based systems to ease
+portability.
+.Pp
+The library can be used in an overlay mode, which is the preferred way, so
+that the code is portable and requires no modification to the original BSD
+code.
+This can be done easily with the
+.Xr pkg-config 3
+library named
+.Pa libbsd-overlay .
+Or by adding the system-specific include directory with the
+.Pa bsd/
+suffix to the list of system include paths.
+With
+.Nm gcc
+this could be
+.Ar -isystem ${includedir}/bsd .
+In addition the
+.Dv LIBBSD_OVERLAY
+pre-processor variable needs to be defined.
+The includes in this case should be the usual system ones, such as
+.In unistd.h .
+.Pp
+The other way to use the library is to use the namespaced headers,
+this is less portable as it makes using
+.Nm libbsd
+mandatory and it will not work on BSD-based systems, and requires
+modifying original BSD code.
+This can be done with the
+.Xr pkg-config 3
+library named
+.Pa libbsd .
+The includes in this case should be namespaced with
+.Pa bsd/ ,
+such as
+.In bsd/unistd.h .
+.Pp
+The package also provides a
+.Pa bsd-ctor
+static library that can be used to inject automatic constructors into a
+program so that the
+.Fn setproctitle
+function gets invoked automatically at startup time.
+This can be done with the
+.Xr pkg-config 3
+library named
+.Pa libbsd-ctor .
+.Sh HEADERS
+The following are the headers provided by
+.Nm libbsd ,
+that extend the standard system headers.
+They can work in normal or overlay modes, for the former they need to
+be prefixed with
+.Pa bsd/ .
+.Pp
+.Bl -tag -width 4m -compact
+.It In bitstring.h
+.It In err.h
+.It In getopt.h
+.It In libutil.h
+.It In md5.h
+.It In netinet/ip_icmp.h
+.It In nlist.h
+.It In readpassphrase.h
+.It In stdio.h
+.It In stdlib.h
+.It In string.h
+.It In stringlist.h
+.It In sys/bitstring.h
+.It In sys/cdefs.h
+.It In sys/endian.h
+.It In sys/poll.h
+.It In sys/queue.h
+.It In sys/tree.h
+.It In timeconv.h
+.It In unistd.h
+.It In vis.h
+.It In wchar.h
+.El
+.Pp
+The following is a
+.Pa libbsd
+specific convenience header, that includes some of the extended headers.
+It only works in non-overlay mode.
+.Pp
+.Bl -tag -width 4m -compact
+.It In bsd/bsd.h
+.El
+.Sh DEPRECATED
+Some functions have been deprecated, they will emit warnings at compile time
+and possibly while being linked at run-time.
+This might be due to the functions not being portable at all to other
+systems, making the package not buildable there; not portable in a correct
+or non-buggy way; or because there are better more portable replacements now.
+.Pp
+This is the list of currently deprecated macros and functions:
+.Bl -tag -width 4m
+.It Fn fgetln
+Unportable, requires assistance from the stdio layer.
+An implementation has to choose between leaking buffers or being reentrant
+for a limited amount of streams (this implementation chose the latter with
+a limit of 32).
+Use
+.Fn getline 3
+instead, which is available in many systems and required by
+.St -p1003.1-2008 .
+.It Fn funopen
+Unportable, requires assistance from the stdio layer or some hook framework.
+On GNU systems the
+.Fn fopencookie
+function can be used.
+Otherwise the code needs to be prepared for neither of these functions being
+available.
+.El
+.Pp
+In addition, the MD5 set of digest funtions are now provided by the
+.Nm libmd
+companion library, so it is advised to use that instead, as the ones
+provided in
+.Nm libbsd
+might disappear on the next SONAME bump.
+.Sh SEE ALSO
+.Xr arc4random 3bsd ,
+.Xr bitstring 3bsd ,
+.Xr byteorder 3bsd ,
+.Xr closefrom 3bsd ,
+.Xr errc 3bsd ,
+.Xr expand_number 3bsd ,
+.Xr explicit_bzero 3bsd ,
+.Xr fgetln 3bsd ,
+.Xr fgetwln 3bsd ,
+.Xr flopen 3bsd ,
+.Xr fmtcheck 3bsd ,
+.Xr fparseln 3bsd ,
+.Xr fpurge 3bsd ,
+.Xr funopen 3bsd ,
+.Xr getbsize 3bsd ,
+.Xr getpeereid 3bsd ,
+.Xr getprogname 3bsd ,
+.Xr heapsort 3bsd ,
+.Xr humanize_number 3bsd ,
+.Xr md5 3bsd ,
+.Xr nlist 3bsd ,
+.Xr pidfile 3bsd ,
+.Xr queue 3bsd ,
+.Xr radixsort 3bsd ,
+.Xr readpassphrase 3bsd ,
+.Xr reallocarray 3bsd ,
+.Xr reallocf 3bsd ,
+.Xr setmode 3bsd ,
+.Xr setproctitle 3bsd ,
+.Xr stringlist 3bsd ,
+.Xr strlcpy 3bsd ,
+.Xr strmode 3bsd ,
+.Xr strnstr 3bsd ,
+.Xr strtonum 3bsd ,
+.Xr tree 3bsd ,
+.Xr unvis 3bsd ,
+.Xr vis 3bsd ,
+.Xr wcslcpy 3bsd .
+.Sh HISTORY
+The
+.Nm libbsd
+project started in the Debian GNU/kFreeBSD port as a way to ease porting
+code from FreeBSD to the GNU-based system.
+Pretty early on it was generalized and a project created on FreeDesktop.org
+for other distributions and projects to use.
+.Pp
+It is now distributed as part of most non-BSD distributions.
diff --git a/man/mdX.3bsd b/man/mdX.3bsd
index 095a269..38ed0d3 100644
--- a/man/mdX.3bsd
+++ b/man/mdX.3bsd
@@ -28,7 +28,10 @@
.Lb libbsd
.Sh SYNOPSIS
.Fd #include <sys/types.h>
-.Fd #include <bsd/mdX.h>
+.Fd #include <mdX.h>
+(See
+.Xr libbsd 7
+for include usage.)
.Ft void
.Fn MDXInit "MDX_CTX *context"
.Ft void
diff --git a/man/nlist.3bsd b/man/nlist.3bsd
index 25624c7..aa6e1ea 100644
--- a/man/nlist.3bsd
+++ b/man/nlist.3bsd
@@ -38,7 +38,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/nlist.h
+.In nlist.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft int
.Fn nlist "const char *filename" "struct nlist *nl"
.Sh DESCRIPTION
diff --git a/man/pidfile.3bsd b/man/pidfile.3bsd
index 91596dc..2eede98 100644
--- a/man/pidfile.3bsd
+++ b/man/pidfile.3bsd
@@ -37,7 +37,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/libutil.h
+.In libutil.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft "struct pidfh *"
.Fn pidfile_open "const char *path" "mode_t mode" "pid_t *pidptr"
.Ft int
diff --git a/man/queue.3bsd b/man/queue.3bsd
index 7a5ed95..272f253 100644
--- a/man/queue.3bsd
+++ b/man/queue.3bsd
@@ -113,7 +113,10 @@
.Nd implementations of singly-linked lists, singly-linked tail queues,
lists and tail queues
.Sh SYNOPSIS
-.In bsd/sys/queue.h
+.In sys/queue.h
+(See
+.Xr libbsd 7
+for include usage.)
.\"
.Fn SLIST_EMPTY "SLIST_HEAD *head"
.Fn SLIST_ENTRY "TYPE"
diff --git a/man/radixsort.3bsd b/man/radixsort.3bsd
index 069e401..cb1222b 100644
--- a/man/radixsort.3bsd
+++ b/man/radixsort.3bsd
@@ -41,7 +41,10 @@
.Lb libbsd
.Sh SYNOPSIS
.In limits.h
-.In bsd/stdlib.h
+.In stdlib.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft int
.Fn radixsort "const unsigned char **base" "int nmemb" "const unsigned char *table" "unsigned endbyte"
.Ft int
diff --git a/man/readpassphrase.3bsd b/man/readpassphrase.3bsd
index 967f8d3..d0237b5 100644
--- a/man/readpassphrase.3bsd
+++ b/man/readpassphrase.3bsd
@@ -28,7 +28,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.Fd #include <bsd/readpassphrase.h>
+.Fd #include <readpassphrase.h>
+(See
+.Xr libbsd 7
+for include usage.)
.Ft char *
.Fn readpassphrase "const char *prompt" "char *buf" "size_t bufsiz" "int flags"
.Sh DESCRIPTION
diff --git a/man/reallocarray.3bsd b/man/reallocarray.3bsd
index 71a047e..fb96d1c 100644
--- a/man/reallocarray.3bsd
+++ b/man/reallocarray.3bsd
@@ -42,7 +42,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdlib.h
+.In stdlib.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft void *
.Fn reallocarray "void *ptr" "size_t nmemb" "size_t size"
.Sh DESCRIPTION
diff --git a/man/reallocf.3bsd b/man/reallocf.3bsd
index 99152b6..764ea34 100644
--- a/man/reallocf.3bsd
+++ b/man/reallocf.3bsd
@@ -42,7 +42,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stdlib.h
+.In stdlib.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft void *
.Fn reallocf "void *ptr" "size_t size"
.Sh DESCRIPTION
diff --git a/man/setmode.3bsd b/man/setmode.3bsd
index 5073d43..4f425c3 100644
--- a/man/setmode.3bsd
+++ b/man/setmode.3bsd
@@ -41,7 +41,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/unistd.h
+.In unistd.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft void *
.Fn setmode "const char *mode_str"
.Ft mode_t
diff --git a/man/setproctitle.3bsd b/man/setproctitle.3bsd
index dd5df59..304e01f 100644
--- a/man/setproctitle.3bsd
+++ b/man/setproctitle.3bsd
@@ -31,7 +31,10 @@
.Lb libbsd
.Sh SYNOPSIS
.In sys/types.h
-.In bsd/unistd.h
+.In unistd.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft void
.Fn setproctitle_init "int argc" "char *argv[]" "char *envp[]"
.Ft void
diff --git a/man/stringlist.3bsd b/man/stringlist.3bsd
index c62e444..7c5833a 100644
--- a/man/stringlist.3bsd
+++ b/man/stringlist.3bsd
@@ -41,7 +41,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/stringlist.h
+.In stringlist.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft StringList *
.Fn sl_init "void"
.Ft int
diff --git a/man/strlcpy.3bsd b/man/strlcpy.3bsd
index bf14b4f..4a16bc7 100644
--- a/man/strlcpy.3bsd
+++ b/man/strlcpy.3bsd
@@ -25,7 +25,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/string.h
+.In string.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft size_t
.Fn strlcpy "char *dst" "const char *src" "size_t size"
.Ft size_t
diff --git a/man/strmode.3bsd b/man/strmode.3bsd
index b505537..5796fca 100644
--- a/man/strmode.3bsd
+++ b/man/strmode.3bsd
@@ -38,7 +38,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/string.h
+.In string.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft void
.Fn strmode "mode_t mode" "char *bp"
.Sh DESCRIPTION
diff --git a/man/strnstr.3bsd b/man/strnstr.3bsd
index 28bb0f8..19cf4cc 100644
--- a/man/strnstr.3bsd
+++ b/man/strnstr.3bsd
@@ -43,7 +43,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/string.h
+.In string.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft char *
.Fn strnstr "const char *big" "const char *little" "size_t len"
.Sh DESCRIPTION
diff --git a/man/strtonum.3bsd b/man/strtonum.3bsd
index f159a23..d279ff1 100644
--- a/man/strtonum.3bsd
+++ b/man/strtonum.3bsd
@@ -26,7 +26,10 @@
.Lb libbsd
.Sh SYNOPSIS
.In limits.h
-.In bsd/stdlib.h
+.In stdlib.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft long long
.Fo strtonum
.Fa "const char *nptr"
diff --git a/man/tree.3bsd b/man/tree.3bsd
index 643b0ee..0c30d67 100644
--- a/man/tree.3bsd
+++ b/man/tree.3bsd
@@ -76,7 +76,10 @@
.Nm RB_REMOVE
.Nd implementations of splay and red-black trees
.Sh SYNOPSIS
-.In bsd/sys/tree.h
+.In sys/tree.h
+(See
+.Xr libbsd 7
+for include usage.)
.Fn SPLAY_PROTOTYPE NAME TYPE FIELD CMP
.Fn SPLAY_GENERATE NAME TYPE FIELD CMP
.Fn SPLAY_ENTRY TYPE
diff --git a/man/unvis.3bsd b/man/unvis.3bsd
index 5ff42fe..58f88d9 100644
--- a/man/unvis.3bsd
+++ b/man/unvis.3bsd
@@ -39,7 +39,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/vis.h
+.In vis.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft int
.Fn unvis "char *cp" "char c" "int *astate" "int flag"
.Ft int
diff --git a/man/vis.3bsd b/man/vis.3bsd
index cf2cd98..b77266d 100644
--- a/man/vis.3bsd
+++ b/man/vis.3bsd
@@ -41,7 +41,10 @@
.Lb libbsd
.Sh SYNOPSIS
.In stdlib.h
-.In bsd/vis.h
+.In vis.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft char *
.Fn vis "char *dst" "int c" "int flag" "int nextc"
.Ft int
diff --git a/man/wcslcpy.3bsd b/man/wcslcpy.3bsd
index 0d6011b..5c60d95 100644
--- a/man/wcslcpy.3bsd
+++ b/man/wcslcpy.3bsd
@@ -46,7 +46,10 @@
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
.Lb libbsd
.Sh SYNOPSIS
-.In bsd/wchar.h
+.In wchar.h
+(See
+.Xr libbsd 7
+for include usage.)
.Ft size_t
.Fn wcslcat "wchar_t *s1" "const wchar_t *s2" "size_t n"
.Ft size_t
commit 6a5a515820052986e28c53f794ab4f54c2736cb6
Author: Guillem Jover <guillem at hadrons.org>
Date: Wed Jun 7 05:00:34 2017 +0200
man: Add missing man pages
This adds man pages for byteorder(3), errc(3) and fpurge(3), including
all their aliases.
diff --git a/COPYING b/COPYING
index 2e42383..3b943fd 100644
--- a/COPYING
+++ b/COPYING
@@ -93,9 +93,11 @@ Files:
include/bsd/timeconv.h
include/bsd/vis.h
man/bitstring.3bsd
+ man/errc.3bsd
man/explicit_bzero.3bsd
man/fgetln.3bsd
man/fgetwln.3bsd
+ man/fpurge.3bsd
man/funopen.3bsd
man/getbsize.3bsd
man/heapsort.3bsd
@@ -278,8 +280,9 @@ License: BSD-2-clause-NetBSD
Files:
include/bsd/sys/endian.h
- man/expand_number.3bsd
+ man/byteorder.3bsd
man/closefrom.3bsd
+ man/expand_number.3bsd
man/flopen.3bsd
man/getpeereid.3bsd
man/pidfile.3bsd
@@ -302,6 +305,9 @@ Copyright:
Copyright © 2002 Thomas Moestl <tmm at FreeBSD.org>
All rights reserved.
.
+ Copyright © 2002 Mike Barcroft <mike at FreeBSD.org>
+ All rights reserved.
+ .
Copyright © 2005 Pawel Jakub Dawidek <pjd at FreeBSD.org>
All rights reserved.
.
diff --git a/man/Makefile.am b/man/Makefile.am
index b531dea..19c5c78 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -137,6 +137,12 @@ dist_man_MANS = \
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 \
@@ -148,8 +154,10 @@ dist_man_MANS = \
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 \
@@ -157,6 +165,7 @@ dist_man_MANS = \
flopen.3bsd \
fmtcheck.3bsd \
fparseln.3bsd \
+ fpurge.3bsd \
funopen.3bsd \
getbsize.3bsd \
getmode.3bsd \
@@ -164,6 +173,12 @@ dist_man_MANS = \
getprogname.3bsd \
heapsort.3bsd \
humanize_number.3bsd \
+ le16dec.3bsd \
+ le16enc.3bsd \
+ le32dec.3bsd \
+ le32enc.3bsd \
+ le64dec.3bsd \
+ le64enc.3bsd \
md5.3bsd \
mergesort.3bsd \
nlist.3bsd \
diff --git a/man/be16dec.3bsd b/man/be16dec.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/be16dec.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/be16enc.3bsd b/man/be16enc.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/be16enc.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/be32dec.3bsd b/man/be32dec.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/be32dec.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/be32enc.3bsd b/man/be32enc.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/be32enc.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/be64dec.3bsd b/man/be64dec.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/be64dec.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/be64enc.3bsd b/man/be64enc.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/be64enc.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/byteorder.3bsd b/man/byteorder.3bsd
new file mode 100644
index 0000000..ddb010f
--- /dev/null
+++ b/man/byteorder.3bsd
@@ -0,0 +1,83 @@
+.\" Copyright (c) 2002 Mike Barcroft <mike at 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. Redistributions in binary form must 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd April 29, 2002
+.Dt BYTEORDER 3
+.Os
+.Sh NAME
+.Nm be16enc , be16dec , be32enc , be32dec , be64enc , be64dec ,
+.Nm le16enc , le16dec , le32enc , le32dec , le64enc , le64dec
+.Nd byte order operations
+.Sh SYNOPSIS
+.In sys/endian.h
+.Ft uint16_t
+.Fn be16dec "const void *"
+.Ft uint32_t
+.Fn be32dec "const void *"
+.Ft uint64_t
+.Fn be64dec "const void *"
+.Ft uint16_t
+.Fn le16dec "const void *"
+.Ft uint32_t
+.Fn le32dec "const void *"
+.Ft uint64_t
+.Fn le64dec "const void *"
+.Ft void
+.Fn be16enc "void *" uint16_t
+.Ft void
+.Fn be32enc "void *" uint32_t
+.Ft void
+.Fn be64enc "void *" uint64_t
+.Ft void
+.Fn le16enc "void *" uint16_t
+.Ft void
+.Fn le32enc "void *" uint32_t
+.Ft void
+.Fn le64enc "void *" uint64_t
+.Sh DESCRIPTION
+.Pp
+The
+.Fn be16enc ,
+.Fn be16dec ,
+.Fn be32enc ,
+.Fn be32dec ,
+.Fn be64enc ,
+.Fn be64dec ,
+.Fn le16enc ,
+.Fn le16dec ,
+.Fn le32enc ,
+.Fn le32dec ,
+.Fn le64enc ,
+and
+.Fn le64dec
+functions encode and decode integers to/from byte strings on any alignment
+in big/little endian format.
+.Sh SEE ALSO
+.Xr byteorder 3
+.Sh HISTORY
+.Pp
+The encode/decode functions first appeared in
+.Fx 5.1 .
diff --git a/man/errc.3bsd b/man/errc.3bsd
new file mode 100644
index 0000000..1b1579f
--- /dev/null
+++ b/man/errc.3bsd
@@ -0,0 +1,175 @@
+.\" $OpenBSD: err.3,v 1.20 2014/04/23 16:26:33 jmc Exp $
+.\"
+.\" Copyright (c) 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 23 2014 $
+.Dt ERRC 3
+.Os
+.Sh NAME
+.Nm errc ,
+.Nm verrc ,
+.Nm warnc ,
+.Nm vwarnc
+.Nd formatted error messages
+.Sh LIBRARY
+.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
+.Lb libbsd
+.Sh SYNOPSIS
+.In err.h
+.Ft void
+.Fn errc "int status" "int code" "const char *fmt" "..."
+.Ft void
+.Fn verrc "int status" "int code" "const char *fmt" "va_list args"
+.Ft void
+.Fn warnc "int code" "const char *fmt" "..."
+.Ft void
+.Fn vwarnc "int code" "const char *fmt" "va_list args"
+.Sh DESCRIPTION
+The
+.Fn err
+and
+.Fn warn
+family of functions display a formatted error message on the standard
+error output.
+In all cases, the last component of the program name, followed by
+a colon
+.Pq Sq \&:
+character and a space, are output.
+The text that follows depends on the function being called.
+The
+.Fa fmt
+specification (and associated arguments) may be any format allowed by
+.Xr printf 3
+or
+.Dv NULL .
+If the
+.Fa fmt
+argument is not
+.Dv NULL ,
+the formatted error message is output.
+.Pp
+The functions all output an error message string affiliated with
+an error value (see
+.Xr strerror 3 ) ,
+preceded by a colon character and a space if
+.Fa fmt
+is not
+.Dv NULL .
+That is, the output is as follows:
+.Bd -literal -offset indent
+progname: fmt: error message string
+.Ed
+.Pp
+if
+.Fa fmt
+is not
+.Dv NULL ,
+or:
+.Bd -literal -offset indent
+progname: error message string
+.Ed
+.Pp
+if it is.
+.Pp
+The argument
+.Fa code
+is used as the error value instead of the current value of the global variable
+.Va errno .
+.Pp
+In all cases, the output is followed by a newline character.
+.Pp
+The
+.Fn errc ,
+and
+.Fn verrc
+functions do not return, but exit with the value of the argument
+.Fa status .
+.Sh EXAMPLES
+Display the current
+.Va errno
+information string and exit:
+.Bd -literal -offset indent
+if ((p = malloc(size)) == NULL)
+ err(1, NULL);
+if ((fd = open(file_name, O_RDONLY, 0)) == -1)
+ err(1, "%s", file_name);
+.Ed
+.Pp
+Display an error message and exit:
+.Bd -literal -offset indent
+if (tm.tm_hour < START_TIME)
+ errx(1, "too early, wait until %s", start_time_string);
+.Ed
+.Pp
+Warn of an error:
+.Bd -literal -offset indent
+if ((fd = open(raw_device, O_RDONLY, 0)) == -1)
+ warnx("%s: %s: trying the block device",
+ raw_device, strerror(errno));
+if ((fd = open(block_device, O_RDONLY, 0)) == -1)
+ err(1, "%s", block_device);
+.Ed
+.Sh SEE ALSO
+.Xr err 3
+.Xr exit 3 ,
+.Xr perror 3 ,
+.Xr printf 3 ,
+.Xr strerror 3
+.Sh HISTORY
+The functions
+.Fn errc ,
+.Fn verrc ,
+.Fn warnc ,
+and
+.Fn vwarnc
+first appeared in
+.Fx 3.0 ,
+.Nx 7.0
+and
+.Ox 5.6 .
+.Sh CAVEATS
+It is important never to pass a string with user-supplied data as a
+format without using
+.Ql %s .
+An attacker can put format specifiers in the string to mangle the stack,
+leading to a possible security hole.
+This holds true even if the string has been built
+.Dq by hand
+using a function like
+.Fn snprintf ,
+as the resulting string may still contain user-supplied conversion specifiers
+for later interpolation by the
+.Fn err
+and
+.Fn warn
+family of functions.
+.Pp
+Always be sure to use the proper secure idiom:
+.Bd -literal -offset indent
+errc(1, 0, "%s", string);
+.Ed
diff --git a/man/fpurge.3bsd b/man/fpurge.3bsd
new file mode 100644
index 0000000..d4d0b89
--- /dev/null
+++ b/man/fpurge.3bsd
@@ -0,0 +1,79 @@
+.\" $OpenBSD: fflush.3,v 1.12 2015/11/04 21:30:13 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 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 4 2015 $
+.Dt FPURGE 3
+.Os
+.Sh NAME
+.Nm fpurge
+.Nd flush a stream
+.Sh LIBRARY
+.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
+.Lb libbsd
+.Sh SYNOPSIS
+.In stdio.h
+.Ft int
+.Fn fpurge "FILE *stream"
+.Sh DESCRIPTION
+The function
+.Fn fpurge
+erases any input or output buffered in the given
+.Fa stream .
+For output streams this discards any unwritten output.
+For input streams this discards any input read from the underlying object
+but not yet obtained via
+.Xr getc 3 ;
+this includes any text pushed back via
+.Xr ungetc 3 .
+.Sh RETURN VALUES
+Upon successful completion 0 is returned.
+Otherwise,
+.Dv EOF
+is returned and the global variable
+.Va errno
+is set to indicate the error.
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er EBADF
+.Fa stream
+is not an open stream.
+.El
+.Sh SEE ALSO
+.Xr fclose 3 ,
+.Xr fopen 3 ,
+.Xr setvbuf 3
+.Sh HISTORY
+The
+.Fn fpurge
+function first appeared in
+.Bx 4.4 Lite .
diff --git a/man/le16dec.3bsd b/man/le16dec.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/le16dec.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/le16enc.3bsd b/man/le16enc.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/le16enc.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/le32dec.3bsd b/man/le32dec.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/le32dec.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/le32enc.3bsd b/man/le32enc.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/le32enc.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/le64dec.3bsd b/man/le64dec.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/le64dec.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
diff --git a/man/le64enc.3bsd b/man/le64enc.3bsd
new file mode 100644
index 0000000..bce31af
--- /dev/null
+++ b/man/le64enc.3bsd
@@ -0,0 +1 @@
+.so man3/byteorder.3bsd
commit 934b7a0ccbdc60313102f153eadc2f46853a505b
Author: Guillem Jover <guillem at hadrons.org>
Date: Mon Jun 5 06:32:36 2017 +0200
man: Add missing aliases
diff --git a/man/LIST_EMPTY.3bsd b/man/LIST_EMPTY.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_EMPTY.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_ENTRY.3bsd b/man/LIST_ENTRY.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_ENTRY.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_FIRST.3bsd b/man/LIST_FIRST.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_FIRST.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_FOREACH.3bsd b/man/LIST_FOREACH.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_FOREACH.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_FOREACH_FROM.3bsd b/man/LIST_FOREACH_FROM.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_FOREACH_FROM.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_FOREACH_FROM_SAFE.3bsd b/man/LIST_FOREACH_FROM_SAFE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_FOREACH_FROM_SAFE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_FOREACH_SAFE.3bsd b/man/LIST_FOREACH_SAFE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_FOREACH_SAFE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_HEAD.3bsd b/man/LIST_HEAD.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_HEAD_INITIALIZER.3bsd b/man/LIST_HEAD_INITIALIZER.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_HEAD_INITIALIZER.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_INIT.3bsd b/man/LIST_INIT.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_INIT.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_INSERT_AFTER.3bsd b/man/LIST_INSERT_AFTER.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_INSERT_AFTER.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_INSERT_BEFORE.3bsd b/man/LIST_INSERT_BEFORE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_INSERT_BEFORE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_INSERT_HEAD.3bsd b/man/LIST_INSERT_HEAD.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_INSERT_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_NEXT.3bsd b/man/LIST_NEXT.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_NEXT.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_PREV.3bsd b/man/LIST_PREV.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_PREV.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_REMOVE.3bsd b/man/LIST_REMOVE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_REMOVE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/LIST_SWAP.3bsd b/man/LIST_SWAP.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/LIST_SWAP.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/Makefile.am b/man/Makefile.am
index 6fb3f79..b531dea 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -14,11 +14,139 @@ md5.3bsd: $(srcdir)/mdX.3bsd
$(AM_V_GEN) sed $(SED_MD5_SUBST) $< > $@
dist_man_MANS = \
+ 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 \
arc4random.3bsd \
arc4random_addrandom.3bsd \
arc4random_buf.3bsd \
arc4random_stir.3bsd \
arc4random_uniform.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 \
closefrom.3bsd \
dehumanize_number.3bsd \
@@ -40,6 +168,10 @@ dist_man_MANS = \
mergesort.3bsd \
nlist.3bsd \
pidfile.3bsd \
+ pidfile_close.3bsd \
+ pidfile_open.3bsd \
+ pidfile_remove.3bsd \
+ pidfile_write.3bsd \
queue.3bsd \
radixsort.3bsd \
readpassphrase.3bsd \
@@ -47,14 +179,25 @@ dist_man_MANS = \
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 \
- strnstr.3bsd \
strmode.3bsd \
+ strnstr.3bsd \
+ strnunvis.3bsd \
+ strnvis.3bsd \
strtonum.3bsd \
+ strunvis.3bsd \
+ strvis.3bsd \
+ strvisx.3bsd \
tree.3bsd \
unvis.3bsd \
vis.3bsd \
diff --git a/man/RB_EMPTY.3bsd b/man/RB_EMPTY.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_EMPTY.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_ENTRY.3bsd b/man/RB_ENTRY.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_ENTRY.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_FIND.3bsd b/man/RB_FIND.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_FIND.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_FOREACH.3bsd b/man/RB_FOREACH.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_FOREACH.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_FOREACH_REVERSE.3bsd b/man/RB_FOREACH_REVERSE.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_FOREACH_REVERSE.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_GENERATE.3bsd b/man/RB_GENERATE.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_GENERATE.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_GENERATE_STATIC.3bsd b/man/RB_GENERATE_STATIC.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_GENERATE_STATIC.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_HEAD.3bsd b/man/RB_HEAD.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_INIT.3bsd b/man/RB_INIT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_INIT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_INITIALIZER.3bsd b/man/RB_INITIALIZER.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_INITIALIZER.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_INSERT.3bsd b/man/RB_INSERT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_INSERT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_LEFT.3bsd b/man/RB_LEFT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_LEFT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_MAX.3bsd b/man/RB_MAX.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_MAX.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_MIN.3bsd b/man/RB_MIN.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_MIN.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_NEXT.3bsd b/man/RB_NEXT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_NEXT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_NFIND.3bsd b/man/RB_NFIND.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_NFIND.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_PARENT.3bsd b/man/RB_PARENT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_PARENT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_PREV.3bsd b/man/RB_PREV.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_PREV.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_PROTOTYPE.3bsd b/man/RB_PROTOTYPE.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_PROTOTYPE.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_PROTOTYPE_STATIC.3bsd b/man/RB_PROTOTYPE_STATIC.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_PROTOTYPE_STATIC.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_REMOVE.3bsd b/man/RB_REMOVE.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_REMOVE.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_RIGHT.3bsd b/man/RB_RIGHT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_RIGHT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/RB_ROOT.3bsd b/man/RB_ROOT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/RB_ROOT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SLIST_EMPTY.3bsd b/man/SLIST_EMPTY.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_EMPTY.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_ENTRY.3bsd b/man/SLIST_ENTRY.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_ENTRY.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_FIRST.3bsd b/man/SLIST_FIRST.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_FIRST.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_FOREACH.3bsd b/man/SLIST_FOREACH.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_FOREACH.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_FOREACH_FROM.3bsd b/man/SLIST_FOREACH_FROM.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_FOREACH_FROM.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_FOREACH_FROM_SAFE.3bsd b/man/SLIST_FOREACH_FROM_SAFE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_FOREACH_FROM_SAFE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_FOREACH_SAFE.3bsd b/man/SLIST_FOREACH_SAFE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_FOREACH_SAFE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_HEAD.3bsd b/man/SLIST_HEAD.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_HEAD_INITIALIZER.3bsd b/man/SLIST_HEAD_INITIALIZER.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_HEAD_INITIALIZER.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_INIT.3bsd b/man/SLIST_INIT.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_INIT.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_INSERT_AFTER.3bsd b/man/SLIST_INSERT_AFTER.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_INSERT_AFTER.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_INSERT_HEAD.3bsd b/man/SLIST_INSERT_HEAD.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_INSERT_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_NEXT.3bsd b/man/SLIST_NEXT.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_NEXT.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_REMOVE.3bsd b/man/SLIST_REMOVE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_REMOVE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_REMOVE_AFTER.3bsd b/man/SLIST_REMOVE_AFTER.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_REMOVE_AFTER.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_REMOVE_HEAD.3bsd b/man/SLIST_REMOVE_HEAD.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_REMOVE_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SLIST_SWAP.3bsd b/man/SLIST_SWAP.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/SLIST_SWAP.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/SPLAY_EMPTY.3bsd b/man/SPLAY_EMPTY.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_EMPTY.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_ENTRY.3bsd b/man/SPLAY_ENTRY.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_ENTRY.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_FIND.3bsd b/man/SPLAY_FIND.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_FIND.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_FOREACH.3bsd b/man/SPLAY_FOREACH.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_FOREACH.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_GENERATE.3bsd b/man/SPLAY_GENERATE.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_GENERATE.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_HEAD.3bsd b/man/SPLAY_HEAD.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_INIT.3bsd b/man/SPLAY_INIT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_INIT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_INITIALIZER.3bsd b/man/SPLAY_INITIALIZER.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_INITIALIZER.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_INSERT.3bsd b/man/SPLAY_INSERT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_INSERT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_LEFT.3bsd b/man/SPLAY_LEFT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_LEFT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_MAX.3bsd b/man/SPLAY_MAX.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_MAX.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_MIN.3bsd b/man/SPLAY_MIN.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_MIN.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_NEXT.3bsd b/man/SPLAY_NEXT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_NEXT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_PROTOTYPE.3bsd b/man/SPLAY_PROTOTYPE.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_PROTOTYPE.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_REMOVE.3bsd b/man/SPLAY_REMOVE.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_REMOVE.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_RIGHT.3bsd b/man/SPLAY_RIGHT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_RIGHT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/SPLAY_ROOT.3bsd b/man/SPLAY_ROOT.3bsd
new file mode 100644
index 0000000..af4dd71
--- /dev/null
+++ b/man/SPLAY_ROOT.3bsd
@@ -0,0 +1 @@
+.so man3/tree.3bsd
diff --git a/man/STAILQ_CONCAT.3bsd b/man/STAILQ_CONCAT.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_CONCAT.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_EMPTY.3bsd b/man/STAILQ_EMPTY.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_EMPTY.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_ENTRY.3bsd b/man/STAILQ_ENTRY.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_ENTRY.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_FIRST.3bsd b/man/STAILQ_FIRST.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_FIRST.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_FOREACH.3bsd b/man/STAILQ_FOREACH.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_FOREACH.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_FOREACH_FROM.3bsd b/man/STAILQ_FOREACH_FROM.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_FOREACH_FROM.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_FOREACH_FROM_SAFE.3bsd b/man/STAILQ_FOREACH_FROM_SAFE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_FOREACH_FROM_SAFE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_FOREACH_SAFE.3bsd b/man/STAILQ_FOREACH_SAFE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_FOREACH_SAFE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_HEAD.3bsd b/man/STAILQ_HEAD.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_HEAD_INITIALIZER.3bsd b/man/STAILQ_HEAD_INITIALIZER.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_HEAD_INITIALIZER.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_INIT.3bsd b/man/STAILQ_INIT.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_INIT.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_INSERT_AFTER.3bsd b/man/STAILQ_INSERT_AFTER.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_INSERT_AFTER.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_INSERT_HEAD.3bsd b/man/STAILQ_INSERT_HEAD.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_INSERT_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_INSERT_TAIL.3bsd b/man/STAILQ_INSERT_TAIL.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_INSERT_TAIL.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_LAST.3bsd b/man/STAILQ_LAST.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_LAST.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_NEXT.3bsd b/man/STAILQ_NEXT.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_NEXT.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_REMOVE.3bsd b/man/STAILQ_REMOVE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_REMOVE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_REMOVE_AFTER.3bsd b/man/STAILQ_REMOVE_AFTER.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_REMOVE_AFTER.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_REMOVE_HEAD.3bsd b/man/STAILQ_REMOVE_HEAD.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_REMOVE_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/STAILQ_SWAP.3bsd b/man/STAILQ_SWAP.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/STAILQ_SWAP.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_CONCAT.3bsd b/man/TAILQ_CONCAT.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_CONCAT.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_EMPTY.3bsd b/man/TAILQ_EMPTY.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_EMPTY.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_ENTRY.3bsd b/man/TAILQ_ENTRY.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_ENTRY.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_FIRST.3bsd b/man/TAILQ_FIRST.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_FIRST.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_FOREACH.3bsd b/man/TAILQ_FOREACH.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_FOREACH.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_FOREACH_FROM.3bsd b/man/TAILQ_FOREACH_FROM.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_FOREACH_FROM.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_FOREACH_FROM_SAFE.3bsd b/man/TAILQ_FOREACH_FROM_SAFE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_FOREACH_FROM_SAFE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_FOREACH_REVERSE.3bsd b/man/TAILQ_FOREACH_REVERSE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_FOREACH_REVERSE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_FOREACH_REVERSE_FROM.3bsd b/man/TAILQ_FOREACH_REVERSE_FROM.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_FOREACH_REVERSE_FROM.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_FOREACH_REVERSE_FROM_SAFE.3bsd b/man/TAILQ_FOREACH_REVERSE_FROM_SAFE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_FOREACH_REVERSE_FROM_SAFE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_FOREACH_REVERSE_SAFE.3bsd b/man/TAILQ_FOREACH_REVERSE_SAFE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_FOREACH_REVERSE_SAFE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_FOREACH_SAFE.3bsd b/man/TAILQ_FOREACH_SAFE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_FOREACH_SAFE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_HEAD.3bsd b/man/TAILQ_HEAD.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_HEAD_INITIALIZER.3bsd b/man/TAILQ_HEAD_INITIALIZER.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_HEAD_INITIALIZER.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_INIT.3bsd b/man/TAILQ_INIT.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_INIT.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_INSERT_AFTER.3bsd b/man/TAILQ_INSERT_AFTER.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_INSERT_AFTER.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_INSERT_BEFORE.3bsd b/man/TAILQ_INSERT_BEFORE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_INSERT_BEFORE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_INSERT_HEAD.3bsd b/man/TAILQ_INSERT_HEAD.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_INSERT_HEAD.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_INSERT_TAIL.3bsd b/man/TAILQ_INSERT_TAIL.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_INSERT_TAIL.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_LAST.3bsd b/man/TAILQ_LAST.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_LAST.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_NEXT.3bsd b/man/TAILQ_NEXT.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_NEXT.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_PREV.3bsd b/man/TAILQ_PREV.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_PREV.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_REMOVE.3bsd b/man/TAILQ_REMOVE.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_REMOVE.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/TAILQ_SWAP.3bsd b/man/TAILQ_SWAP.3bsd
new file mode 100644
index 0000000..3a5aa76
--- /dev/null
+++ b/man/TAILQ_SWAP.3bsd
@@ -0,0 +1 @@
+.so man3/queue.3bsd
diff --git a/man/bit_alloc.3bsd b/man/bit_alloc.3bsd
new file mode 100644
index 0000000..35f96cf
--- /dev/null
+++ b/man/bit_alloc.3bsd
@@ -0,0 +1 @@
+.so man3/bitstring.3bsd
diff --git a/man/bit_clear.3bsd b/man/bit_clear.3bsd
new file mode 100644
index 0000000..35f96cf
--- /dev/null
+++ b/man/bit_clear.3bsd
@@ -0,0 +1 @@
+.so man3/bitstring.3bsd
diff --git a/man/bit_decl.3bsd b/man/bit_decl.3bsd
new file mode 100644
index 0000000..35f96cf
--- /dev/null
+++ b/man/bit_decl.3bsd
@@ -0,0 +1 @@
+.so man3/bitstring.3bsd
diff --git a/man/bit_ffc.3bsd b/man/bit_ffc.3bsd
new file mode 100644
index 0000000..35f96cf
--- /dev/null
+++ b/man/bit_ffc.3bsd
@@ -0,0 +1 @@
+.so man3/bitstring.3bsd
diff --git a/man/bit_ffs.3bsd b/man/bit_ffs.3bsd
new file mode 100644
index 0000000..35f96cf
--- /dev/null
+++ b/man/bit_ffs.3bsd
@@ -0,0 +1 @@
+.so man3/bitstring.3bsd
diff --git a/man/bit_nclear.3bsd b/man/bit_nclear.3bsd
new file mode 100644
index 0000000..35f96cf
--- /dev/null
+++ b/man/bit_nclear.3bsd
@@ -0,0 +1 @@
+.so man3/bitstring.3bsd
diff --git a/man/bit_nset.3bsd b/man/bit_nset.3bsd
new file mode 100644
index 0000000..35f96cf
--- /dev/null
+++ b/man/bit_nset.3bsd
@@ -0,0 +1 @@
+.so man3/bitstring.3bsd
diff --git a/man/bit_set.3bsd b/man/bit_set.3bsd
new file mode 100644
index 0000000..35f96cf
--- /dev/null
+++ b/man/bit_set.3bsd
@@ -0,0 +1 @@
+.so man3/bitstring.3bsd
diff --git a/man/bit_test.3bsd b/man/bit_test.3bsd
new file mode 100644
index 0000000..35f96cf
--- /dev/null
+++ b/man/bit_test.3bsd
@@ -0,0 +1 @@
+.so man3/bitstring.3bsd
diff --git a/man/bitstr_size.3bsd b/man/bitstr_size.3bsd
new file mode 100644
index 0000000..35f96cf
--- /dev/null
+++ b/man/bitstr_size.3bsd
@@ -0,0 +1 @@
+.so man3/bitstring.3bsd
diff --git a/man/pidfile_close.3bsd b/man/pidfile_close.3bsd
new file mode 100644
index 0000000..4fe0398
--- /dev/null
+++ b/man/pidfile_close.3bsd
@@ -0,0 +1 @@
+.so man3/pidfile.3bsd
diff --git a/man/pidfile_open.3bsd b/man/pidfile_open.3bsd
new file mode 100644
index 0000000..4fe0398
--- /dev/null
+++ b/man/pidfile_open.3bsd
@@ -0,0 +1 @@
+.so man3/pidfile.3bsd
diff --git a/man/pidfile_remove.3bsd b/man/pidfile_remove.3bsd
new file mode 100644
index 0000000..4fe0398
--- /dev/null
+++ b/man/pidfile_remove.3bsd
@@ -0,0 +1 @@
+.so man3/pidfile.3bsd
diff --git a/man/pidfile_write.3bsd b/man/pidfile_write.3bsd
new file mode 100644
index 0000000..4fe0398
--- /dev/null
+++ b/man/pidfile_write.3bsd
@@ -0,0 +1 @@
+.so man3/pidfile.3bsd
diff --git a/man/setproctitle_init.3bsd b/man/setproctitle_init.3bsd
new file mode 100644
index 0000000..5467d31
--- /dev/null
+++ b/man/setproctitle_init.3bsd
@@ -0,0 +1 @@
+.so man3/setproctitle.3bsd
diff --git a/man/sl_add.3bsd b/man/sl_add.3bsd
new file mode 100644
index 0000000..89c6b4c
--- /dev/null
+++ b/man/sl_add.3bsd
@@ -0,0 +1 @@
+.so man3/stringlist.3bsd
diff --git a/man/sl_delete.3bsd b/man/sl_delete.3bsd
new file mode 100644
index 0000000..89c6b4c
--- /dev/null
+++ b/man/sl_delete.3bsd
@@ -0,0 +1 @@
+.so man3/stringlist.3bsd
diff --git a/man/sl_find.3bsd b/man/sl_find.3bsd
new file mode 100644
index 0000000..89c6b4c
--- /dev/null
+++ b/man/sl_find.3bsd
@@ -0,0 +1 @@
+.so man3/stringlist.3bsd
diff --git a/man/sl_free.3bsd b/man/sl_free.3bsd
new file mode 100644
index 0000000..89c6b4c
--- /dev/null
+++ b/man/sl_free.3bsd
@@ -0,0 +1 @@
+.so man3/stringlist.3bsd
diff --git a/man/sl_init.3bsd b/man/sl_init.3bsd
new file mode 100644
index 0000000..89c6b4c
--- /dev/null
+++ b/man/sl_init.3bsd
@@ -0,0 +1 @@
+.so man3/stringlist.3bsd
diff --git a/man/strnunvis.3bsd b/man/strnunvis.3bsd
new file mode 100644
index 0000000..65ee343
--- /dev/null
+++ b/man/strnunvis.3bsd
@@ -0,0 +1 @@
+.so man3/unvis.3bsd
diff --git a/man/strnvis.3bsd b/man/strnvis.3bsd
new file mode 100644
index 0000000..ad4c197
--- /dev/null
+++ b/man/strnvis.3bsd
@@ -0,0 +1 @@
+.so man3/vis.3bsd
diff --git a/man/strunvis.3bsd b/man/strunvis.3bsd
new file mode 100644
index 0000000..65ee343
--- /dev/null
+++ b/man/strunvis.3bsd
@@ -0,0 +1 @@
+.so man3/unvis.3bsd
diff --git a/man/strvis.3bsd b/man/strvis.3bsd
new file mode 100644
index 0000000..ad4c197
--- /dev/null
+++ b/man/strvis.3bsd
@@ -0,0 +1 @@
+.so man3/vis.3bsd
diff --git a/man/strvisx.3bsd b/man/strvisx.3bsd
new file mode 100644
index 0000000..ad4c197
--- /dev/null
+++ b/man/strvisx.3bsd
@@ -0,0 +1 @@
+.so man3/vis.3bsd
commit f20e6972b3a5ef4d1bfa2e3b2577caa3f9e357fc
Author: Guillem Jover <guillem at hadrons.org>
Date: Mon Jun 5 06:43:22 2017 +0200
man: Move all man pages to section 3bsd
This should guarantee that even if the system provides or will provide
native implementations of these functions, we will not have file
conflicts.
diff --git a/COPYING b/COPYING
index 4704162..2e42383 100644
--- a/COPYING
+++ b/COPYING
@@ -7,8 +7,8 @@ Copyright:
License: BSD-3-clause
Files:
- man/arc4random.3
- man/tree.3
+ man/arc4random.3bsd
+ man/tree.3bsd
Copyright:
Copyright 1997 Niels Provos <provos at 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.
@@ -92,24 +92,24 @@ Files:
include/bsd/sys/queue.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/explicit_bzero.3bsd
+ man/fgetln.3bsd
+ man/fgetwln.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/unvis.3bsd
+ man/vis.3bsd
+ man/wcslcpy.3bsd
src/getbsize.c
src/heapsort.c
src/merge.c
@@ -207,7 +207,7 @@ License: BSD-3-clause-Peter-Wemm
SUCH DAMAGE.
Files:
- man/setproctitle.3
+ man/setproctitle.3bsd
Copyright:
Copyright © 1995 Peter Wemm <peter at FreeBSD.org>
All rights reserved.
@@ -230,9 +230,9 @@ 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
src/fmtcheck.c
src/humanize_number.c
src/stringlist.c
@@ -278,11 +278,11 @@ 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/expand_number.3bsd
+ man/closefrom.3bsd
+ man/flopen.3bsd
+ man/getpeereid.3bsd
+ man/pidfile.3bsd
src/expand_number.c
src/hash/sha512.h
src/hash/sha512c.c
@@ -352,7 +352,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.
@@ -383,9 +383,9 @@ License: BSD-2-clause-author
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_openbsd.h
src/arc4random_uniform.c
diff --git a/man/.gitignore b/man/.gitignore
index ed4f453..28f8a5b 100644
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -1,2 +1 @@
-md5.3
md5.3bsd
diff --git a/man/Makefile.am b/man/Makefile.am
index e4d6e4a..6fb3f79 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -14,50 +14,50 @@ 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 \
+ arc4random.3bsd \
+ arc4random_addrandom.3bsd \
+ arc4random_buf.3bsd \
+ arc4random_stir.3bsd \
+ arc4random_uniform.3bsd \
+ bitstring.3bsd \
+ closefrom.3bsd \
+ dehumanize_number.3bsd \
+ expand_number.3bsd \
+ explicit_bzero.3bsd \
+ fgetln.3bsd \
+ fgetwln.3bsd \
+ flopen.3bsd \
+ fmtcheck.3bsd \
+ fparseln.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 \
md5.3bsd \
- mergesort.3 \
- nlist.3 \
- pidfile.3 \
+ mergesort.3bsd \
+ nlist.3bsd \
+ pidfile.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 \
+ setprogname.3bsd \
+ sradixsort.3bsd \
+ stringlist.3bsd \
+ strlcat.3bsd \
+ strlcpy.3bsd \
+ strnstr.3bsd \
+ strmode.3bsd \
+ strtonum.3bsd \
+ tree.3bsd \
+ unvis.3bsd \
+ vis.3bsd \
+ wcslcat.3bsd \
+ wcslcpy.3bsd \
$(nil)
diff --git a/man/arc4random.3 b/man/arc4random.3bsd
similarity index 100%
rename from man/arc4random.3
rename to man/arc4random.3bsd
diff --git a/man/arc4random_addrandom.3 b/man/arc4random_addrandom.3
deleted file mode 100644
index 74a34ce..0000000
--- a/man/arc4random_addrandom.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/arc4random.3
diff --git a/man/arc4random_addrandom.3bsd b/man/arc4random_addrandom.3bsd
new file mode 100644
index 0000000..edb5192
--- /dev/null
+++ b/man/arc4random_addrandom.3bsd
@@ -0,0 +1 @@
+.so man3/arc4random.3bsd
diff --git a/man/arc4random_buf.3 b/man/arc4random_buf.3
deleted file mode 100644
index 74a34ce..0000000
--- a/man/arc4random_buf.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/arc4random.3
diff --git a/man/arc4random_buf.3bsd b/man/arc4random_buf.3bsd
new file mode 100644
index 0000000..edb5192
--- /dev/null
+++ b/man/arc4random_buf.3bsd
@@ -0,0 +1 @@
+.so man3/arc4random.3bsd
diff --git a/man/arc4random_stir.3 b/man/arc4random_stir.3
deleted file mode 100644
index 74a34ce..0000000
--- a/man/arc4random_stir.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/arc4random.3
diff --git a/man/arc4random_stir.3bsd b/man/arc4random_stir.3bsd
new file mode 100644
index 0000000..edb5192
--- /dev/null
+++ b/man/arc4random_stir.3bsd
@@ -0,0 +1 @@
+.so man3/arc4random.3bsd
diff --git a/man/arc4random_uniform.3 b/man/arc4random_uniform.3
deleted file mode 100644
index 74a34ce..0000000
--- a/man/arc4random_uniform.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/arc4random.3
diff --git a/man/arc4random_uniform.3bsd b/man/arc4random_uniform.3bsd
new file mode 100644
index 0000000..edb5192
--- /dev/null
+++ b/man/arc4random_uniform.3bsd
@@ -0,0 +1 @@
+.so man3/arc4random.3bsd
diff --git a/man/bitstring.3 b/man/bitstring.3bsd
similarity index 100%
rename from man/bitstring.3
rename to man/bitstring.3bsd
diff --git a/man/closefrom.3 b/man/closefrom.3bsd
similarity index 100%
rename from man/closefrom.3
rename to man/closefrom.3bsd
diff --git a/man/dehumanize_number.3 b/man/dehumanize_number.3
deleted file mode 100644
index 7f5dcf3..0000000
--- a/man/dehumanize_number.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/humanize_number.3
diff --git a/man/dehumanize_number.3bsd b/man/dehumanize_number.3bsd
new file mode 100644
index 0000000..6118ff8
--- /dev/null
+++ b/man/dehumanize_number.3bsd
@@ -0,0 +1 @@
+.so man3/humanize_number.3bsd
diff --git a/man/expand_number.3 b/man/expand_number.3bsd
similarity index 99%
rename from man/expand_number.3
rename to man/expand_number.3bsd
index 482637d..b97f5e5 100644
--- a/man/expand_number.3
+++ b/man/expand_number.3bsd
@@ -79,7 +79,7 @@ An unrecognized prefix was given.
Result doesn't fit into 64 bits.
.El
.Sh SEE ALSO
-.Xr humanize_number 3
+.Xr humanize_number 3bsd
.Sh HISTORY
The
.Fn expand_number
diff --git a/man/explicit_bzero.3 b/man/explicit_bzero.3bsd
similarity index 100%
rename from man/explicit_bzero.3
rename to man/explicit_bzero.3bsd
diff --git a/man/fgetln.3 b/man/fgetln.3bsd
similarity index 99%
rename from man/fgetln.3
rename to man/fgetln.3bsd
index 7dd3fc8..cc7b735 100644
--- a/man/fgetln.3
+++ b/man/fgetln.3bsd
@@ -115,7 +115,7 @@ or
.Sh SEE ALSO
.Xr ferror 3 ,
.Xr fgets 3 ,
-.Xr fgetwln 3 ,
+.Xr fgetwln 3bsd ,
.Xr fopen 3 ,
.Xr putc 3
.Sh HISTORY
diff --git a/man/fgetwln.3 b/man/fgetwln.3bsd
similarity index 99%
rename from man/fgetwln.3
rename to man/fgetwln.3bsd
index 0372d21..7557d52 100644
--- a/man/fgetwln.3
+++ b/man/fgetwln.3bsd
@@ -112,6 +112,6 @@ or
.Xr read 2 .
.Sh SEE ALSO
.Xr ferror 3 ,
-.Xr fgetln 3 ,
+.Xr fgetln 3bsd ,
.Xr fgetws 3 ,
.Xr fopen 3
diff --git a/man/flopen.3 b/man/flopen.3bsd
similarity index 100%
rename from man/flopen.3
rename to man/flopen.3bsd
diff --git a/man/fmtcheck.3 b/man/fmtcheck.3bsd
similarity index 100%
rename from man/fmtcheck.3
rename to man/fmtcheck.3bsd
diff --git a/man/fparseln.3 b/man/fparseln.3bsd
similarity index 100%
rename from man/fparseln.3
rename to man/fparseln.3bsd
diff --git a/man/getbsize.3 b/man/getbsize.3bsd
similarity index 100%
rename from man/getbsize.3
rename to man/getbsize.3bsd
diff --git a/man/getmode.3 b/man/getmode.3
deleted file mode 100644
index 63315e7..0000000
--- a/man/getmode.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/setmode.3
diff --git a/man/getmode.3bsd b/man/getmode.3bsd
new file mode 100644
index 0000000..f5877b2
--- /dev/null
+++ b/man/getmode.3bsd
@@ -0,0 +1 @@
+.so man3/setmode.3bsd
diff --git a/man/getpeereid.3 b/man/getpeereid.3bsd
similarity index 100%
rename from man/getpeereid.3
rename to man/getpeereid.3bsd
diff --git a/man/getprogname.3 b/man/getprogname.3bsd
similarity index 99%
rename from man/getprogname.3
rename to man/getprogname.3bsd
index e83334f..fe32efb 100644
--- a/man/getprogname.3
+++ b/man/getprogname.3bsd
@@ -87,7 +87,7 @@ allows the aforementioned library to learn the program name without
modifications to the start-up code.
.Sh SEE ALSO
.Xr err 3 ,
-.Xr setproctitle 3
+.Xr setproctitle 3bsd
.Sh HISTORY
These functions first appeared in
.Nx 1.6 ,
diff --git a/man/heapsort.3 b/man/heapsort.3bsd
similarity index 99%
rename from man/heapsort.3
rename to man/heapsort.3bsd
index 4261c84..eefe157 100644
--- a/man/heapsort.3
+++ b/man/heapsort.3bsd
@@ -174,7 +174,7 @@ were unable to allocate memory.
.El
.Sh SEE ALSO
.Xr sort 1 ,
-.Xr radixsort 3
+.Xr radixsort 3bsd
.Rs
.%A Williams, J.W.J
.%D 1964
diff --git a/man/humanize_number.3 b/man/humanize_number.3bsd
similarity index 100%
rename from man/humanize_number.3
rename to man/humanize_number.3bsd
diff --git a/man/mergesort.3 b/man/mergesort.3
deleted file mode 100644
index c1979c3..0000000
--- a/man/mergesort.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/heapsort.3
diff --git a/man/mergesort.3bsd b/man/mergesort.3bsd
new file mode 100644
index 0000000..bb6a7b3
--- /dev/null
+++ b/man/mergesort.3bsd
@@ -0,0 +1 @@
+.so man3/heapsort.3bsd
diff --git a/man/nlist.3 b/man/nlist.3bsd
similarity index 100%
rename from man/nlist.3
rename to man/nlist.3bsd
diff --git a/man/pidfile.3 b/man/pidfile.3bsd
similarity index 99%
rename from man/pidfile.3
rename to man/pidfile.3bsd
index e7eaf3f..91596dc 100644
--- a/man/pidfile.3
+++ b/man/pidfile.3bsd
@@ -51,7 +51,7 @@ The
.Nm pidfile
family of functions allows daemons to handle PID files.
It uses
-.Xr flopen 3
+.Xr flopen 3bsd
to lock a pidfile and detect already running daemons.
.Pp
The
@@ -237,12 +237,12 @@ for any errors specified for the
and
.Xr unlink 2
system calls and the
-.Xr flopen 3
+.Xr flopen 3bsd
library function.
.Sh SEE ALSO
.Xr open 2 ,
.Xr daemon 3 ,
-.Xr flopen 3
+.Xr flopen 3bsd
.Sh AUTHORS
.An -nosplit
The
diff --git a/man/queue.3bsd b/man/queue.3bsd
index bea33d0..7a5ed95 100644
--- a/man/queue.3bsd
+++ b/man/queue.3bsd
@@ -1204,7 +1204,7 @@ while (n1 != NULL) {
TAILQ_INIT(&head);
.Ed
.Sh SEE ALSO
-.Xr tree 3
+.Xr tree 3bsd
.Sh HISTORY
The
.Nm queue
diff --git a/man/radixsort.3 b/man/radixsort.3bsd
similarity index 100%
rename from man/radixsort.3
rename to man/radixsort.3bsd
diff --git a/man/readpassphrase.3 b/man/readpassphrase.3bsd
similarity index 100%
rename from man/readpassphrase.3
rename to man/readpassphrase.3bsd
diff --git a/man/reallocarray.3 b/man/reallocarray.3bsd
similarity index 100%
rename from man/reallocarray.3
rename to man/reallocarray.3bsd
diff --git a/man/reallocf.3 b/man/reallocf.3bsd
similarity index 100%
rename from man/reallocf.3
rename to man/reallocf.3bsd
diff --git a/man/setmode.3 b/man/setmode.3bsd
similarity index 100%
rename from man/setmode.3
rename to man/setmode.3bsd
diff --git a/man/setproctitle.3 b/man/setproctitle.3bsd
similarity index 100%
rename from man/setproctitle.3
rename to man/setproctitle.3bsd
diff --git a/man/setprogname.3 b/man/setprogname.3
deleted file mode 100644
index 66c00cf..0000000
--- a/man/setprogname.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/getprogname.3
diff --git a/man/setprogname.3bsd b/man/setprogname.3bsd
new file mode 100644
index 0000000..954beae
--- /dev/null
+++ b/man/setprogname.3bsd
@@ -0,0 +1 @@
+.so man3/getprogname.3bsd
diff --git a/man/sradixsort.3 b/man/sradixsort.3
deleted file mode 100644
index 86a95a3..0000000
--- a/man/sradixsort.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/radixsort.3
diff --git a/man/sradixsort.3bsd b/man/sradixsort.3bsd
new file mode 100644
index 0000000..b2ad314
--- /dev/null
+++ b/man/sradixsort.3bsd
@@ -0,0 +1 @@
+.so man3/radixsort.3bsd
diff --git a/man/stringlist.3 b/man/stringlist.3bsd
similarity index 100%
rename from man/stringlist.3
rename to man/stringlist.3bsd
diff --git a/man/strlcat.3 b/man/strlcat.3
deleted file mode 100644
index d968886..0000000
--- a/man/strlcat.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/strlcpy.3
diff --git a/man/strlcat.3bsd b/man/strlcat.3bsd
new file mode 100644
index 0000000..ef7f0ea
--- /dev/null
+++ b/man/strlcat.3bsd
@@ -0,0 +1 @@
+.so man3/strlcpy.3bsd
diff --git a/man/strlcpy.3 b/man/strlcpy.3bsd
similarity index 100%
rename from man/strlcpy.3
rename to man/strlcpy.3bsd
diff --git a/man/strmode.3 b/man/strmode.3bsd
similarity index 99%
rename from man/strmode.3
rename to man/strmode.3bsd
index 70264c0..b505537 100644
--- a/man/strmode.3
+++ b/man/strmode.3bsd
@@ -136,8 +136,8 @@ it will be a space.
.Xr chmod 1 ,
.Xr find 1 ,
.Xr stat 2 ,
-.Xr getmode 3 ,
-.Xr setmode 3
+.Xr getmode 3bsd ,
+.Xr setmode 3bsd
.Sh HISTORY
The
.Fn strmode
diff --git a/man/strnstr.3 b/man/strnstr.3bsd
similarity index 100%
rename from man/strnstr.3
rename to man/strnstr.3bsd
diff --git a/man/strtonum.3 b/man/strtonum.3bsd
similarity index 100%
rename from man/strtonum.3
rename to man/strtonum.3bsd
diff --git a/man/tree.3 b/man/tree.3bsd
similarity index 99%
rename from man/tree.3
rename to man/tree.3bsd
index 07cf0aa..643b0ee 100644
--- a/man/tree.3
+++ b/man/tree.3bsd
@@ -498,7 +498,7 @@ return the pointer to the removed element otherwise they return
.Dv NULL
to indicate an error.
.Sh SEE ALSO
-.Xr queue 3
+.Xr queue 3bsd
.Sh AUTHORS
The author of the tree macros is
.An Niels Provos .
diff --git a/man/unvis.3 b/man/unvis.3bsd
similarity index 99%
rename from man/unvis.3
rename to man/unvis.3bsd
index 5e01f88..5ff42fe 100644
--- a/man/unvis.3
+++ b/man/unvis.3bsd
@@ -54,7 +54,7 @@ and
.Fn strnunvis
functions are used to decode a visual representation of characters,
as produced by the
-.Xr vis 3
+.Xr vis 3bsd
function, back into the original form.
.Fn unvis
is called with successive characters in
@@ -190,7 +190,7 @@ if (unvis(&out, (char)0, &state, UNVIS_END) == UNVIS_VALID)
.Sh SEE ALSO
.Xr unvis 1 ,
.Xr vis 1 ,
-.Xr vis 3
+.Xr vis 3bsd
.Sh HISTORY
The
.Fn unvis
diff --git a/man/vis.3 b/man/vis.3bsd
similarity index 99%
rename from man/vis.3
rename to man/vis.3bsd
index 65548f0..cf2cd98 100644
--- a/man/vis.3
+++ b/man/vis.3bsd
@@ -151,9 +151,9 @@ must not be used without checking it against
The encoding is a unique, invertible representation composed entirely of
graphic characters; it can be decoded back into the original form using
the
-.Xr unvis 3
+.Xr unvis 3bsd
or
-.Xr strunvis 3
+.Xr strunvis 3bsd
functions.
.Pp
There are two parameters that can be controlled: the range of
@@ -305,8 +305,8 @@ ambiguous and non-invertible.
.Xr unvis 1 ,
.Xr vis 1 ,
.Xr snprintf 3 ,
-.Xr strlcpy 3 ,
-.Xr unvis 3
+.Xr strlcpy 3bsd ,
+.Xr unvis 3bsd
.Sh HISTORY
The
.Fn vis ,
diff --git a/man/wcslcat.3 b/man/wcslcat.3
deleted file mode 100644
index 15cde50..0000000
--- a/man/wcslcat.3
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/wcslcpy.3
diff --git a/man/wcslcat.3bsd b/man/wcslcat.3bsd
new file mode 100644
index 0000000..92ff4ff
--- /dev/null
+++ b/man/wcslcat.3bsd
@@ -0,0 +1 @@
+.so man3/wcslcpy.3bsd
diff --git a/man/wcslcpy.3 b/man/wcslcpy.3bsd
similarity index 97%
rename from man/wcslcpy.3
rename to man/wcslcpy.3bsd
index 64cbe73..0d6011b 100644
--- a/man/wcslcpy.3
+++ b/man/wcslcpy.3bsd
@@ -56,10 +56,10 @@ The functions implement string manipulation operations over wide character
strings.
For a detailed description, refer to documents for the respective single-byte
counterpart, such as
-.Xr strlcpy 3 .
+.Xr strlcpy 3bsd .
.Sh SEE ALSO
-.Xr strlcat 3 ,
-.Xr strlcpy 3 ,
+.Xr strlcat 3bsd ,
+.Xr strlcpy 3bsd .
.Sh STANDARDS
.Fn wcslcat
and
commit 07c76b666dc8e8fd2fb4f2b716f65687b60af8c7
Author: Guillem Jover <guillem at hadrons.org>
Date: Mon Jun 5 06:17:27 2017 +0200
Do not use legacy BSD u_* types
Some systems do not have these types available, and they are simply
convenience aliases. Instead use the expanded versions which are more
portable.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=101192
diff --git a/include/bsd/netinet/ip_icmp.h b/include/bsd/netinet/ip_icmp.h
index 0742aa6..45f5d72 100644
--- a/include/bsd/netinet/ip_icmp.h
+++ b/include/bsd/netinet/ip_icmp.h
@@ -33,7 +33,7 @@
#ifndef _NETINET_IP_ICMP_H_
#define _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
diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index 0604cad..46a009e 100644
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -49,7 +49,7 @@
__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);
diff --git a/src/arc4random.c b/src/arc4random.c
index fb16757..c6f89c3 100644
--- a/src/arc4random.c
+++ b/src/arc4random.c
@@ -59,7 +59,7 @@ static struct _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 */
+ unsigned char rs_buf[RSBUFSZ]; /* keystream blocks */
} *rsx;
static inline int _rs_allocate(struct _rs **, struct _rsx **);
@@ -67,7 +67,7 @@ static inline void _rs_forkdetect(void);
#include "arc4random.h"
static inline void
-_rs_init(u_char *buf, size_t n)
+_rs_init(unsigned char *buf, size_t n)
{
if (n < KEYSZ + IVSZ)
return;
@@ -82,7 +82,7 @@ _rs_init(u_char *buf, size_t n)
}
static inline void
-_rs_rekey(u_char *dat, size_t datlen)
+_rs_rekey(unsigned char *dat, size_t datlen)
{
#ifndef KEYSTREAM_ONLY
memset(rsx->rs_buf, 0, sizeof(rsx->rs_buf));
@@ -107,7 +107,7 @@ _rs_rekey(u_char *dat, size_t datlen)
static void
_rs_stir(void)
{
- u_char rnd[KEYSZ + IVSZ];
+ unsigned char rnd[KEYSZ + IVSZ];
if (getentropy(rnd, sizeof rnd) == -1)
_getentropy_fail();
@@ -140,8 +140,8 @@ _rs_stir_if_needed(size_t len)
static inline void
_rs_random_buf(void *_buf, size_t n)
{
- u_char *buf = (u_char *)_buf;
- u_char *keystream;
+ unsigned char *buf = (unsigned char *)_buf;
+ unsigned char *keystream;
size_t m;
_rs_stir_if_needed(n);
@@ -164,7 +164,7 @@ _rs_random_buf(void *_buf, size_t n)
static inline void
_rs_random_u32(uint32_t *val)
{
- u_char *keystream;
+ unsigned char *keystream;
_rs_stir_if_needed(sizeof(*val));
if (rs->rs_have < sizeof(*val))
@@ -184,7 +184,7 @@ arc4random_stir(void)
}
void
-arc4random_addrandom(u_char *dat, int datlen)
+arc4random_addrandom(unsigned char *dat, int datlen)
{
_ARC4_LOCK();
_rs_stir_if_needed(datlen);
diff --git a/src/chacha_private.h b/src/chacha_private.h
index b720d93..5aae8d8 100644
--- a/src/chacha_private.h
+++ b/src/chacha_private.h
@@ -92,7 +92,7 @@ chacha_encrypt_bytes(chacha_ctx *x,const u8 *m,u8 *c,u32 bytes)
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;
+ unsigned int i;
if (!bytes) return;
diff --git a/src/getentropy_bsd.c b/src/getentropy_bsd.c
index 1959984..d45901b 100644
--- a/src/getentropy_bsd.c
+++ b/src/getentropy_bsd.c
@@ -30,7 +30,7 @@
* Derived from lib/libc/gen/arc4random.c from FreeBSD.
*/
static size_t
-getentropy_sysctl(u_char *buf, size_t size)
+getentropy_sysctl(unsigned char *buf, size_t size)
{
int mib[2];
size_t len, done;
diff --git a/src/hash/helper.c b/src/hash/helper.c
index 1c63564..d9362d3 100644
--- a/src/hash/helper.c
+++ b/src/hash/helper.c
@@ -51,7 +51,7 @@ char *
HASHFileChunk(const char *filename, char *buf, off_t off, off_t len)
{
struct stat sb;
- u_char buffer[BUFSIZ];
+ unsigned char buffer[BUFSIZ];
HASH_CTX ctx;
int fd, save_errno;
ssize_t nr;
@@ -92,7 +92,7 @@ HASHFile(const char *filename, char *buf)
}
char *
-HASHData(const u_char *data, size_t len, char *buf)
+HASHData(const unsigned char *data, size_t len, char *buf)
{
HASH_CTX ctx;
diff --git a/src/inet_net_pton.c b/src/inet_net_pton.c
index 28c55ba..b0147f6 100644
--- a/src/inet_net_pton.c
+++ b/src/inet_net_pton.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD: src/lib/libc/net/inet_net_pton.c,v 1.9 2003/09/15 23:38:06 f
# define SPRINTF(x) ((size_t)sprintf x)
#endif
-static int inet_net_pton_ipv4(const char *src, u_char *dst, size_t size);
+static int inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size);
/*
* static int
@@ -83,13 +83,13 @@ inet_net_pton(int af, const char *src, void *dst, size_t size)
* Paul Vixie (ISC), June 1996
*/
static int
-inet_net_pton_ipv4(const char *src, u_char *dst, size_t size)
+inet_net_pton_ipv4(const char *src, unsigned char *dst, size_t size)
{
static const char
xdigits[] = "0123456789abcdef",
digits[] = "0123456789";
int n, ch, tmp, dirty, bits;
- const u_char *odst = dst;
+ const unsigned char *odst = dst;
ch = *src++;
if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
@@ -130,7 +130,7 @@ inet_net_pton_ipv4(const char *src, u_char *dst, size_t size)
isascii(ch) && isdigit(ch));
if (size-- <= 0)
goto emsgsize;
- *dst++ = (u_char) tmp;
+ *dst++ = (unsigned char) tmp;
if (ch == '\0' || ch == '/')
break;
if (ch != '.')
diff --git a/src/merge.c b/src/merge.c
index c82594c..dc92b44 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -56,13 +56,13 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
-static void setup(u_char *, u_char *, size_t, size_t,
+static void setup(unsigned char *, unsigned char *, size_t, size_t,
int (*)(const void *, const void *));
-static void insertionsort(u_char *, size_t, size_t,
+static void insertionsort(unsigned char *, size_t, size_t,
int (*)(const void *, const void *));
#define ISIZE sizeof(int)
-#define PSIZE sizeof(u_char *)
+#define PSIZE sizeof(unsigned char *)
#define ICOPY_LIST(src, dst, last) \
do \
*(int*)dst = *(int*)src, src += ISIZE, dst += ISIZE; \
@@ -87,9 +87,10 @@ static void insertionsort(u_char *, size_t, size_t,
* 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)))
+#define EVAL(p) (unsigned char **) \
+ ((unsigned char *)0 + \
+ (((unsigned char *)p + PSIZE - 1 - \
+ (unsigned char *)0) & ~(PSIZE - 1)))
/*
* Arguments are as for qsort.
@@ -101,8 +102,8 @@ mergesort(void *base, size_t nmemb, size_t size,
size_t i;
int sense;
int big, iflag;
- u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
- u_char *list2, *list1, *p2, *p, *last, **p1;
+ unsigned char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
+ unsigned char *list2, *list1, *p2, *p, *last, **p1;
if (size < PSIZE / 2) { /* Pointers must fit into 2 * size. */
errno = EINVAL;
@@ -256,16 +257,16 @@ COPY: b = t;
* is defined. Otherwise simple pairwise merging is used.)
*/
static void
-setup(u_char *list1, u_char *list2, size_t n, size_t size,
+setup(unsigned char *list1, unsigned char *list2, size_t n, size_t size,
int (*cmp)(const void *, const void *))
{
int i, length, size2, tmp, sense;
- u_char *f1, *f2, *s, *l2, *last, *p2;
+ unsigned char *f1, *f2, *s, *l2, *last, *p2;
size2 = size*2;
if (n <= 5) {
insertionsort(list1, n, size, cmp);
- *EVAL(list2) = (u_char*) list2 + n*size;
+ *EVAL(list2) = (unsigned char*) list2 + n*size;
return;
}
/*
@@ -328,10 +329,10 @@ setup(u_char *list1, u_char *list2, size_t n, size_t size,
* last 4 elements.
*/
static void
-insertionsort(u_char *a, size_t n, size_t size,
+insertionsort(unsigned char *a, size_t n, size_t size,
int (*cmp)(const void *, const void *))
{
- u_char *ai, *s, *t, *u, tmp;
+ unsigned char *ai, *s, *t, *u, tmp;
int i;
for (ai = a+size; --n >= 1; ai += size)
diff --git a/src/nlist.c b/src/nlist.c
index 0cffe55..a066935 100644
--- a/src/nlist.c
+++ b/src/nlist.c
@@ -117,7 +117,7 @@ __aout_fdnlist(int fd, struct nlist *list)
struct nlist *p, *symtab;
caddr_t strtab, a_out_mmap;
off_t stroff, symoff;
- u_long symsize;
+ unsigned long symsize;
int nent;
struct exec * exec;
struct stat st;
diff --git a/src/radixsort.c b/src/radixsort.c
index ad2ae70..77ae52c 100644
--- a/src/radixsort.c
+++ b/src/radixsort.c
@@ -59,14 +59,14 @@ __RCSID("$NetBSD: radixsort.c,v 1.18 2009/08/21 20:49:50 dsl Exp $");
#include <errno.h>
typedef struct {
- const u_char **sa;
+ const unsigned 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);
+static inline void simplesort(const unsigned char **, int, int, const unsigned char *, unsigned int);
+static void r_sort_a(const unsigned char **, int, int, const unsigned char *, unsigned int);
+static void r_sort_b(const unsigned char **,
+ const unsigned char **, int, int, const unsigned char *, unsigned int);
#define THRESHOLD 20 /* Divert to simplesort(). */
#define SIZE 512 /* Default stack size. */
@@ -91,11 +91,12 @@ static void r_sort_b(const u_char **,
}
int
-radixsort(const u_char **a, int n, const u_char *tab, u_int endch)
+radixsort(const unsigned char **a, int n, const unsigned char *tab,
+ unsigned int endch)
{
- const u_char *tr;
- u_int c;
- u_char tr0[256];
+ const unsigned char *tr;
+ unsigned int c;
+ unsigned char tr0[256];
SETUP;
r_sort_a(a, n, 0, tr, endch);
@@ -103,11 +104,12 @@ radixsort(const u_char **a, int n, const u_char *tab, u_int endch)
}
int
-sradixsort(const u_char **a, int n, const u_char *tab, u_int endch)
+sradixsort(const unsigned char **a, int n, const unsigned char *tab,
+ unsigned int endch)
{
- const u_char *tr, **ta;
- u_int c;
- u_char tr0[256];
+ const unsigned char *tr, **ta;
+ unsigned int c;
+ unsigned char tr0[256];
if (a == NULL) {
errno = EFAULT;
@@ -134,14 +136,15 @@ sradixsort(const u_char **a, int n, const u_char *tab, u_int endch)
/* Unstable, in-place sort. */
static void
-r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
+r_sort_a(const unsigned char **a, int n, int i, const unsigned char *tr,
+ unsigned int endch)
{
- static u_int count[256], nc, bmin;
- u_int c;
- const u_char **ak, *r;
+ static unsigned int count[256], nc, bmin;
+ unsigned int c;
+ const unsigned char **ak, *r;
stack s[SIZE], *sp, *sp0, *sp1, temp;
- u_int *cp, bigc;
- const u_char **an, *t, **aj, **top[256];
+ unsigned int *cp, bigc;
+ const unsigned char **an, *t, **aj, **top[256];
/* Set up stack. */
sp = s;
@@ -176,7 +179,7 @@ r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
* character at position i, move on to the next
* character.
*/
- if (nc == 1 && count[bmin] == (u_int)n) {
+ if (nc == 1 && count[bmin] == (unsigned int)n) {
push(a, n, i+1);
nc = count[bmin] = 0;
continue;
@@ -232,15 +235,15 @@ r_sort_a(const u_char **a, int n, int i, const u_char *tr, u_int endch)
/* Stable sort, requiring additional memory. */
static void
-r_sort_b(const u_char **a, const u_char **ta, int n, int i, const u_char *tr,
- u_int endch)
+r_sort_b(const unsigned char **a, const unsigned char **ta, int n, int i,
+ const unsigned char *tr, unsigned int endch)
{
- static u_int count[256], nc, bmin;
- u_int c;
- const u_char **ak, **ai;
+ static unsigned int count[256], nc, bmin;
+ unsigned int c;
+ const unsigned char **ak, **ai;
stack s[512], *sp, *sp0, *sp1, temp;
- const u_char **top[256];
- u_int *cp, bigc;
+ const unsigned char **top[256];
+ unsigned int *cp, bigc;
sp = s;
push(a, n, i);
@@ -302,10 +305,11 @@ r_sort_b(const u_char **a, const u_char **ta, int n, int i, const u_char *tr,
/* insertion sort */
static inline void
-simplesort(const u_char **a, int n, int b, const u_char *tr, u_int endch)
+simplesort(const unsigned char **a, int n, int b, const unsigned char *tr,
+ unsigned int endch)
{
- u_char ch;
- const u_char **ak, **ai, *s, *t;
+ unsigned char ch;
+ const unsigned char **ak, **ai, *s, *t;
for (ak = a+1; --n >= 1; ak++)
for (ai = ak; ai > a; ai--) {
diff --git a/src/unvis.c b/src/unvis.c
index 53da64b..c45a5f8 100644
--- a/src/unvis.c
+++ b/src/unvis.c
@@ -45,8 +45,11 @@
#define S_HTTP 0x080 /* %HEXHEX escape */
-#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
-#define ishex(c) ((((u_char)(c)) >= '0' && ((u_char)(c)) <= '9') || (((u_char)(c)) >= 'a' && ((u_char)(c)) <= 'f'))
+#define isoctal(c) \
+ (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7')
+#define ishex(c) \
+ ((((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '9') || \
+ (((unsigned char)(c)) >= 'a' && ((unsigned char)(c)) <= 'f'))
/*
* unvis - decode characters previously encoded by vis
diff --git a/src/vis.c b/src/vis.c
index f869ed8..c9a06e8 100644
--- a/src/vis.c
+++ b/src/vis.c
@@ -35,17 +35,20 @@
#include <stdio.h>
#include <vis.h>
-#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
+#define isoctal(c) \
+ (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7')
#define isvisible(c) \
- (((u_int)(c) <= UCHAR_MAX && isascii((u_char)(c)) && \
+ (((unsigned int)(c) <= UCHAR_MAX && \
+ isascii((unsigned char)(c)) && \
(((c) != '*' && (c) != '?' && (c) != '[' && (c) != '#') || \
- (flag & VIS_GLOB) == 0) && isgraph((u_char)(c))) || \
+ (flag & VIS_GLOB) == 0) && \
+ isgraph((unsigned char)(c))) || \
((flag & VIS_SP) == 0 && (c) == ' ') || \
((flag & VIS_TAB) == 0 && (c) == '\t') || \
((flag & VIS_NL) == 0 && (c) == '\n') || \
((flag & VIS_SAFE) && ((c) == '\b' || \
(c) == '\007' || (c) == '\r' || \
- isgraph((u_char)(c)))))
+ isgraph((unsigned char)(c)))))
/*
* vis - visually encode characters
@@ -131,9 +134,9 @@ vis(char *dst, int c, int flag, int nextc)
}
if (((c & 0177) == ' ') || isgraph(c) || (flag & VIS_OCTAL)) {
*dst++ = '\\';
- *dst++ = ((u_char)c >> 6 & 07) + '0';
- *dst++ = ((u_char)c >> 3 & 07) + '0';
- *dst++ = ((u_char)c & 07) + '0';
+ *dst++ = ((unsigned char)c >> 6 & 07) + '0';
+ *dst++ = ((unsigned char)c >> 3 & 07) + '0';
+ *dst++ = ((unsigned char)c & 07) + '0';
goto done;
}
if ((flag & VIS_NOSLASH) == 0)
More information about the libbsd
mailing list