===================================================================
RCS file: /cvs/mandoc/mandoc_aux.c,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- mandoc/mandoc_aux.c	2014/03/23 11:59:17	1.1
+++ mandoc/mandoc_aux.c	2015/10/11 21:12:54	1.6
@@ -1,4 +1,4 @@
-/*	$Id: mandoc_aux.c,v 1.1 2014/03/23 11:59:17 schwarze Exp $ */
+/*	$Id: mandoc_aux.c,v 1.6 2015/10/11 21:12:54 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,8 +15,11 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
 #include <sys/types.h>
 
+#include <err.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -25,6 +28,10 @@
 #include "mandoc.h"
 #include "mandoc_aux.h"
 
+#if !HAVE_PROGNAME
+const char *mandoc_progname;
+#endif
+
 int
 mandoc_asprintf(char **dest, const char *fmt, ...)
 {
@@ -35,11 +42,9 @@ mandoc_asprintf(char **dest, const char *fmt, ...)
 	ret = vasprintf(dest, fmt, ap);
 	va_end(ap);
 
-	if (-1 == ret) {
-		perror(NULL);
-		exit((int)MANDOCLEVEL_SYSERR);
-	}
-	return(ret);
+	if (ret == -1)
+		err((int)MANDOCLEVEL_SYSERR, NULL);
+	return ret;
 }
 
 void *
@@ -48,11 +53,9 @@ mandoc_calloc(size_t num, size_t size)
 	void	*ptr;
 
 	ptr = calloc(num, size);
-	if (NULL == ptr) {
-		perror(NULL);
-		exit((int)MANDOCLEVEL_SYSERR);
-	}
-	return(ptr);
+	if (ptr == NULL)
+		err((int)MANDOCLEVEL_SYSERR, NULL);
+	return ptr;
 }
 
 void *
@@ -61,11 +64,9 @@ mandoc_malloc(size_t size)
 	void	*ptr;
 
 	ptr = malloc(size);
-	if (NULL == ptr) {
-		perror(NULL);
-		exit((int)MANDOCLEVEL_SYSERR);
-	}
-	return(ptr);
+	if (ptr == NULL)
+		err((int)MANDOCLEVEL_SYSERR, NULL);
+	return ptr;
 }
 
 void *
@@ -73,24 +74,30 @@ mandoc_realloc(void *ptr, size_t size)
 {
 
 	ptr = realloc(ptr, size);
-	if (NULL == ptr) {
-		perror(NULL);
-		exit((int)MANDOCLEVEL_SYSERR);
-	}
-	return(ptr);
+	if (ptr == NULL)
+		err((int)MANDOCLEVEL_SYSERR, NULL);
+	return ptr;
 }
 
+void *
+mandoc_reallocarray(void *ptr, size_t num, size_t size)
+{
+
+	ptr = reallocarray(ptr, num, size);
+	if (ptr == NULL)
+		err((int)MANDOCLEVEL_SYSERR, NULL);
+	return ptr;
+}
+
 char *
 mandoc_strdup(const char *ptr)
 {
 	char	*p;
 
 	p = strdup(ptr);
-	if (NULL == p) {
-		perror(NULL);
-		exit((int)MANDOCLEVEL_SYSERR);
-	}
-	return(p);
+	if (ptr == NULL)
+		err((int)MANDOCLEVEL_SYSERR, NULL);
+	return p;
 }
 
 char *
@@ -101,5 +108,5 @@ mandoc_strndup(const char *ptr, size_t sz)
 	p = mandoc_malloc(sz + 1);
 	memcpy(p, ptr, sz);
 	p[(int)sz] = '\0';
-	return(p);
+	return p;
 }