Release libbsd 0.8.4

Fixes: https://bugs.freedesktop.org/94320

COPYING

@@ -1,10 +1,18 @@
-The following 4-clause BSD licenses are only for man pages, specifically
-for man/arc4random.3, man/tree.3 and man/getprogname.3.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
+Files:
+ *
+Copyright:
+ Copyright © 2004-2006, 2008-2017 Guillem Jover <guillem@hadrons.org>
+License: BSD-3-clause
 
+Files:
+ man/arc4random.3bsd
+ man/tree.3bsd
+Copyright:
  Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
  All rights reserved.
-
+License: BSD-4-clause-Niels-Provos
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -18,7 +26,7 @@ for man/arc4random.3, man/tree.3 and man/getprogname.3.
       This product includes software developed by Niels Provos.
  4. The name of the author may not be used to endorse or promote products
     derived from this software without specific prior written permission.
-
+ .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -30,11 +38,12 @@ for man/arc4random.3, man/tree.3 and man/getprogname.3.
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-    --
-
+Files:
+ man/getprogname.3bsd
+Copyright:
  Copyright © 2001 Christopher G. Demetriou
  All rights reserved.
-
+License: BSD-4-clause-Christopher-G-Demetriou
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -50,7 +59,7 @@ for man/arc4random.3, man/tree.3 and man/getprogname.3.
           information about NetBSD.
  4. The name of the author may not be used to endorse or promote products
     derived from this software without specific prior written permission.
-
+ .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -62,68 +71,88 @@ for man/arc4random.3, man/tree.3 and man/getprogname.3.
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-The rest of the licenses apply to code and/or man pages.
-
-
-    Copyright © 2004-2006, 2008-2015 Guillem Jover <guillem@hadrons.org>
+Files:
+ include/bsd/err.h
+ include/bsd/stdlib.h
+ include/bsd/unistd.h
+ src/bsd_getopt.c
+ src/err.c
+ src/fgetln.c
+ src/progname.c
+Copyright:
+ Copyright © 2005, 2008-2012 Guillem Jover <guillem@hadrons.org>
  Copyright © 2005 Hector Garcia Alvarez
  Copyright © 2005 Aurelien Jarno
  Copyright © 2006 Robert Millan
+License: BSD-3-clause
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce 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.
-
-    --
-
+Files:
+ include/bsd/netinet/ip_icmp.h
+ include/bsd/sys/bitstring.h
+ include/bsd/sys/queue.h
+ include/bsd/sys/time.h
+ include/bsd/timeconv.h
+ include/bsd/vis.h
+ man/bitstring.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
+ man/nlist.3bsd
+ man/queue.3bsd
+ 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
+ src/nlist.c
+ src/radixsort.c
+ src/setmode.c
+ src/strmode.c
+ src/strnstr.c
+ src/unvis.c
+ src/vis.c
+Copyright:
  Copyright © 1980, 1982, 1986, 1989-1994
      The Regents of the University of California.  All rights reserved.
  Copyright © 2001 Mike Barcroft <mike@FreeBSD.org>
-
+ .
  Some code is derived from software contributed to Berkeley by
  the American National Standards Committee X3, on Information
  Processing Systems.
-
+ .
  Some code is derived from software contributed to Berkeley by
  Peter McIlroy.
-
+ .
  Some code is derived from software contributed to Berkeley by
  Ronnie Kon at Mindcraft Inc., Kevin Lew and Elmer Yglesias.
-
+ .
  Some code is derived from software contributed to Berkeley by
  Dave Borman at Cray Research, Inc.
-
+ .
  Some code is derived from software contributed to Berkeley by
  Paul Vixie.
-
+ .
  Some code is derived from software contributed to Berkeley by
  Chris Torek.
-
-    © UNIX System Laboratories, Inc.
+ .
+ Copyright © UNIX System Laboratories, Inc.
  All or some portions of this file are derived from material licensed
  to the University of California by American Telephone and Telegraph
  Co. or Unix System Laboratories, Inc. and are reproduced herein with
  the permission of UNIX System Laboratories, Inc.
-
+License: BSD-3-clause-Regents
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -135,7 +164,7 @@ The rest of the licenses apply to code and/or man pages.
  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
@@ -148,18 +177,14 @@ The rest of the licenses apply to code and/or man pages.
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-    --
-
+Files:
+ include/bsd/libutil.h
+Copyright:
  Copyright © 1996  Peter Wemm <peter@FreeBSD.org>.
  All rights reserved.
  Copyright © 2002 Networks Associates Technology, Inc.
  All rights reserved.
-
-    Portions of this software were developed for the FreeBSD Project by
-    ThinkSec AS and NAI Labs, the Security Research Division of Network
-    Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
-    ("CBOSS"), as part of the DARPA CHATS research program.
-
+License: BSD-3-clause-Peter-Wemm
  Redistribution and use in source and binary forms, with or without
  modification, is permitted provided that the following conditions
  are met:
@@ -171,7 +196,7 @@ The rest of the licenses apply to code and/or man pages.
  3. The name of the author may not be used to endorse or promote
     products derived from this software without specific prior written
     permission.
-
+ .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -184,11 +209,43 @@ The rest of the licenses apply to code and/or man pages.
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-    --
+Files:
+ man/timeradd.3bsd
+Copyright:
+ Copyright © 2009 Jukka Ruohonen <jruohonen@iki.fi>
+ Copyright © 1999 Kelly Yancey <kbyanc@posi.net>
+ All rights reserved.
+License: BSD-3-clause-John-Birrell
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce 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 author nor the names of any co-contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
 
+Files:
+ man/setproctitle.3bsd
+Copyright:
  Copyright © 1995 Peter Wemm <peter@FreeBSD.org>
  All rights reserved.
-
+License: BSD-5-clause-Peter-Wemm
  Redistribution and use in source and binary forms, with or without
  modification, is permitted provided that the following conditions
  are met:
@@ -205,26 +262,37 @@ The rest of the licenses apply to code and/or man pages.
  5. Modifications may be freely made to this file providing the above
     conditions are met.
 
-    --
-
-    Copyright © 1994, 1997-2000, 2002, 2008 The NetBSD Foundation, Inc.
+Files:
+ include/bsd/stringlist.h
+ man/fmtcheck.3bsd
+ man/humanize_number.3bsd
+ man/stringlist.3bsd
+ man/timeval.3bsd
+ src/fmtcheck.c
+ src/humanize_number.c
+ src/stringlist.c
+Copyright:
+ Copyright © 1994, 1997-2000, 2002, 2008, 2010 The NetBSD Foundation, Inc.
  All rights reserved.
-
+ .
  Some code was contributed to The NetBSD Foundation by Allen Briggs.
-
+ .
  Some code was contributed to The NetBSD Foundation by Luke Mewburn.
-
+ .
  Some code is derived from software contributed to The NetBSD Foundation
  by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  NASA Ames Research Center, by Luke Mewburn and by Tomas Svensson.
-
+ .
  Some code is derived from software contributed to The NetBSD Foundation
  by Julio M. Merino Vidal, developed as part of Google's Summer of Code
  2005 program.
-
+ .
  Some code is derived from software contributed to The NetBSD Foundation
  by Christos Zoulas.
-
+ .
+ Some code is derived from software contributed to The NetBSD Foundation
+ by Jukka Ruohonen.
+License: BSD-2-clause-NetBSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -233,7 +301,7 @@ The rest of the licenses apply to code and/or man pages.
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
-
+ .
  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -246,46 +314,72 @@ The rest of the licenses apply to code and/or man pages.
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-    --
-
+Files:
+ include/bsd/sys/endian.h
+ man/byteorder.3bsd
+ man/closefrom.3bsd
+ man/expand_number.3bsd
+ man/flopen.3bsd
+ man/getpeereid.3bsd
+ man/pidfile.3bsd
+ src/expand_number.c
+ src/hash/sha512.h
+ src/hash/sha512c.c
+ src/pidfile.c
+ src/reallocf.c
+ src/timeconv.c
+Copyright:
  Copyright © 1998, M. Warner Losh <imp@freebsd.org>
  All rights reserved.
-
+ .
  Copyright © 2001 Dima Dorfman.
  All rights reserved.
-
+ .
  Copyright © 2001 FreeBSD Inc.
  All rights reserved.
-
+ .
  Copyright © 2002 Thomas Moestl <tmm@FreeBSD.org>
  All rights reserved.
-
+ .
+ Copyright © 2002 Mike Barcroft <mike@FreeBSD.org>
+ All rights reserved.
+ .
  Copyright © 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  All rights reserved.
-
+ .
  Copyright © 2005 Colin Percival
  All rights reserved.
-
+ .
  Copyright © 2007 Eric Anderson <anderson@FreeBSD.org>
  Copyright © 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  All rights reserved.
-
+ .
  Copyright © 2007 Dag-Erling Coïdan Smørgrav
  All rights reserved.
-
+ .
  Copyright © 2009 Advanced Computing Technologies LLC
  Written by: John H. Baldwin <jhb@FreeBSD.org>
  All rights reserved.
+ .
+ Copyright © 2011 Guillem Jover <guillem@hadrons.org>
+License: BSD-2-clause
 
+Files:
+ src/flopen.c
+Copyright:
+ Copyright © 2007 Dag-Erling Coïdan Smørgrav
+ All rights reserved.
+License: BSD-2-clause-verbatim
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
  1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
+    notice, this list of conditions and the following disclaimer
+    in this position and unchanged.
  2. Redistributions in binary form must 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
@@ -298,14 +392,17 @@ The rest of the licenses apply to code and/or man pages.
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-    --
-
+Files:
+ include/bsd/sys/tree.h
+ man/fparseln.3bsd
+ src/fparseln.c
+Copyright:
  Copyright © 1997 Christos Zoulas.
  All rights reserved.
-
+ .
  Copyright © 2002 Niels Provos <provos@citi.umich.edu>
  All rights reserved.
-
+License: BSD-2-clause-author
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -314,7 +411,7 @@ The rest of the licenses apply to code and/or man pages.
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
-
+ .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -326,40 +423,34 @@ The rest of the licenses apply to code and/or man pages.
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-    --
-
-    Copyright © 2007 Dag-Erling Coïdan Smørgrav
-    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
-       in this position and unchanged.
-    2. Redistributions in binary form must 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.
-
-    --
-
+Files:
+ include/bsd/readpassphrase.h
+ man/readpassphrase.3bsd
+ man/strlcpy.3bsd
+ man/strtonum.3bsd
+ src/arc4random.c
+ src/arc4random_openbsd.h
+ src/arc4random_uniform.c
+ src/arc4random_unix.h
+ src/closefrom.c
+ src/getentropy_aix.c
+ src/getentropy_bsd.c
+ src/getentropy_hpux.c
+ src/getentropy_hurd.c
+ src/getentropy_linux.c
+ src/getentropy_osx.c
+ src/getentropy_solaris.c
+ src/readpassphrase.c
+ src/reallocarray.c
+ src/strlcat.c
+ src/strlcpy.c
+ src/strtonum.c
+Copyright:
  Copyright © 2004 Ted Unangst and Todd Miller
  All rights reserved.
-
+ .
  Copyright © 1996 David Mazieres <dm@uun.org>
-    Copyright © 1998, 2000, 2004-2005, 2010, 2012-2014
+ Copyright © 1998, 2000-2002, 2004-2005, 2007, 2010, 2012-2015
      Todd C. Miller <Todd.Miller@courtesan.com>
  Copyright © 2004 Ted Unangst
  Copyright © 2008 Damien Miller <djm@openbsd.org>
@@ -371,11 +462,11 @@ The rest of the licenses apply to code and/or man pages.
  Copyright © 2014 Theo de Raadt <deraadt@openbsd.org>
  Copyright © 2015 Michael Felt <aixtools@gmail.com>
  Copyright © 2015 Guillem Jover <guillem@hadrons.org>
-
+License: ISC
  Permission to use, copy, modify, and distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies.
-
+ .
  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
@@ -384,34 +475,15 @@ The rest of the licenses apply to code and/or man pages.
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-    --
-
-    Copyright © 2000-2002, 2007 Todd C. Miller <Todd.Miller@courtesan.com>
-
-    Permission to use, copy, modify, and distribute this software for any
-    purpose with or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-    Sponsored in part by the Defense Advanced Research Projects
-    Agency (DARPA) and Air Force Research Laboratory, Air Force
-    Materiel Command, USAF, under agreement number F39502-99-1-0512
-
-    --
-
+Files:
+ src/inet_net_pton.c
+Copyright:
  Copyright © 1996 by Internet Software Consortium.
-
+License: ISC-Original
  Permission to use, copy, modify, and distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies.
-
+ .
  THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
  ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
  OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
@@ -421,46 +493,12 @@ The rest of the licenses apply to code and/or man pages.
  ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  SOFTWARE.
 
-    --
-
-    Copyright © 1996, David Mazieres <dm@uun.org>
-    Copyright © 2008, Damien Miller <djm@openbsd.org>
-
-    Permission to use, copy, modify, and distribute this software for any
-    purpose with or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    Modification and redistribution in source and binary forms is
-    permitted provided that due credit is given to the author and the
-    OpenBSD project (for instance by leaving this copyright notice
-    intact).
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-    This code is derived from section 17.1 of Applied Cryptography,
-    second edition, which describes a stream cipher allegedly
-    compatible with RSA Labs "RC4" cipher (the actual description of
-    which is a trade secret).  The same algorithm is used as a stream
-    cipher called "arcfour" in Tatu Ylonen's ssh package.
-
-    Here the stream cipher has been modified always to include the time
-    when initializing the state.  That makes it impossible to
-    regenerate the same random sequence twice, so this can't be used
-    for encryption, but will generate good random numbers.
-
-    RC4 is a registered trademark of RSA Laboratories.
-
-    --
-
+Files:
+ src/setproctitle.c
+Copyright:
  Copyright © 2010 William Ahern
  Copyright © 2012 Guillem Jover <guillem@hadrons.org>
-
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -468,10 +506,10 @@ The rest of the licenses apply to code and/or man pages.
  distribute, sublicense, and/or sell copies of the Software, and to permit
  persons to whom the Software is furnished to do so, subject to the
  following conditions:
-
+ .
  The above copyright notice and this permission notice shall be included
  in all copies or substantial portions of the Software.
-
+ .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
@@ -480,26 +518,78 @@ The rest of the licenses apply to code and/or man pages.
  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-    --
-
+Files:
+ include/bsd/md5.h
+ src/hash/md5.c
+Copyright:
+ None
+License: public-domain-Colin-Plumb
  This code implements the MD5 message-digest algorithm.
  The algorithm is due to Ron Rivest. This code was
  written by Colin Plumb in 1993, no copyright is claimed.
  This code is in the public domain; do with it what you wish.
 
-    Equivalent code is available from RSA Data Security, Inc.
-    This code has been tested against that, and is equivalent,
-    except that you don't need to include two pages of legalese
-    with every copy.
-
-    To compute the message digest of a chunk of bytes, declare an
-    MD5Context structure, pass it to MD5Init, call MD5Update as
-    needed on buffers full of bytes, and then call MD5Final, which
-    will fill a supplied 16-byte array with the digest.
-
-    --
+Files:
+ src/explicit_bzero.c
+ src/chacha_private.h
+Copyright:
+ None
+License: public-domain
+ Public domain.
 
+Files:
+ man/mdX.3bsd
+ src/hash/md5hl.c
+ src/hash/helper.c
+Copyright:
+ None
+License: Beerware
  "THE BEER-WARE LICENSE" (Revision 42):
  <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
  can do whatever you want with this stuff. If we meet some day, and you think
  this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce 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.
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must 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.

README

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

TODO

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

configure.ac

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

include/Makefile.am

@@ -6,6 +6,7 @@ nobase_include_HEADERS = \
 	bsd/sys/endian.h \
 	bsd/sys/poll.h \
 	bsd/sys/queue.h \
+	bsd/sys/time.h \
 	bsd/sys/tree.h \
 	bsd/netinet/ip_icmp.h \
 	bsd/bitstring.h \

include/bsd/bsd.h

@@ -27,10 +27,12 @@
 #ifndef LIBBSD_H
 #define LIBBSD_H
 
+#ifdef LIBBSD_OVERLAY
+#warning "This header is meant to be used w/o the libbsd overlay."
+#else
 /*
  * Include all bsd compat headers.
  */
-
 #include <bsd/sys/cdefs.h>
 #include <bsd/sys/queue.h>
 #include <bsd/sys/tree.h>
@@ -40,5 +42,6 @@
 #include <bsd/err.h>
 #include <bsd/getopt.h>
 #include <bsd/md5.h>
+#endif
 
 #endif

include/bsd/err.h

@@ -34,7 +34,11 @@
 #ifndef LIBBSD_ERR_H
 #define LIBBSD_ERR_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 
 #include <stdarg.h>
 

include/bsd/libutil.h

@@ -36,8 +36,8 @@
  * $FreeBSD: src/lib/libutil/libutil.h,v 1.47 2008/04/23 00:49:12 scf Exp $
  */
 
-#ifndef _LIBUTIL_H_
-#define _LIBUTIL_H_
+#ifndef LIBBSD_LIBUTIL_H
+#define LIBBSD_LIBUTIL_H
 
 #include <features.h>
 #include <sys/cdefs.h>
@@ -86,4 +86,4 @@ __END_DECLS
 #define FPARSELN_UNESCREST	0x08
 #define FPARSELN_UNESCALL	0x0f
 
-#endif /* !_LIBUTIL_H_ */
+#endif /* !LIBBSD_LIBUTIL_H */

include/bsd/md5.h

@@ -12,8 +12,8 @@
  * with every copy.
  */
 
-#ifndef _MD5_H_
-#define _MD5_H_
+#ifndef LIBBSD_MD5_H
+#define LIBBSD_MD5_H
 
 #include <stdint.h>
 
@@ -28,6 +28,7 @@ typedef struct MD5Context {
 } MD5_CTX;
 
 #include <sys/cdefs.h>
+#include <sys/types.h>
 
 __BEGIN_DECLS
 void	 MD5Init(MD5_CTX *);
@@ -50,4 +51,4 @@ char	*MD5Data(const uint8_t *, size_t, char *)
 		__attribute__((__bounded__(__minbytes__,3,MD5_DIGEST_STRING_LENGTH)));
 __END_DECLS
 
-#endif /* _MD5_H_ */
+#endif /* LIBBSD_MD5_H */

include/bsd/netinet/ip_icmp.h

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

include/bsd/nlist.h

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

include/bsd/readpassphrase.h

@@ -20,8 +20,8 @@
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
-#ifndef _READPASSPHRASE_H_
-#define _READPASSPHRASE_H_
+#ifndef LIBBSD_READPASSPHRASE_H
+#define LIBBSD_READPASSPHRASE_H
 
 #define RPP_ECHO_OFF    0x00		/* Turn off echo (default). */
 #define RPP_ECHO_ON     0x01		/* Leave echo on. */
@@ -38,4 +38,4 @@ __BEGIN_DECLS
 char * readpassphrase(const char *, char *, size_t, int);
 __END_DECLS
 
-#endif /* !_READPASSPHRASE_H_ */
+#endif /* !LIBBSD_READPASSPHRASE_H */

include/bsd/stdio.h

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

include/bsd/stdlib.h

@@ -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);
 

include/bsd/stringlist.h

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

include/bsd/sys/bitstring.h

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

include/bsd/sys/cdefs.h

@@ -24,15 +24,40 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef __has_include
+#define __has_include 1
+#endif
+#ifndef __has_include_next
+#define __has_include_next 1
+#endif
+
 #ifdef LIBBSD_OVERLAY
+/*
+ * Some libc implementations do not have a <sys/cdefs.h>, in particular
+ * musl, try to handle this gracefully.
+ */
+#if __has_include_next(<sys/cdefs.h>)
 #include_next <sys/cdefs.h>
+#endif
 #else
+#if __has_include(<sys/cdefs.h>)
 #include <sys/cdefs.h>
 #endif
+#endif
 
 #ifndef LIBBSD_SYS_CDEFS_H
 #define LIBBSD_SYS_CDEFS_H
 
+#ifndef __BEGIN_DECLS
+#ifdef __cplusplus
+#define __BEGIN_DECLS	extern "C" {
+#define __END_DECLS	}
+#else
+#define __BEGIN_DECLS
+#define __END_DECLS
+#endif
+#endif
+
 /*
  * Some kFreeBSD headers expect those macros to be set for sanity checks.
  */
@@ -49,6 +74,14 @@
 #define LIBBSD_GCC_VERSION 0
 #endif
 
+#if LIBBSD_GCC_VERSION >= 0x0405
+#define LIBBSD_DEPRECATED(x) __attribute__((deprecated(x)))
+#elif LIBBSD_GCC_VERSION >= 0x0301
+#define LIBBSD_DEPRECATED(x) __attribute__((deprecated))
+#else
+#define LIBBSD_DEPRECATED(x)
+#endif
+
 #ifndef __dead2
 # if LIBBSD_GCC_VERSION >= 0x0207
 #  define __dead2 __attribute__((__noreturn__))

include/bsd/sys/endian.h

@@ -1,6 +1,9 @@
 /*
  * Copyright © 2011 Guillem Jover <guillem@hadrons.org>
  *
+ * Copyright © 2002 Thomas Moestl <tmm@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:
@@ -9,19 +12,18 @@
  * 2. Redistributions in binary form must reproduce 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.
+ * 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.
  */
 
 #ifdef LIBBSD_OVERLAY
@@ -49,32 +51,6 @@
 #define _PDP_ENDIAN __PDP_ENDIAN
 #endif
 
-/*
- * Copyright © 2002 Thomas Moestl <tmm@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.
- */
-
 #include <stdint.h>
 
 /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */

include/bsd/sys/queue.h

@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
+#ifndef LIBBSD_SYS_QUEUE_H
+#define LIBBSD_SYS_QUEUE_H
 
 #include <sys/cdefs.h>
 
@@ -691,4 +691,4 @@ struct {								\
 		(head2)->tqh_last = &(head2)->tqh_first;		\
 } while (0)
 
-#endif /* !_SYS_QUEUE_H_ */
+#endif /* !LIBBSD_SYS_QUEUE_H */

include/bsd/sys/time.h

@@ -0,0 +1,138 @@
+/*	$OpenBSD: time.h,v 1.36 2016/09/12 19:41:20 guenther Exp $	*/
+/*	$NetBSD: time.h,v 1.18 1996/04/23 10:29:33 mycroft Exp $	*/
+
+/*
+ * Copyright (c) 1982, 1986, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)time.h	8.2 (Berkeley) 7/10/94
+ */
+
+#ifdef LIBBSD_OVERLAY
+#include_next <sys/time.h>
+#else
+#include <sys/time.h>
+#endif
+
+#ifndef LIBBSD_SYS_TIME_H
+#define LIBBSD_SYS_TIME_H
+
+#ifndef TIMEVAL_TO_TIMESPEC
+#define	TIMEVAL_TO_TIMESPEC(tv, ts) {					\
+	(ts)->tv_sec = (tv)->tv_sec;					\
+	(ts)->tv_nsec = (tv)->tv_usec * 1000;				\
+}
+#endif
+
+#ifndef TIMESPEC_TO_TIMEVAL
+#define	TIMESPEC_TO_TIMEVAL(tv, ts) {					\
+	(tv)->tv_sec = (ts)->tv_sec;					\
+	(tv)->tv_usec = (ts)->tv_nsec / 1000;				\
+}
+#endif
+
+/* Operations on timevals. */
+#ifndef timerclear
+#define	timerclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
+#endif
+
+#ifndef timerisset
+#define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
+#endif
+
+#ifndef timercmp
+#define	timercmp(tvp, uvp, cmp)						\
+	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
+	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
+	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
+#endif
+
+#ifndef timeradd
+#define	timeradd(tvp, uvp, vvp)						\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec >= 1000000) {			\
+			(vvp)->tv_sec++;				\
+			(vvp)->tv_usec -= 1000000;			\
+		}							\
+	} while (0)
+#endif
+
+#ifndef timersub
+#define	timersub(tvp, uvp, vvp)						\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec < 0) {				\
+			(vvp)->tv_sec--;				\
+			(vvp)->tv_usec += 1000000;			\
+		}							\
+	} while (0)
+#endif
+
+/* Operations on timespecs. */
+#ifndef timespecclear
+#define	timespecclear(tsp)		(tsp)->tv_sec = (tsp)->tv_nsec = 0
+#endif
+
+#ifndef timespecisset
+#define	timespecisset(tsp)		((tsp)->tv_sec || (tsp)->tv_nsec)
+#endif
+
+#ifndef timespeccmp
+#define	timespeccmp(tsp, usp, cmp)					\
+	(((tsp)->tv_sec == (usp)->tv_sec) ?				\
+	    ((tsp)->tv_nsec cmp (usp)->tv_nsec) :			\
+	    ((tsp)->tv_sec cmp (usp)->tv_sec))
+#endif
+
+#ifndef timespecadd
+#define	timespecadd(tsp, usp, vsp)					\
+	do {								\
+		(vsp)->tv_sec = (tsp)->tv_sec + (usp)->tv_sec;		\
+		(vsp)->tv_nsec = (tsp)->tv_nsec + (usp)->tv_nsec;	\
+		if ((vsp)->tv_nsec >= 1000000000L) {			\
+			(vsp)->tv_sec++;				\
+			(vsp)->tv_nsec -= 1000000000L;			\
+		}							\
+	} while (0)
+#endif
+
+#ifndef timespecsub
+#define	timespecsub(tsp, usp, vsp)					\
+	do {								\
+		(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;		\
+		(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec;	\
+		if ((vsp)->tv_nsec < 0) {				\
+			(vsp)->tv_sec--;				\
+			(vsp)->tv_nsec += 1000000000L;			\
+		}							\
+	} while (0)
+#endif
+
+#endif

include/bsd/sys/tree.h

@@ -27,8 +27,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_SYS_TREE_H_
-#define	_SYS_TREE_H_
+#ifndef LIBBSD_SYS_TREE_H
+#define LIBBSD_SYS_TREE_H
 
 #include <sys/cdefs.h>
 
@@ -762,4 +762,4 @@ name##_RB_MINMAX(struct name *head, int val)				\
 	    ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL);	\
 	     (x) = (y))
 
-#endif	/* _SYS_TREE_H_ */
+#endif /* LIBBSD_SYS_TREE_H */

include/bsd/timeconv.h

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

include/bsd/unistd.h

@@ -34,7 +34,11 @@
 #ifndef LIBBSD_UNISTD_H
 #define LIBBSD_UNISTD_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/stat.h>
 
 #ifndef S_ISTXT

include/bsd/vis.h

@@ -30,8 +30,8 @@
  * $FreeBSD: src/include/vis.h,v 1.11 2003/10/30 10:40:49 phk Exp $
  */
 
-#ifndef _VIS_H_
-#define	_VIS_H_
+#ifndef LIBBSD_VIS_H
+#define LIBBSD_VIS_H
 
 #include <sys/types.h>
 
@@ -85,4 +85,4 @@ ssize_t strnunvis(char *, const char *, size_t);
 int	unvis(char *, int, int *, int);
 __END_DECLS
 
-#endif /* !_VIS_H_ */
+#endif /* !LIBBSD_VIS_H */

man/.gitignore

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

man/LIST_EMPTY.3bsd

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

man/LIST_ENTRY.3bsd

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

man/LIST_FIRST.3bsd

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

man/LIST_FOREACH.3bsd

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

man/LIST_FOREACH_FROM.3bsd

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

man/LIST_FOREACH_FROM_SAFE.3bsd

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

man/LIST_FOREACH_SAFE.3bsd

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

man/LIST_HEAD.3bsd

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

man/LIST_HEAD_INITIALIZER.3bsd

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

man/LIST_INIT.3bsd

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

man/LIST_INSERT_AFTER.3bsd

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

man/LIST_INSERT_BEFORE.3bsd

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

man/LIST_INSERT_HEAD.3bsd

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

man/LIST_NEXT.3bsd

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

man/LIST_PREV.3bsd

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

man/LIST_REMOVE.3bsd

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

man/LIST_SWAP.3bsd

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

man/Makefile.am

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

man/RB_EMPTY.3bsd

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

man/RB_ENTRY.3bsd

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

man/RB_FIND.3bsd

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

man/RB_FOREACH.3bsd

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

man/RB_FOREACH_REVERSE.3bsd

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

man/RB_GENERATE.3bsd

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

man/RB_GENERATE_STATIC.3bsd

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

man/RB_HEAD.3bsd

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

man/RB_INIT.3bsd

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

man/RB_INITIALIZER.3bsd

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

man/RB_INSERT.3bsd

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

man/RB_LEFT.3bsd

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

man/RB_MAX.3bsd

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

man/RB_MIN.3bsd

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

man/RB_NEXT.3bsd

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

man/RB_NFIND.3bsd

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

man/RB_PARENT.3bsd

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

man/RB_PREV.3bsd

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

man/RB_PROTOTYPE.3bsd

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

man/RB_PROTOTYPE_STATIC.3bsd

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

man/RB_REMOVE.3bsd

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

man/RB_RIGHT.3bsd

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

man/RB_ROOT.3bsd

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

man/SLIST_EMPTY.3bsd

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

man/SLIST_ENTRY.3bsd

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

man/SLIST_FIRST.3bsd

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

man/SLIST_FOREACH.3bsd

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

man/SLIST_FOREACH_FROM.3bsd

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

man/SLIST_FOREACH_FROM_SAFE.3bsd

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

man/SLIST_FOREACH_SAFE.3bsd

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

man/SLIST_HEAD.3bsd

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

man/SLIST_HEAD_INITIALIZER.3bsd

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

man/SLIST_INIT.3bsd

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

man/SLIST_INSERT_AFTER.3bsd

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

man/SLIST_INSERT_HEAD.3bsd

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

man/SLIST_NEXT.3bsd

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

man/SLIST_REMOVE.3bsd

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

man/SLIST_REMOVE_AFTER.3bsd

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

man/SLIST_REMOVE_HEAD.3bsd

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

man/SLIST_SWAP.3bsd

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

man/SPLAY_EMPTY.3bsd

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

man/SPLAY_ENTRY.3bsd

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

man/SPLAY_FIND.3bsd

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

man/SPLAY_FOREACH.3bsd

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

man/SPLAY_GENERATE.3bsd

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

man/SPLAY_HEAD.3bsd

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

man/SPLAY_INIT.3bsd

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

man/SPLAY_INITIALIZER.3bsd

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

man/SPLAY_INSERT.3bsd

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

man/SPLAY_LEFT.3bsd

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

man/SPLAY_MAX.3bsd

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

man/SPLAY_MIN.3bsd

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

man/SPLAY_NEXT.3bsd

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

man/SPLAY_PROTOTYPE.3bsd

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

man/SPLAY_REMOVE.3bsd

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

man/SPLAY_RIGHT.3bsd

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

man/SPLAY_ROOT.3bsd

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