fixes

Signed-off-by: Ishimoto Shinobu <[email protected]>

Author: Ishimoto Shinobu

include/bsd.h

@@ -169,3 +169,8 @@ uintmax_t	strtou(const char * __restrict, char ** __restrict, int,
 int	 vasprintf(char ** __restrict, const char * __restrict,
     __va_list)
 		__printflike(2, 0);
+
+/* __OpenBSD */
+#ifndef __GLIBC__
+void	*reallocarray(void *, size_t, size_t);
+#endif

src/libnetbsd/Makefile.am

@@ -11,6 +11,7 @@ libnetbsd_a_SOURCES = efun.c \
 			pwcache.c \
 			setprogname.c \
 			reallocarr.c \
+			reallocarray.c \
 			raise_default_signal.c \
 			setmode.c \
 			stat_flags.c \

src/libnetbsd/reallocarray.c

@@ -0,0 +1,40 @@
+/*	$OpenBSD: reallocarray.c,v 1.3 2015/09/13 08:31:47 guenther Exp $	*/
+/*
+ * Copyright (c) 2008 Otto Moerbeek <[email protected]>
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <bsd.h>
+
+/*
+ * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
+ * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
+ */
+#define MUL_NO_OVERFLOW	((size_t)1 << (sizeof(size_t) * 4))
+
+void *
+reallocarray(void *optr, size_t nmemb, size_t size)
+{
+	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+	    nmemb > 0 && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return realloc(optr, size * nmemb);
+}
+DEF_WEAK(reallocarray);

src/pax/Makefile.am

@@ -6,5 +6,5 @@ pax_LDADD = ../libnetbsd/libnetbsd.a
 man1_MANS = pax.1 tar.1 cpio.1
 
 install-exec-hook:
-	$(LN_S) pax $(bindir)/cpio
-	$(LN_S) pax $(bindir)/tar
+	ln -sf pax $(DESTDIR)$(bindir)/cpio
+	ln -sf pax $(DESTDIR)$(bindir)/tar