Release libbsd 0.9.0

This function has the same problems as fgetln() which is already marked
as deprecated.

.gitignore

@@ -5,6 +5,9 @@ ChangeLog
 *.o
 *.so*
 *.a
+*.log
+*.trs
+.dirstamp
 .deps/
 .libs/
 Makefile

Makefile.am

@@ -12,5 +12,5 @@ EXTRA_DIST = \
 dist-hook:
 	echo $(VERSION) >$(distdir)/.dist-version
 	if [ -d .git ]; then \
-	  git log --stat -C >$(distdir)/ChangeLog; \
+	  XDG_CONFIG_HOME= HOME= git log --stat -C >$(distdir)/ChangeLog; \
 	fi

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>
+The master repository can be browsed at:
-  <git://anongit.freedesktop.org/git/libbsd>
+
+  <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,15 +2,22 @@
 
 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])
 
-AM_INIT_AUTOMAKE([1.8 foreign nostdinc no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.9 foreign nostdinc subdir-objects no-dist-gzip dist-xz])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
                             [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
 
+LIBBSD_ABI_MAJOR=0
+LIBBSD_ABI_MINOR=9
+LIBBSD_ABI_PATCH=0
+
+LIBBSD_ABI="$LIBBSD_ABI_MAJOR:$LIBBSD_ABI_MINOR:$LIBBSD_ABI_PATCH"
+AC_SUBST([LIBBSD_ABI])
+
 # Check and store if we got user supplied variables
 user_CFLAGS=${CFLAGS-unset}
 
@@ -31,18 +38,37 @@ if test "$user_CFLAGS" = unset && test "$GCC" = yes; then
 fi
 
 # Checks for libraries.
+AC_CHECK_LIB([testu01], [unif01_CreateExternGenBits],
+             [TESTU01_LIBS="-ltestu01"])
+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 dir.h dirent.h])
+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
 
@@ -53,6 +79,50 @@ AC_CHECK_DECL([F_CLOSEM],
               [#include <limits.h>
                #include <fcntl.h>])
 
+AC_CACHE_CHECK(
+	[for GNU .init_array section support],
+	[libbsd_cv_gnu_init_array_support],
+	[AC_RUN_IFELSE(
+		[AC_LANG_SOURCE(
+[[
+static int rc = 1;
+static void init(int argc) { if (argc == 1) rc = 0; }
+void (*init_func)(int argc) __attribute__((section(".init_array"))) = init;
+int main() { return rc; }
+]]
+		)],
+		[libbsd_cv_gnu_init_array_support=yes],
+		[libbsd_cv_gnu_init_array_support=no],
+		[AC_PREPROC_IFELSE(
+			[AC_LANG_SOURCE(
+[[
+/* Look for a known libc that supports .init_array with the GNU extension
+ * to pass main() arguments to the init functions. */
+#include <stdlib.h>
+#if defined __GLIBC_PREREQ
+#  if __GLIBC_PREREQ(2, 4)
+/* glibc supports GNU .init_array since 2.4. */
+#  else
+#    error glibc does not support GNU .init_array
+#  endif
+#else
+/*
+ * Basic SysV ABI .init_array support, init functions do not get arguments:
+ * - Bionic since its inception.
+ * - uClibc since 0.9.29.
+ */
+#  error unknown whether libc supports GNU .init_array
+#endif
+]]
+			)],
+			[libbsd_cv_gnu_init_array_support=yes],
+			[libbsd_cv_gnu_init_array_support=no])
+		]
+	)]
+)
+AM_CONDITIONAL([BUILD_LIBBSD_CTOR],
+               [test "$libbsd_cv_gnu_init_array_support" = yes])
+
 # Checks for library functions.
 AC_MSG_CHECKING([for program_invocation_short_name])
 AC_LINK_IFELSE(
@@ -65,14 +135,16 @@ AC_LINK_IFELSE(
 
 AC_MSG_CHECKING([for __progname])
 AC_LINK_IFELSE(
-	[AC_LANG_PROGRAM([[]],
+	[AC_LANG_PROGRAM([[extern char *__progname;]],
-	                 [[extern char *__progname;
+	                 [[printf("%s", __progname);]])],
-	                   const char *p = __progname;]])],
 	[AC_DEFINE([HAVE___PROGNAME], [1], [Define to 1 if you have __progname])
 	 AC_MSG_RESULT([yes])],
 	[AC_MSG_RESULT([no])])
 
-AC_CHECK_FUNCS([clearenv dirfd __fpurge getexecname getline sysconf])
+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"])
 
 AC_CONFIG_FILES([
 	Makefile
@@ -80,6 +152,7 @@ AC_CONFIG_FILES([
 	man/Makefile
 	src/Makefile
 	src/libbsd.pc
+	src/libbsd-ctor.pc
 	src/libbsd-overlay.pc
 	test/Makefile
 ])

include/Makefile.am

@@ -6,12 +6,14 @@ nobase_include_HEADERS = \
 	bsd/sys/endian.h \
 	bsd/sys/poll.h \
 	bsd/sys/queue.h \
+	bsd/sys/time.h \
 	bsd/sys/tree.h \
 	bsd/netinet/ip_icmp.h \
 	bsd/bitstring.h \
 	bsd/bsd.h \
 	bsd/err.h \
 	bsd/getopt.h \
+	bsd/inttypes.h \
 	bsd/libutil.h \
 	bsd/md5.h \
 	bsd/nlist.h \
@@ -19,6 +21,8 @@ nobase_include_HEADERS = \
 	bsd/stdio.h \
 	bsd/stdlib.h \
 	bsd/string.h \
+	bsd/stringlist.h \
+	bsd/timeconv.h \
 	bsd/unistd.h \
 	bsd/vis.h \
 	bsd/wchar.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,15 +34,23 @@
 #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>
 
 __BEGIN_DECLS
-extern void warnc (int code, const char *format, ...);
+void warnc(int code, const char *format, ...)
-extern void vwarnc (int code, const char *format, va_list ap);
+	__printflike(2, 3);
-extern void errc (int status, int code, const char *format, ...);
+void vwarnc(int code, const char *format, va_list ap)
-extern void verrc (int status, int code, const char *format, va_list ap);
+	__printflike(2, 0);
+void errc(int status, int code, const char *format, ...)
+	__printflike(3, 4);
+void verrc(int status, int code, const char *format, va_list ap)
+	__printflike(3, 0);
 __END_DECLS
 
 #endif

include/bsd/inttypes.h

@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2018 Guillem Jover <guillem@hadrons.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef LIBBSD_OVERLAY
+#include_next <inttypes.h>
+#else
+#include <inttypes.h>
+#endif
+
+#ifndef LIBBSD_INTTYPES_H
+#define LIBBSD_INTTYPES_H
+
+#ifdef LIBBSD_OVERLAY
+#include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
+
+__BEGIN_DECLS
+intmax_t strtoi(const char *__restrict nptr, char **__restrict endptr,
+                int base, intmax_t lo, intmax_t hi, int *rstatus);
+uintmax_t strtou(const char *__restrict nptr, char **__restrict endptr,
+                 int base, uintmax_t lo, uintmax_t hi, int *rstatus);
+__END_DECLS
+
+#endif

include/bsd/libutil.h

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

include/bsd/md5.h

@@ -12,29 +12,36 @@
  * with every copy.
  */
 
-#ifndef _MD5_H_
+#ifndef LIBBSD_MD5_H
-#define _MD5_H_
+#define LIBBSD_MD5_H
+
+#include <stdint.h>
 
 #define	MD5_BLOCK_LENGTH		64
 #define	MD5_DIGEST_LENGTH		16
 #define	MD5_DIGEST_STRING_LENGTH	(MD5_DIGEST_LENGTH * 2 + 1)
 
 typedef struct MD5Context {
-	u_int32_t state[4];			/* state */
+	uint32_t state[4];			/* state */
-	u_int64_t count;			/* number of bits, mod 2^64 */
+	uint64_t count;				/* number of bits, mod 2^64 */
-	u_int8_t buffer[MD5_BLOCK_LENGTH];	/* input buffer */
+	uint8_t buffer[MD5_BLOCK_LENGTH];	/* input buffer */
 } MD5_CTX;
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
+#include <sys/types.h>
 
 __BEGIN_DECLS
 void	 MD5Init(MD5_CTX *);
-void	 MD5Update(MD5_CTX *, const u_int8_t *, size_t)
+void	 MD5Update(MD5_CTX *, const uint8_t *, size_t)
 		__attribute__((__bounded__(__string__,2,3)));
 void	 MD5Pad(MD5_CTX *);
-void	 MD5Final(u_int8_t [MD5_DIGEST_LENGTH], MD5_CTX *)
+void	 MD5Final(uint8_t [MD5_DIGEST_LENGTH], MD5_CTX *)
 		__attribute__((__bounded__(__minbytes__,1,MD5_DIGEST_LENGTH)));
-void	 MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH])
+void	 MD5Transform(uint32_t [4], const uint8_t [MD5_BLOCK_LENGTH])
 		__attribute__((__bounded__(__minbytes__,1,4)))
 		__attribute__((__bounded__(__minbytes__,2,MD5_BLOCK_LENGTH)));
 char	*MD5End(MD5_CTX *, char *)
@@ -43,9 +50,9 @@ char	*MD5File(const char *, char *)
 		__attribute__((__bounded__(__minbytes__,2,MD5_DIGEST_STRING_LENGTH)));
 char	*MD5FileChunk(const char *, char *, off_t, off_t)
 		__attribute__((__bounded__(__minbytes__,2,MD5_DIGEST_STRING_LENGTH)));
-char	*MD5Data(const u_int8_t *, size_t, char *)
+char	*MD5Data(const uint8_t *, size_t, char *)
 		__attribute__((__bounded__(__string__,1,2)))
 		__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_
+#ifndef LIBBSD_NETINET_IP_ICMP_H
-#define _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;
+	uint32_t ira_addr;
-	u_int32_t ira_preference;
+	uint32_t ira_preference;
 };
 
 /*
  * Structure of an icmp header.
  */
 struct icmp {
-	u_char	icmp_type;		/* type of message, see below */
+	unsigned char	icmp_type;	/* type of message, see below */
-	u_char	icmp_code;		/* type sub code */
+	unsigned char	icmp_code;	/* type sub code */
-	u_short	icmp_cksum;		/* ones complement cksum of struct */
+	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;
+			unsigned char irt_num_addrs;
-			u_char irt_wpa;
+			unsigned char irt_wpa;
-			u_int16_t irt_lifetime;
+			uint16_t irt_lifetime;
 		} ih_rtradv;
 	} icmp_hun;
 #define	icmp_pptr	icmp_hun.ih_pptr
@@ -100,7 +100,7 @@ struct icmp {
 			/* options and then 64 bits of data */
 		} id_ip;
 		struct icmp_ra_addr id_radv;
-		u_int32_t id_mask;
+		uint32_t id_mask;
 		char	id_data[1];
 	} icmp_dun;
 #define	icmp_otime	icmp_dun.id_ts.its_otime

include/bsd/nlist.h

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

include/bsd/readpassphrase.h

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

include/bsd/stdio.h

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004, 2005, 2009, 2011 Guillem Jover <guillem@hadrons.org>
+ * Copyright © 2004-2005, 2009, 2011-2013 Guillem Jover <guillem@hadrons.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,24 +24,57 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(__need_FILE) || defined(__need___FILE)
+#define LIBBSD_STDIO_H_SKIP
+#endif
+
 #ifdef LIBBSD_OVERLAY
 #include_next <stdio.h>
 #else
 #include <stdio.h>
 #endif
 
+#ifndef LIBBSD_STDIO_H_SKIP
 #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
 const char *fmtcheck(const char *, const char *);
 
-char *fgetln(FILE *fp, size_t *lenp);
+/* 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)
+	LIBBSD_DEPRECATED("This functions cannot be safely ported, "
+	                  "use getline(3) instead, as it is supported "
+	                  "by GNU and POSIX.1-2008.");
+
+/*
+ * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations,
+ * because seekfn() there wrongly uses fpos_t, assuming it's an integral
+ * type, and any code using that on a system where fpos_t is a struct
+ * (such as GNU-based systems or NetBSD) will fail to build. In which case,
+ * as the code has to be modified anyway, we might just as well use the
+ * correct declaration here.
+ */
+FILE *funopen(const void *cookie,
+              int (*readfn)(void *cookie, char *buf, int size),
+              int (*writefn)(void *cookie, const char *buf, int size),
+              off_t (*seekfn)(void *cookie, off_t offset, int whence),
+              int (*closefn)(void *cookie));
+
+#define fropen(cookie, fn) funopen(cookie, fn, NULL, NULL, NULL)
+#define fwopen(cookie, fn) funopen(cookie, NULL, fn, NULL, NULL)
 
 int fpurge(FILE *fp);
 __END_DECLS
 
 #endif
+#endif
+#undef LIBBSD_STDIO_H_SKIP

include/bsd/stdlib.h

@@ -42,16 +42,20 @@
 #ifndef LIBBSD_STDLIB_H
 #define LIBBSD_STDLIB_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/stat.h>
 #include <stdint.h>
 
 __BEGIN_DECLS
-u_int32_t arc4random();
+uint32_t arc4random(void);
-void arc4random_stir();
+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);
-u_int32_t arc4random_uniform(u_int32_t upper_bound);
+uint32_t arc4random_uniform(uint32_t upper_bound);
 
 int dehumanize_number(const char *str, int64_t *size);
 
@@ -67,9 +71,15 @@ int sradixsort(const unsigned char **base, int nmemb,
                const unsigned char *table, unsigned endbyte);
 
 void *reallocf(void *ptr, size_t size);
+#if !defined(__GLIBC__) || \
+    (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE)))
+void *reallocarray(void *ptr, size_t nmemb, size_t size);
+#endif
 
 long long strtonum(const char *nptr, long long minval, long long maxval,
                    const char **errstr);
+
+char *getbsize(int *headerlenp, long *blocksizep);
 __END_DECLS
 
 #endif

include/bsd/string.h

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

include/bsd/stringlist.h

@@ -0,0 +1,59 @@
+/*	$NetBSD: stringlist.h,v 1.6 2006/07/27 15:37:19 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1994 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef LIBBSD_STRINGLIST_H
+#define LIBBSD_STRINGLIST_H
+
+#ifdef LIBBSD_OVERLAY
+#include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
+#include <sys/types.h>
+
+/*
+ * Simple string list
+ */
+typedef struct _stringlist {
+	char	**sl_str;
+	size_t	  sl_max;
+	size_t	  sl_cur;
+} StringList;
+
+__BEGIN_DECLS
+StringList	*sl_init(void);
+int		 sl_add(StringList *, char *);
+void		 sl_free(StringList *, int);
+char		*sl_find(StringList *, const char *);
+int		 sl_delete(StringList *, const char *, int);
+__END_DECLS
+
+#endif /* LIBBSD_STRINGLIST_H */

include/bsd/sys/bitstring.h

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

include/bsd/sys/cdefs.h

@@ -24,15 +24,48 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef __has_include
+#define __has_include(x) 1
+#endif
+#ifndef __has_include_next
+#define __has_include_next(x) 1
+#endif
+
 #ifdef LIBBSD_OVERLAY
+/*
+ * Some libc implementations do not have a <sys/cdefs.h>, in particular
+ * musl, try to handle this gracefully.
+ */
+#if __has_include_next(<sys/cdefs.h>)
 #include_next <sys/cdefs.h>
+#endif
 #else
+#if __has_include(<sys/cdefs.h>)
 #include <sys/cdefs.h>
 #endif
+#endif
 
 #ifndef LIBBSD_SYS_CDEFS_H
 #define LIBBSD_SYS_CDEFS_H
 
+#ifndef __BEGIN_DECLS
+#ifdef __cplusplus
+#define __BEGIN_DECLS	extern "C" {
+#define __END_DECLS	}
+#else
+#define __BEGIN_DECLS
+#define __END_DECLS
+#endif
+#endif
+
+/*
+ * On non-glibc based systems, we cannot unconditionally use the
+ * __GLIBC_PREREQ macro as it gets expanded before evaluation.
+ */
+#ifndef __GLIBC_PREREQ
+#define __GLIBC_PREREQ(maj, min) 0
+#endif
+
 /*
  * Some kFreeBSD headers expect those macros to be set for sanity checks.
  */
@@ -49,6 +82,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__))
@@ -114,6 +155,53 @@
 # define __bounded__(x, y, z)
 #endif
 
+/*
+ * Return the number of elements in a statically-allocated array,
+ * __x.
+ */
+#define	__arraycount(__x)	(sizeof(__x) / sizeof(__x[0]))
+
+/*
+ * We define this here since <stddef.h>, <sys/queue.h>, and <sys/types.h>
+ * require it.
+ */
+#ifndef __offsetof
+# if LIBBSD_GCC_VERSION >= 0x0401
+#  define __offsetof(type, field)	__builtin_offsetof(type, field)
+# else
+#  ifndef __cplusplus
+#   define __offsetof(type, field) \
+           ((__size_t)(__uintptr_t)((const volatile void *)&((type *)0)->field))
+#  else
+#   define __offsetof(type, field) \
+	(__offsetof__ (reinterpret_cast <__size_t> \
+	               (&reinterpret_cast <const volatile char &> \
+	                (static_cast<type *> (0)->field))))
+#  endif
+# endif
+#endif
+
+#define __rangeof(type, start, end) \
+        (__offsetof(type, end) - __offsetof(type, start))
+
+/*
+ * Given the pointer x to the member m of the struct s, return
+ * a pointer to the containing structure.  When using GCC, we first
+ * assign pointer x to a local variable, to check that its type is
+ * compatible with member m.
+ */
+#ifndef __containerof
+# if LIBBSD_GCC_VERSION >= 0x0301
+#  define __containerof(x, s, m) ({ \
+	const volatile __typeof(((s *)0)->m) *__x = (x); \
+	__DEQUALIFY(s *, (const volatile char *)__x - __offsetof(s, m)); \
+})
+# else
+#  define __containerof(x, s, m) \
+          __DEQUALIFY(s *, (const volatile char *)(x) - __offsetof(s, m))
+# endif
+#endif
+
 #ifndef __RCSID
 # define __RCSID(x)
 #endif
@@ -138,4 +226,16 @@
 # define __COPYRIGHT(x)
 #endif
 
+#ifndef __DECONST
+#define __DECONST(type, var)	((type)(__uintptr_t)(const void *)(var))
+#endif
+
+#ifndef __DEVOLATILE
+#define __DEVOLATILE(type, var)	((type)(__uintptr_t)(volatile void *)(var))
+#endif
+
+#ifndef __DEQUALIFY
+#define __DEQUALIFY(type, var)	((type)(__uintptr_t)(const volatile void *)(var))
+#endif
+
 #endif

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,
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 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,10 +30,14 @@
  * $FreeBSD$
  */
 
-#ifndef _SYS_QUEUE_H_
+#ifndef LIBBSD_SYS_QUEUE_H
-#define	_SYS_QUEUE_H_
+#define LIBBSD_SYS_QUEUE_H
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 
 /*
  * This file defines four types of data structures: singly-linked lists,
@@ -65,7 +69,7 @@
  * so that an arbitrary element can be removed without a need to
  * traverse the list. New elements can be added to the list before
  * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
+ * may be traversed in either direction.
  *
  * A tail queue is headed by a pair of pointers, one to the head of the
  * list and the other to the tail of the list. The elements are doubly
@@ -85,12 +89,16 @@
  * _EMPTY			+	+	+	+
  * _FIRST			+	+	+	+
  * _NEXT			+	+	+	+
- * _PREV			-	-	-	+
+ * _PREV			-	+	-	+
  * _LAST			-	-	+	+
  * _FOREACH			+	+	+	+
+ * _FOREACH_FROM		+	+	+	+
  * _FOREACH_SAFE		+	+	+	+
+ * _FOREACH_FROM_SAFE		+	+	+	+
  * _FOREACH_REVERSE		-	-	-	+
+ * _FOREACH_REVERSE_FROM	-	-	-	+
  * _FOREACH_REVERSE_SAFE	-	-	-	+
+ * _FOREACH_REVERSE_FROM_SAFE	-	-	-	+
  * _INSERT_HEAD			+	+	+	+
  * _INSERT_BEFORE		-	+	-	+
  * _INSERT_AFTER		+	+	+	+
@@ -99,19 +107,22 @@
  * _REMOVE_AFTER		+	-	+	-
  * _REMOVE_HEAD			+	-	+	-
  * _REMOVE			+	+	+	+
+ * _SWAP			+	+	+	+
  *
  */
 #ifdef QUEUE_MACRO_DEBUG
 /* Store the last 2 places the queue element or head was altered */
 struct qm_trace {
-	char * lastfile;
+	unsigned long	 lastline;
-	int lastline;
+	unsigned long	 prevline;
-	char * prevfile;
+	const char	*lastfile;
-	int prevline;
+	const char	*prevfile;
 };
 
 #define	TRACEBUF	struct qm_trace trace;
+#define	TRACEBUF_INITIALIZER	{ __FILE__, __LINE__, NULL, 0 } ,
 #define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
+#define	QMD_SAVELINK(name, link)	void **name = (void *)&(link)
 
 #define	QMD_TRACE_HEAD(head) do {					\
 	(head)->trace.prevline = (head)->trace.lastline;		\
@@ -130,7 +141,9 @@ struct qm_trace {
 #else
 #define	QMD_TRACE_ELEM(elem)
 #define	QMD_TRACE_HEAD(head)
+#define	QMD_SAVELINK(name, link)
 #define	TRACEBUF
+#define	TRACEBUF_INITIALIZER
 #define	TRASHIT(x)
 #endif	/* QUEUE_MACRO_DEBUG */
 
@@ -162,11 +175,21 @@ struct {								\
 	    (var);							\
 	    (var) = SLIST_NEXT((var), field))
 
+#define	SLIST_FOREACH_FROM(var, head, field)				\
+	for ((var) = ((var) ? (var) : SLIST_FIRST((head)));		\
+	    (var);							\
+	    (var) = SLIST_NEXT((var), field))
+
 #define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
 	for ((var) = SLIST_FIRST((head));				\
 	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
 	    (var) = (tvar))
 
+#define	SLIST_FOREACH_FROM_SAFE(var, head, field, tvar)			\
+	for ((var) = ((var) ? (var) : SLIST_FIRST((head)));		\
+	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
 #define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
 	for ((varp) = &SLIST_FIRST((head));				\
 	    ((var) = *(varp)) != NULL;					\
@@ -189,6 +212,7 @@ struct {								\
 #define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
 
 #define	SLIST_REMOVE(head, elm, type, field) do {			\
+	QMD_SAVELINK(oldnext, (elm)->field.sle_next);			\
 	if (SLIST_FIRST((head)) == (elm)) {				\
 		SLIST_REMOVE_HEAD((head), field);			\
 	}								\
@@ -198,7 +222,7 @@ struct {								\
 			curelm = SLIST_NEXT(curelm, field);		\
 		SLIST_REMOVE_AFTER(curelm, field);			\
 	}								\
-	TRASHIT((elm)->field.sle_next);					\
+	TRASHIT(*oldnext);						\
 } while (0)
 
 #define SLIST_REMOVE_AFTER(elm, field) do {				\
@@ -210,6 +234,12 @@ struct {								\
 	SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);	\
 } while (0)
 
+#define SLIST_SWAP(head1, head2, type) do {				\
+	struct type *swap_first = SLIST_FIRST(head1);			\
+	SLIST_FIRST(head1) = SLIST_FIRST(head2);			\
+	SLIST_FIRST(head2) = swap_first;				\
+} while (0)
+
 /*
  * Singly-linked Tail queue declarations.
  */
@@ -247,12 +277,21 @@ struct {								\
 	   (var);							\
 	   (var) = STAILQ_NEXT((var), field))
 
+#define	STAILQ_FOREACH_FROM(var, head, field)				\
+	for ((var) = ((var) ? (var) : STAILQ_FIRST((head)));		\
+	   (var);							\
+	   (var) = STAILQ_NEXT((var), field))
 
 #define	STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
 	for ((var) = STAILQ_FIRST((head));				\
 	    (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
 	    (var) = (tvar))
 
+#define	STAILQ_FOREACH_FROM_SAFE(var, head, field, tvar)		\
+	for ((var) = ((var) ? (var) : STAILQ_FIRST((head)));		\
+	    (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
 #define	STAILQ_INIT(head) do {						\
 	STAILQ_FIRST((head)) = NULL;					\
 	(head)->stqh_last = &STAILQ_FIRST((head));			\
@@ -277,14 +316,13 @@ struct {								\
 } while (0)
 
 #define	STAILQ_LAST(head, type, field)					\
-	(STAILQ_EMPTY((head)) ?						\
+	(STAILQ_EMPTY((head)) ? NULL :					\
-		NULL :							\
+	    __containerof((head)->stqh_last, struct type, field.stqe_next))
-	        ((struct type *)(void *)				\
-		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
 
 #define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
 
 #define	STAILQ_REMOVE(head, elm, type, field) do {			\
+	QMD_SAVELINK(oldnext, (elm)->field.stqe_next);			\
 	if (STAILQ_FIRST((head)) == (elm)) {				\
 		STAILQ_REMOVE_HEAD((head), field);			\
 	}								\
@@ -294,13 +332,7 @@ struct {								\
 			curelm = STAILQ_NEXT(curelm, field);		\
 		STAILQ_REMOVE_AFTER(head, curelm, field);		\
 	}								\
-	TRASHIT((elm)->field.stqe_next);				\
+	TRASHIT(*oldnext);						\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD(head, field) do {				\
-	if ((STAILQ_FIRST((head)) =					\
-	     STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL)		\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
 } while (0)
 
 #define STAILQ_REMOVE_AFTER(head, elm, field) do {			\
@@ -309,6 +341,12 @@ struct {								\
 		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
 } while (0)
 
+#define	STAILQ_REMOVE_HEAD(head, field) do {				\
+	if ((STAILQ_FIRST((head)) =					\
+	     STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL)		\
+		(head)->stqh_last = &STAILQ_FIRST((head));		\
+} while (0)
+
 #define STAILQ_SWAP(head1, head2, type) do {				\
 	struct type *swap_first = STAILQ_FIRST(head1);			\
 	struct type **swap_last = (head1)->stqh_last;			\
@@ -378,11 +416,21 @@ struct {								\
 	    (var);							\
 	    (var) = LIST_NEXT((var), field))
 
+#define	LIST_FOREACH_FROM(var, head, field)				\
+	for ((var) = ((var) ? (var) : LIST_FIRST((head)));		\
+	    (var);							\
+	    (var) = LIST_NEXT((var), field))
+
 #define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
 	for ((var) = LIST_FIRST((head));				\
 	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
 	    (var) = (tvar))
 
+#define	LIST_FOREACH_FROM_SAFE(var, head, field, tvar)			\
+	for ((var) = ((var) ? (var) : LIST_FIRST((head)));		\
+	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
 #define	LIST_INIT(head) do {						\
 	LIST_FIRST((head)) = NULL;					\
 } while (0)
@@ -414,15 +462,21 @@ struct {								\
 
 #define	LIST_NEXT(elm, field)	((elm)->field.le_next)
 
+#define	LIST_PREV(elm, head, type, field)				\
+	((elm)->field.le_prev == &LIST_FIRST((head)) ? NULL :		\
+	    __containerof((elm)->field.le_prev, struct type, field.le_next))
+
 #define	LIST_REMOVE(elm, field) do {					\
+	QMD_SAVELINK(oldnext, (elm)->field.le_next);			\
+	QMD_SAVELINK(oldprev, (elm)->field.le_prev);			\
 	QMD_LIST_CHECK_NEXT(elm, field);				\
 	QMD_LIST_CHECK_PREV(elm, field);				\
 	if (LIST_NEXT((elm), field) != NULL)				\
 		LIST_NEXT((elm), field)->field.le_prev = 		\
 		    (elm)->field.le_prev;				\
 	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
-	TRASHIT((elm)->field.le_next);					\
+	TRASHIT(*oldnext);						\
-	TRASHIT((elm)->field.le_prev);					\
+	TRASHIT(*oldprev);						\
 } while (0)
 
 #define LIST_SWAP(head1, head2, type, field) do {			\
@@ -446,7 +500,7 @@ struct name {								\
 }
 
 #define	TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
+	{ NULL, &(head).tqh_first, TRACEBUF_INITIALIZER }
 
 #define	TAILQ_ENTRY(type)						\
 struct {								\
@@ -509,21 +563,41 @@ struct {								\
 	    (var);							\
 	    (var) = TAILQ_NEXT((var), field))
 
+#define	TAILQ_FOREACH_FROM(var, head, field)				\
+	for ((var) = ((var) ? (var) : TAILQ_FIRST((head)));		\
+	    (var);							\
+	    (var) = TAILQ_NEXT((var), field))
+
 #define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
 	for ((var) = TAILQ_FIRST((head));				\
 	    (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		\
 	    (var) = (tvar))
 
+#define	TAILQ_FOREACH_FROM_SAFE(var, head, field, tvar)			\
+	for ((var) = ((var) ? (var) : TAILQ_FIRST((head)));		\
+	    (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		\
+	    (var) = (tvar))
+
 #define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
 	for ((var) = TAILQ_LAST((head), headname);			\
 	    (var);							\
 	    (var) = TAILQ_PREV((var), headname, field))
 
+#define	TAILQ_FOREACH_REVERSE_FROM(var, head, headname, field)		\
+	for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname));	\
+	    (var);							\
+	    (var) = TAILQ_PREV((var), headname, field))
+
 #define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
 	for ((var) = TAILQ_LAST((head), headname);			\
 	    (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
 	    (var) = (tvar))
 
+#define	TAILQ_FOREACH_REVERSE_FROM_SAFE(var, head, headname, field, tvar) \
+	for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname));	\
+	    (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
+	    (var) = (tvar))
+
 #define	TAILQ_INIT(head) do {						\
 	TAILQ_FIRST((head)) = NULL;					\
 	(head)->tqh_last = &TAILQ_FIRST((head));			\
@@ -587,6 +661,8 @@ struct {								\
 	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
 
 #define	TAILQ_REMOVE(head, elm, field) do {				\
+	QMD_SAVELINK(oldnext, (elm)->field.tqe_next);			\
+	QMD_SAVELINK(oldprev, (elm)->field.tqe_prev);			\
 	QMD_TAILQ_CHECK_NEXT(elm, field);				\
 	QMD_TAILQ_CHECK_PREV(elm, field);				\
 	if ((TAILQ_NEXT((elm), field)) != NULL)				\
@@ -597,8 +673,8 @@ struct {								\
 		QMD_TRACE_HEAD(head);					\
 	}								\
 	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
-	TRASHIT((elm)->field.tqe_next);					\
+	TRASHIT(*oldnext);						\
-	TRASHIT((elm)->field.tqe_prev);					\
+	TRASHIT(*oldprev);						\
 	QMD_TRACE_ELEM(&(elm)->field);					\
 } while (0)
 
@@ -619,4 +695,4 @@ struct {								\
 		(head2)->tqh_last = &(head2)->tqh_first;		\
 } while (0)
 
-#endif /* !_SYS_QUEUE_H_ */
+#endif /* !LIBBSD_SYS_QUEUE_H */

include/bsd/sys/time.h

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

include/bsd/sys/tree.h

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

include/bsd/timeconv.h

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) 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.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce 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.3 (Berkeley) 1/21/94
+ */
+
+/*
+ * $FreeBSD$
+ */
+
+#ifndef LIBBSD_TIMECONV_H
+#define LIBBSD_TIMECONV_H
+
+#ifdef LIBBSD_OVERLAY
+#include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
+#include <stdint.h>
+#include <time.h>
+
+time_t _time32_to_time(int32_t t32);
+int32_t _time_to_time32(time_t t);
+time_t _time64_to_time(int64_t t64);
+int64_t _time_to_time64(time_t t);
+long _time_to_long(time_t t);
+time_t _long_to_time(long tlong);
+int _time_to_int(time_t t);
+time_t _int_to_time(int tint);
+
+#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
@@ -56,7 +60,12 @@ void *setmode(const char *mode_str);
 
 void closefrom(int lowfd);
 
-void setproctitle(const char *fmt, ...);
+/* Compatibility with sendmail implementations. */
+#define initsetproctitle(c, a, e) setproctitle_init((c), (a), (e))
+
+void setproctitle_init(int argc, char *argv[], char *envp[]);
+void setproctitle(const char *fmt, ...)
+	__printflike(1, 2);
 
 int getpeereid(int s, uid_t *euid, gid_t *egid);
 __END_DECLS

include/bsd/vis.h

@@ -1,3 +1,5 @@
+/*	$NetBSD: vis.h,v 1.25 2017/04/23 01:57:36 christos Exp $	*/
+
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,36 +29,44 @@
  * SUCH DAMAGE.
  *
  *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/vis.h,v 1.11 2003/10/30 10:40:49 phk Exp $
  */
 
-#ifndef _VIS_H_
+#ifndef LIBBSD_VIS_H
-#define	_VIS_H_
+#define LIBBSD_VIS_H
 
 #include <sys/types.h>
 
 /*
  * to select alternate encoding format
  */
-#define	VIS_OCTAL	0x01	/* use octal \ddd format */
+#define	VIS_OCTAL	0x0001	/* use octal \ddd format */
-#define	VIS_CSTYLE	0x02	/* use \[nrft0..] where appropriate */
+#define	VIS_CSTYLE	0x0002	/* use \[nrft0..] where appropriate */
 
 /*
  * to alter set of characters encoded (default is to encode all
  * non-graphic except space, tab, and newline).
  */
-#define	VIS_SP		0x04	/* also encode space */
+#define	VIS_SP		0x0004	/* also encode space */
-#define	VIS_TAB		0x08	/* also encode tab */
+#define	VIS_TAB		0x0008	/* also encode tab */
-#define	VIS_NL		0x10	/* also encode newline */
+#define	VIS_NL		0x0010	/* also encode newline */
 #define	VIS_WHITE	(VIS_SP | VIS_TAB | VIS_NL)
-#define	VIS_SAFE	0x20	/* only encode "unsafe" characters */
+#define	VIS_SAFE	0x0020	/* only encode "unsafe" characters */
+#define	VIS_DQ		0x8000	/* also encode double quotes */
 
 /*
  * other
  */
-#define	VIS_NOSLASH	0x40	/* inhibit printing '\' */
+#define	VIS_NOSLASH	0x0040	/* inhibit printing '\' */
-#define	VIS_HTTPSTYLE	0x80	/* http-style escape % HEX HEX */
+#define	VIS_HTTP1808	0x0080	/* http-style escape % hex hex */
-#define	VIS_GLOB	0x100	/* encode glob(3) magics */
+#define	VIS_HTTPSTYLE	0x0080	/* http-style escape % hex hex */
+#define	VIS_MIMESTYLE	0x0100	/* mime-style escape = HEX HEX */
+#define	VIS_HTTP1866	0x0200	/* http-style &#num; or &string; */
+#define	VIS_NOESCAPE	0x0400	/* don't decode `\' */
+#define	_VIS_END	0x0800	/* for unvis */
+#define	VIS_GLOB	0x1000	/* encode glob(3) magic characters */
+#define	VIS_SHELL	0x2000	/* encode shell special characters [not glob] */
+#define	VIS_META	(VIS_WHITE | VIS_GLOB | VIS_SHELL)
+#define	VIS_NOLOCALE	0x4000	/* encode using the C locale */
 
 /*
  * unvis return codes
@@ -70,19 +80,44 @@
 /*
  * unvis flags
  */
-#define	UNVIS_END	1	/* no more characters */
+#define	UNVIS_END	_VIS_END	/* no more characters */
 
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 
 __BEGIN_DECLS
 char	*vis(char *, int, int, int);
+char	*nvis(char *, size_t, int, int, int);
+
+char	*svis(char *, int, int, int, const char *);
+char	*snvis(char *, size_t, int, int, int, const char *);
+
 int	strvis(char *, const char *, int);
+int	stravis(char **, const char *, int);
+int	strnvis(char *, size_t, const char *, int);
+
+int	strsvis(char *, const char *, int, const char *);
+int	strsnvis(char *, size_t, const char *, int, const char *);
+
 int	strvisx(char *, const char *, size_t, int);
-int	strnvis(char *, const char *, size_t, int);
+int	strnvisx(char *, size_t, const char *, size_t, int);
+int	strenvisx(char *, size_t, const char *, size_t, int, int *);
+
+int	strsvisx(char *, const char *, size_t, int, const char *);
+int	strsnvisx(char *, size_t, const char *, size_t, int, const char *);
+int	strsenvisx(char *, size_t, const char *, size_t , int, const char *,
+    int *);
+
 int	strunvis(char *, const char *);
+int	strnunvis(char *, size_t, const char *);
+
 int	strunvisx(char *, const char *, int);
-ssize_t strnunvis(char *, const char *, size_t);
+int	strnunvisx(char *, size_t, const char *, int);
+
 int	unvis(char *, int, int *, int);
 __END_DECLS
 
-#endif /* !_VIS_H_ */
+#endif /* !LIBBSD_VIS_H */

include/bsd/wchar.h

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Guillem Jover <guillem@hadrons.org>
+ * Copyright © 2012-2013 Guillem Jover <guillem@hadrons.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,17 +24,27 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined(__need_wchar_t) || defined(__need_wint_t) || \
+    defined(__need_mbstate_t)
+#define LIBBSD_WCHAR_H_SKIP
+#endif
+
 #ifdef LIBBSD_OVERLAY
 #include_next <wchar.h>
 #else
 #include <wchar.h>
 #endif
 
+#ifndef LIBBSD_WCHAR_H_SKIP
 #ifndef LIBBSD_WCHAR_H
 #define LIBBSD_WCHAR_H
 
 #include <stddef.h>
+#ifdef LIBBSD_OVERLAY
 #include <sys/cdefs.h>
+#else
+#include <bsd/sys/cdefs.h>
+#endif
 #include <sys/types.h>
 
 __BEGIN_DECLS
@@ -45,3 +55,5 @@ size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t size);
 __END_DECLS
 
 #endif
+#endif
+#undef LIBBSD_WCHAR_H_SKIP

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,45 +14,224 @@ md5.3bsd: $(srcdir)/mdX.3bsd
 	$(AM_V_GEN) sed $(SED_MD5_SUBST) $< > $@
 
 dist_man_MANS = \
-	arc4random.3 \
+	LIST_EMPTY.3bsd \
-	arc4random_addrandom.3 \
+	LIST_ENTRY.3bsd \
-	arc4random_buf.3 \
+	LIST_FIRST.3bsd \
-	arc4random_stir.3 \
+	LIST_FOREACH.3bsd \
-	arc4random_uniform.3 \
+	LIST_FOREACH_FROM.3bsd \
-	bitstring.3 \
+	LIST_FOREACH_FROM_SAFE.3bsd \
-	closefrom.3 \
+	LIST_FOREACH_SAFE.3bsd \
-	dehumanize_number.3 \
+	LIST_HEAD.3bsd \
-	expand_number.3 \
+	LIST_HEAD_INITIALIZER.3bsd \
-	fgetln.3 \
+	LIST_INIT.3bsd \
-	fgetwln.3 \
+	LIST_INSERT_AFTER.3bsd \
-	flopen.3 \
+	LIST_INSERT_BEFORE.3bsd \
-	fmtcheck.3 \
+	LIST_INSERT_HEAD.3bsd \
-	fparseln.3 \
+	LIST_NEXT.3bsd \
-	getmode.3 \
+	LIST_PREV.3bsd \
-	getpeereid.3 \
+	LIST_REMOVE.3bsd \
-	getprogname.3 \
+	LIST_SWAP.3bsd \
-	heapsort.3 \
+	RB_EMPTY.3bsd \
-	humanize_number.3 \
+	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.3bsd \
+	getmode.3bsd \
+	getpeereid.3bsd \
+	getprogname.3bsd \
+	heapsort.3bsd \
+	humanize_number.3bsd \
+	le16dec.3bsd \
+	le16enc.3bsd \
+	le32dec.3bsd \
+	le32enc.3bsd \
+	le64dec.3bsd \
+	le64enc.3bsd \
+	libbsd.7 \
 	md5.3bsd \
-	mergesort.3 \
+	mergesort.3bsd \
-	nlist.3 \
+	nlist.3bsd \
-	pidfile.3 \
+	pidfile.3bsd \
+	pidfile_close.3bsd \
+	pidfile_open.3bsd \
+	pidfile_remove.3bsd \
+	pidfile_write.3bsd \
 	queue.3bsd \
-	radixsort.3 \
+	radixsort.3bsd \
-	readpassphrase.3 \
+	readpassphrase.3bsd \
-	reallocf.3 \
+	reallocarray.3bsd \
-	setmode.3 \
+	reallocf.3bsd \
-	setproctitle.3 \
+	setmode.3bsd \
-	setprogname.3 \
+	setproctitle.3bsd \
-	sradixsort.3 \
+	setproctitle_init.3bsd \
-	strlcat.3 \
+	setprogname.3bsd \
-	strlcpy.3 \
+	sl_add.3bsd \
-	strnstr.3 \
+	sl_delete.3bsd \
-	strmode.3 \
+	sl_find.3bsd \
-	strtonum.3 \
+	sl_free.3bsd \
-	tree.3 \
+	sl_init.3bsd \
-	unvis.3 \
+	sradixsort.3bsd \
-	vis.3 \
+	stringlist.3bsd \
-	wcslcat.3 \
+	strlcat.3bsd \
-	wcslcpy.3 \
+	strlcpy.3bsd \
+	strmode.3bsd \
+	strnstr.3bsd \
+	strnunvis.3bsd \
+	strnvis.3bsd \
+	strtoi.3bsd \
+	strtonum.3bsd \
+	strtou.3bsd \
+	strunvis.3bsd \
+	strvis.3bsd \
+	strvisx.3bsd \
+	timeradd.3bsd \
+	timerclear.3bsd \
+	timercmp.3bsd \
+	timerisset.3bsd \
+	timersub.3bsd \
+	timespecadd.3bsd \
+	timespecclear.3bsd \
+	timespeccmp.3bsd \
+	timespecisset.3bsd \
+	timespecsub.3bsd \
+	timeval.3bsd \
+	tree.3bsd \
+	unvis.3bsd \
+	vis.3bsd \
+	wcslcat.3bsd \
+	wcslcpy.3bsd \
 	$(nil)

man/RB_EMPTY.3bsd

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

man/RB_ENTRY.3bsd

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

man/RB_FIND.3bsd

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

man/RB_FOREACH.3bsd

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

man/RB_FOREACH_REVERSE.3bsd

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

man/RB_GENERATE.3bsd

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

man/RB_GENERATE_STATIC.3bsd

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

man/RB_HEAD.3bsd

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

man/RB_INIT.3bsd

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

man/RB_INITIALIZER.3bsd

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

man/RB_INSERT.3bsd

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

man/RB_LEFT.3bsd

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

man/RB_MAX.3bsd

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

man/RB_MIN.3bsd

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

man/RB_NEXT.3bsd

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

man/RB_NFIND.3bsd

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

man/RB_PARENT.3bsd

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

man/RB_PREV.3bsd

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

man/RB_PROTOTYPE.3bsd

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

man/RB_PROTOTYPE_STATIC.3bsd

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

man/RB_REMOVE.3bsd

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

man/RB_RIGHT.3bsd

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

man/RB_ROOT.3bsd

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

man/SLIST_EMPTY.3bsd

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

man/SLIST_ENTRY.3bsd

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

man/SLIST_FIRST.3bsd

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

man/SLIST_FOREACH.3bsd

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

man/SLIST_FOREACH_FROM.3bsd

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

man/SLIST_FOREACH_FROM_SAFE.3bsd

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

man/SLIST_FOREACH_SAFE.3bsd

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

man/SLIST_HEAD.3bsd

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

man/SLIST_HEAD_INITIALIZER.3bsd

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

man/SLIST_INIT.3bsd

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

man/SLIST_INSERT_AFTER.3bsd

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

man/SLIST_INSERT_HEAD.3bsd

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

man/SLIST_NEXT.3bsd

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

man/SLIST_REMOVE.3bsd

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

man/SLIST_REMOVE_AFTER.3bsd

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

man/SLIST_REMOVE_HEAD.3bsd

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

man/SLIST_SWAP.3bsd

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

man/SPLAY_EMPTY.3bsd

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

man/SPLAY_ENTRY.3bsd

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

man/SPLAY_FIND.3bsd

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

man/SPLAY_FOREACH.3bsd

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

man/SPLAY_GENERATE.3bsd

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

man/SPLAY_HEAD.3bsd

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

man/SPLAY_INIT.3bsd

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

man/SPLAY_INITIALIZER.3bsd

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

man/SPLAY_INSERT.3bsd

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

man/SPLAY_LEFT.3bsd

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

man/SPLAY_MAX.3bsd

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

man/SPLAY_MIN.3bsd

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