 @@ -1,14 +1,14 @@
-#	$NetBSD: mi,v 1.1971 2015/07/21 03:12:50 knakahara Exp $
+#	$NetBSD: mi,v 1.1972 2015/07/26 02:20:30 kamil Exp $
+#
 # Note: don't delete entries from here - mark them as "obsolete" instead.
+#
 #./usr/libdata/lint/llib-ldtrace.ln		comp-c-lintlib		lint,dtrace
 ./etc/mtree/set.comp				comp-sys-root
 ./usr/bin/addr2line				comp-debug-bin		binutils
 ./usr/bin/ar					comp-util-bin		binutils
 ./usr/bin/as					comp-util-bin		binutils
 ./usr/bin/asa					comp-fortran-bin
 ./usr/bin/atf-compile				comp-obsolete		obsolete
 ./usr/bin/c++					comp-cxx-bin		gcccmds
 ./usr/bin/c++filt				comp-cxx-bin		binutils
 ./usr/bin/c89					comp-c-bin
 @@ -6412,26 +6412,27 @@
 ./usr/share/man/cat3/endnetpath.0		comp-c-catman		.cat
 ./usr/share/man/cat3/endprotoent.0		comp-c-catman		.cat
 ./usr/share/man/cat3/endpwent.0			comp-c-catman		.cat
 ./usr/share/man/cat3/endrpcent.0		comp-c-catman		.cat
 ./usr/share/man/cat3/endservent.0		comp-c-catman		.cat
 ./usr/share/man/cat3/endttyent.0		comp-c-catman		.cat
 ./usr/share/man/cat3/endusershell.0		comp-c-catman		.cat
 ./usr/share/man/cat3/endutxent.0		comp-c-catman		.cat
 ./usr/share/man/cat3/endwin.0			comp-c-catman		.cat
 ./usr/share/man/cat3/erand48.0			comp-c-catman		.cat
 ./usr/share/man/cat3/erase.0			comp-c-catman		.cat
 ./usr/share/man/cat3/erasechar.0		comp-c-catman		.cat
 ./usr/share/man/cat3/erealloc.0			comp-c-catman		.cat
 ./usr/share/man/cat3/ereallocarr.0		comp-c-catman		.cat
 ./usr/share/man/cat3/erf.0			comp-c-catman		.cat
 ./usr/share/man/cat3/erfc.0			comp-c-catman		.cat
 ./usr/share/man/cat3/erfcf.0			comp-c-catman		.cat
 ./usr/share/man/cat3/erfcl.0			comp-c-catman		.cat
 ./usr/share/man/cat3/erff.0			comp-c-catman		.cat
 ./usr/share/man/cat3/erfl.0			comp-c-catman		.cat
 ./usr/share/man/cat3/err.0			comp-c-catman		.cat
 ./usr/share/man/cat3/errc.0			comp-c-catman		.cat
 ./usr/share/man/cat3/error_message.0		comp-krb5-catman	kerberos,.cat
 ./usr/share/man/cat3/error_table_name.0		comp-krb5-catman	kerberos,.cat
 ./usr/share/man/cat3/errx.0			comp-c-catman		.cat
 ./usr/share/man/cat3/esetfunc.0			comp-c-catman		.cat
 ./usr/share/man/cat3/estrdup.0			comp-c-catman		.cat
 @@ -13348,26 +13349,27 @@
 ./usr/share/man/html3/endnetpath.html		comp-c-htmlman		html
 ./usr/share/man/html3/endprotoent.html		comp-c-htmlman		html
 ./usr/share/man/html3/endpwent.html		comp-c-htmlman		html
 ./usr/share/man/html3/endrpcent.html		comp-c-htmlman		html
 ./usr/share/man/html3/endservent.html		comp-c-htmlman		html
 ./usr/share/man/html3/endttyent.html		comp-c-htmlman		html
 ./usr/share/man/html3/endusershell.html		comp-c-htmlman		html
 ./usr/share/man/html3/endutxent.html		comp-c-htmlman		html
 ./usr/share/man/html3/endwin.html		comp-c-htmlman		html
 ./usr/share/man/html3/erand48.html		comp-c-htmlman		html
 ./usr/share/man/html3/erase.html		comp-c-htmlman		html
 ./usr/share/man/html3/erasechar.html		comp-c-htmlman		html
 ./usr/share/man/html3/erealloc.html		comp-c-htmlman		html
 ./usr/share/man/html3/ereallocarr.html		comp-c-htmlman		html
 ./usr/share/man/html3/erf.html			comp-c-htmlman		html
 ./usr/share/man/html3/erfc.html			comp-c-htmlman		html
 ./usr/share/man/html3/erfcf.html		comp-c-htmlman		html
 ./usr/share/man/html3/erfcl.html		comp-c-htmlman		html
 ./usr/share/man/html3/erff.html			comp-c-htmlman		html
 ./usr/share/man/html3/erfl.html			comp-c-htmlman		html
 ./usr/share/man/html3/err.html			comp-c-htmlman		html
 ./usr/share/man/html3/errc.html			comp-c-htmlman		html
 ./usr/share/man/html3/error_message.html	comp-krb5-htmlman	kerberos,html
 ./usr/share/man/html3/error_table_name.html	comp-krb5-htmlman	kerberos,html
 ./usr/share/man/html3/errx.html			comp-c-htmlman		html
 ./usr/share/man/html3/esetfunc.html		comp-c-htmlman		html
 ./usr/share/man/html3/estrdup.html		comp-c-htmlman		html
 @@ -20196,26 +20198,27 @@
 ./usr/share/man/man3/endnetpath.3		comp-c-man		.man
 ./usr/share/man/man3/endprotoent.3		comp-c-man		.man
 ./usr/share/man/man3/endpwent.3			comp-c-man		.man
 ./usr/share/man/man3/endrpcent.3		comp-c-man		.man
 ./usr/share/man/man3/endservent.3		comp-c-man		.man
 ./usr/share/man/man3/endttyent.3		comp-c-man		.man
 ./usr/share/man/man3/endusershell.3		comp-c-man		.man
 ./usr/share/man/man3/endutxent.3		comp-c-man		.man
 ./usr/share/man/man3/endwin.3			comp-c-man		.man
 ./usr/share/man/man3/erand48.3			comp-c-man		.man
 ./usr/share/man/man3/erase.3			comp-c-man		.man
 ./usr/share/man/man3/erasechar.3		comp-c-man		.man
 ./usr/share/man/man3/erealloc.3			comp-c-man		.man
 ./usr/share/man/man3/ereallocarr.3		comp-c-man		.man
 ./usr/share/man/man3/erf.3			comp-c-man		.man
 ./usr/share/man/man3/erfc.3			comp-c-man		.man
 ./usr/share/man/man3/erfcf.3			comp-c-man		.man
 ./usr/share/man/man3/erfcl.3			comp-c-man		.man
 ./usr/share/man/man3/erff.3			comp-c-man		.man
 ./usr/share/man/man3/erfl.3			comp-c-man		.man
 ./usr/share/man/man3/err.3			comp-c-man		.man
 ./usr/share/man/man3/errc.3			comp-c-man		.man
 ./usr/share/man/man3/error_message.3		comp-krb5-man		kerberos,.man
 ./usr/share/man/man3/error_table_name.3		comp-krb5-man		kerberos,.man
 ./usr/share/man/man3/errx.3			comp-c-man		.man
 ./usr/share/man/man3/esetfunc.3			comp-c-man		.man
 ./usr/share/man/man3/estrdup.3			comp-c-man		.man

 @@ -1,14 +1,14 @@
-/*	$NetBSD: util.h,v 1.66 2015/01/18 18:10:01 christos Exp $	*/
+/*	$NetBSD: util.h,v 1.67 2015/07/26 02:20:30 kamil Exp $	*/
 /*-
  * Copyright (c) 1995
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -142,21 +142,22 @@ int		disklabel_scan(struct disklabel *,
 /* Error checked functions */
 void		(*esetfunc(void (*)(int, const char *, ...)))
     (int, const char *, ...);
 size_t 		estrlcpy(char *, const char *, size_t);
 size_t 		estrlcat(char *, const char *, size_t);
 char 		*estrdup(const char *);
 char 		*estrndup(const char *, size_t);
 intmax_t	estrtoi(const char *, int, intmax_t, intmax_t);
 uintmax_t	estrtou(const char *, int, uintmax_t, uintmax_t);
 void 		*ecalloc(size_t, size_t);
 void 		*emalloc(size_t);
 void 		*erealloc(void *, size_t);
 void 		ereallocarr(void *, size_t, size_t);
 struct __sFILE	*efopen(const char *, const char *);
 int	 	easprintf(char ** __restrict, const char * __restrict, ...)
 			__printflike(2, 3);
 int		evasprintf(char ** __restrict, const char * __restrict,
     __va_list) __printflike(2, 0);
 __END_DECLS
 #endif /* !_UTIL_H_ */

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.76 2015/01/18 18:09:36 christos Exp $
+#	$NetBSD: Makefile,v 1.77 2015/07/26 02:20:30 kamil Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 USE_SHLIBDIR=	yes
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/common/lib/libutil/Makefile.inc"
 WARNS?=	5
 LIB=	util
 CPPFLAGS+=-DLIBC_SCCS -I${.CURDIR}
 LINTFLAGS+=-w
 SRCS+=	efun.c \
 @@ -72,22 +72,23 @@ MLINKS+=pw_lock.3 pw_setprefix.3
 MLINKS+=pidlock.3 ttylock.3
 MLINKS+=pidlock.3 ttyunlock.3
 MLINKS+=efun.3 esetfunc.3
 MLINKS+=efun.3 easprintf.3
 MLINKS+=efun.3 estrlcpy.3
 MLINKS+=efun.3 estrlcat.3
 MLINKS+=efun.3 estrdup.3
 MLINKS+=efun.3 estrndup.3
 MLINKS+=efun.3 estrtoi.3
 MLINKS+=efun.3 estrtou.3
 MLINKS+=efun.3 emalloc.3
 MLINKS+=efun.3 ecalloc.3
 MLINKS+=efun.3 erealloc.3
 MLINKS+=efun.3 ereallocarr.3
 MLINKS+=efun.3 efopen.3
 MLINKS+=efun.3 evasprintf.3
 MLINKS+=stat_flags.3 string_to_flags.3
 MLINKS+=stat_flags.3 flags_to_string.3
 MLINKS+=snprintb.3 snprintb_m.3
 MLINKS+=util.3 libutil.3
 MLINKS+=strpct.3 strspct.3
 .include <bsd.lib.mk>

 @@ -1,14 +1,14 @@
-.\"     $NetBSD: efun.3,v 1.11 2015/01/18 18:09:36 christos Exp $
+.\"     $NetBSD: efun.3,v 1.12 2015/07/26 02:20:30 kamil Exp $
 .\"
 .\" Copyright (c) 2006 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
 @@ -27,71 +27,75 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd May 3, 2010
 .Dt EFUN 3
 .Os
 .Sh NAME
 .Nm esetfunc ,
 .Nm easprintf ,
 .Nm efopen ,
 .Nm emalloc ,
 .Nm ecalloc ,
 .Nm erealloc ,
 .Nm ereallocarr ,
 .Nm estrdup ,
 .Nm estrndup ,
 .Nm estrlcat ,
 .Nm estrlcpy ,
 .Nm estrtoi ,
 .Nm estrtou ,
 .Nm evasprintf
 .Nd error-checked utility functions
 .Sh LIBRARY
 .Lb libutil
 .Sh SYNOPSIS
 .In util.h
 .Ft void (*)(int, const char *, ...)
 .Fn esetfunc "void (*)(int, const char *, ...)"
 .Ft int
 .Fn easprintf "char ** restrict str" "const char * restrict fmt" "..."
 .Ft FILE *
 .Fn efopen "const char *p" "const char *m"
 .Ft void *
 .Fn ecalloc "size_t n" "size_t c"
 .Ft void *
 .Fn emalloc "size_t n"
 .Ft void *
 .Fn erealloc "void *p" "size_t n"
 .Ft void
 .Fn ereallocarr "void *p" "size_t n" "size_t s"
 .Ft char *
 .Fn estrdup "const char *s"
 .Ft char *
 .Fn estrndup "const char *s" "size_t len"
 .Ft size_t
 .Fn estrlcat "char *dst" "const char *src" "size_t len"
 .Ft size_t
 .Fn estrlcpy "char *dst" "const char *src" "size_t len"
 .Ft intmax_t
 .Fn estrtoi "const char * nptr" "int base" "intmax_t lo" "intmax_t hi"
 .Ft uintmax_t
 .Fn estrtou "const char * nptr" "int base" "uintmax_t lo" "uintmax_t hi"
 .Ft int
 .Fn evasprintf "char ** restrict str" "const char * restrict fmt" "..."
 .Sh DESCRIPTION
 The
 .Fn easprintf ,
 .Fn efopen ,
 .Fn ecalloc ,
 .Fn emalloc ,
 .Fn erealloc ,
 .Fn ereallocarr ,
 .Fn estrdup ,
 .Fn estrndup ,
 .Fn estrlcat ,
 .Fn estrlcpy ,
 .Fn estrtoi ,
 .Fn estrtou ,
 and
 .Fn evasprintf
 functions
 operate exactly as the corresponding functions that do not start with an
 .Sq e
 except that in case of an error, they call
 the installed error handler that can be configured with
 @@ -108,27 +112,29 @@ The function
 returns the previous error handler function.
+A
 .Dv NULL
 error handler will just call
 .Xr exit 3 .
 .Sh SEE ALSO
 .Xr asprintf 3 ,
 .Xr calloc 3 ,
 .Xr err 3 ,
 .Xr exit 3 ,
 .Xr fopen 3 ,
 .Xr malloc 3 ,
 .Xr realloc 3 ,
 .Xr reallocarr 3 ,
 .Xr strdup 3 ,
 .Xr strlcat 3 ,
 .Xr strlcpy 3 ,
 .Xr strndup 3 ,
 .Xr strtoi 3 ,
 .Xr strtou 3 ,
 .Xr vasprintf 3
 .Sh HISTORY
 The
-.Fn estrtoi
+.Fn estrtoi ,
 and
 .Fn estrtou
 and
 .Fn ereallocarr
 functions were added in
 .Nx 8 .

 @@ -1,14 +1,14 @@
-/*	$NetBSD: efun.c,v 1.9 2015/01/18 18:09:36 christos Exp $	*/
+/*	$NetBSD: efun.c,v 1.10 2015/07/26 02:20:30 kamil Exp $	*/
 /*-
  * Copyright (c) 2006 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.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #ifdef __RCSID
-__RCSID("$NetBSD: efun.c,v 1.9 2015/01/18 18:09:36 christos Exp $");
+__RCSID("$NetBSD: efun.c,v 1.10 2015/07/26 02:20:30 kamil Exp $");
 #endif
 #include <err.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <util.h>
 static void (*efunc)(int, const char *, ...) = err;
 @@ -118,26 +118,36 @@ ecalloc(size_t n, size_t s)
 		(*efunc)(1, "Cannot allocate %zu blocks of size %zu", n, s);
 	return p;
+}
 void *
 erealloc(void *p, size_t n)
+{
 	void *q = realloc(p, n);
 	if (q == NULL && n != 0)
 		(*efunc)(1, "Cannot re-allocate %zu bytes", n);
 	return q;
+}
 void
 ereallocarr(void *p, size_t n, size_t s)
+{
 	int rv = reallocarr(p, n, s);
 	if (rv != 0) {
 		errno = rv;
 		(*efunc)(1, "Cannot re-allocate %zu * %zu bytes", n, s);
+	}
+}
 FILE *
 efopen(const char *p, const char *m)
+{
 	FILE *fp = fopen(p, m);
 	if (fp == NULL)
 		(*efunc)(1, "Cannot open `%s'", p);
 	return fp;
+}
 int
 easprintf(char ** __restrict ret, const char * __restrict format, ...)
+{
 	int rv;