Merge remote-tracking branch 'origin/stable/10' into develdevel

5 files changed, 61 insertions, 25 deletions

diff --git a/contrib/netbsd-tests/lib/libc/string/t_memcpy.c b/contrib/netbsd-tests/lib/libc/string/t_memcpy.c
index 5bbd924..64cdb29 100644
--- a/contrib/netbsd-tests/lib/libc/string/t_memcpy.c
+++ b/contrib/netbsd-tests/lib/libc/string/t_memcpy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_memcpy.c,v 1.5 2013/03/17 02:23:31 christos Exp $ */
+/* $NetBSD: t_memcpy.c,v 1.6 2017/01/11 18:05:54 christos Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -108,12 +108,8 @@ ATF_TC_BODY(memcpy_basic, tc)
 			if (i != j)
 				runTest(start[i], start[j]);
 	MD5End(mc, result);
-#ifdef __NetBSD__
-	ATF_REQUIRE_EQ(strcmp(result, goodResult), 0);
-#else
 	ATF_REQUIRE_EQ_MSG(strcmp(result, goodResult), 0, "%s != %s",
 	    result, goodResult);
-#endif
 }
 
 ATF_TC(memccpy_simple);
diff --git a/contrib/netbsd-tests/lib/libc/string/t_memmem.c b/contrib/netbsd-tests/lib/libc/string/t_memmem.c
index 8734bc3..5bf60ce 100644
--- a/contrib/netbsd-tests/lib/libc/string/t_memmem.c
+++ b/contrib/netbsd-tests/lib/libc/string/t_memmem.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_memmem.c,v 1.2 2011/07/07 08:27:36 jruoho Exp $ */
+/*	$NetBSD: t_memmem.c,v 1.3 2017/01/11 18:07:37 christos Exp $ */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -51,6 +51,8 @@ char p6[] = "9";
 int lp6 = 1;
 char p7[] = "654";
 int lp7 = 3;
+char p8[] = "89abc";
+int lp8 = 5;
 
 char b0[] = "";
 int lb0 = 0;
@@ -75,7 +77,7 @@ ATF_TC_HEAD(memmem_basic, tc)
 ATF_TC_BODY(memmem_basic, tc)
 {
 
-#if defined(__darwin__) || defined(__FreeBSD__)
+#if defined(__darwin__)
 	expect(memmem(b2, lb2, p0, lp0) == NULL);
 	expect(memmem(b0, lb0, p0, lp0) == NULL);
 #else
@@ -94,6 +96,7 @@ ATF_TC_BODY(memmem_basic, tc)
 
 	expect(memmem(b2, lb2, p4, lp4) == NULL);
 	expect(memmem(b2, lb2, p7, lp7) == NULL);
+	expect(memmem(b2, lb2, p8, lp8) == NULL);
 }
 
 ATF_TP_ADD_TCS(tp)
diff --git a/contrib/netbsd-tests/lib/libc/string/t_memset.c b/contrib/netbsd-tests/lib/libc/string/t_memset.c
index c1fb385..5a2be28 100644
--- a/contrib/netbsd-tests/lib/libc/string/t_memset.c
+++ b/contrib/netbsd-tests/lib/libc/string/t_memset.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_memset.c,v 1.3 2013/03/17 02:23:31 christos Exp $ */
+/* $NetBSD: t_memset.c,v 1.4 2015/09/11 09:25:52 martin Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_memset.c,v 1.3 2013/03/17 02:23:31 christos Exp $");
+__RCSID("$NetBSD: t_memset.c,v 1.4 2015/09/11 09:25:52 martin Exp $");
 
 #include <sys/stat.h>
 
@@ -42,6 +42,8 @@ static long	page = 0;
 static void	fill(char *, size_t, char);
 static bool	check(char *, size_t, char);
 
+int zero;	/* always zero, but the compiler does not know */
+
 ATF_TC(memset_array);
 ATF_TC_HEAD(memset_array, tc)
 {
@@ -133,6 +135,50 @@ ATF_TC_BODY(memset_nonzero, tc)
 	free(buf);
 }
 
+ATF_TC(memset_zero_size);
+
+ATF_TC_HEAD(memset_zero_size, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test memset(3) with zero size");
+}
+
+ATF_TC_BODY(memset_zero_size, tc)
+{
+	char buf[1024];
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	if (check(buf, sizeof(buf), 'x') != true)
+		atf_tc_fail("memset(3) did not fill a static buffer");
+
+	(void)memset(buf+sizeof(buf)/2, 0, zero);
+
+	if (check(buf, sizeof(buf), 'x') != true)
+		atf_tc_fail("memset(3) with 0 size did change the buffer");
+}
+
+ATF_TC(bzero_zero_size);
+
+ATF_TC_HEAD(bzero_zero_size, tc)
+{
+	atf_tc_set_md_var(tc, "descr", "Test bzero(3) with zero size");
+}
+
+ATF_TC_BODY(bzero_zero_size, tc)
+{
+	char buf[1024];
+
+	(void)memset(buf, 'x', sizeof(buf));
+
+	if (check(buf, sizeof(buf), 'x') != true)
+		atf_tc_fail("memset(3) did not fill a static buffer");
+
+	(void)bzero(buf+sizeof(buf)/2, zero);
+
+	if (check(buf, sizeof(buf), 'x') != true)
+		atf_tc_fail("bzero(3) with 0 size did change the buffer");
+}
+
 ATF_TC(memset_struct);
 ATF_TC_HEAD(memset_struct, tc)
 {
@@ -202,6 +248,8 @@ ATF_TP_ADD_TCS(tp)
 	ATF_TP_ADD_TC(tp, memset_nonzero);
 	ATF_TP_ADD_TC(tp, memset_struct);
 	ATF_TP_ADD_TC(tp, memset_return);
+	ATF_TP_ADD_TC(tp, memset_zero_size);
+	ATF_TP_ADD_TC(tp, bzero_zero_size);
 
 	return atf_no_error();
 }
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strchr.c b/contrib/netbsd-tests/lib/libc/string/t_strchr.c
index 4556b2c..5dd9a62 100644
--- a/contrib/netbsd-tests/lib/libc/string/t_strchr.c
+++ b/contrib/netbsd-tests/lib/libc/string/t_strchr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strchr.c,v 1.1 2011/07/07 08:59:33 jruoho Exp $ */
+/* $NetBSD: t_strchr.c,v 1.2 2017/01/10 15:34:49 christos Exp $ */
 
 /*
  * Written by J.T. Conklin <jtc@acorntoolworks.com>
@@ -58,12 +58,10 @@ ATF_TC_HEAD(strchr_basic, tc)
 
 ATF_TC_BODY(strchr_basic, tc)
 {
-#ifdef	__FreeBSD__
 	void *dl_handle;
-#endif
-	unsigned int t, a;
 	char *off;
 	char buf[32];
+	unsigned int t, a;
 
 	const char *tab[] = {
 		"",
@@ -248,12 +246,8 @@ ATF_TC_BODY(strchr_basic, tc)
 		"abcdefgh/abcdefgh/",
 	};
 
-#ifdef	__FreeBSD__
 	dl_handle = dlopen(NULL, RTLD_LAZY);
 	strchr_fn = dlsym(dl_handle, "test_strlen");
-#else
-	strchr_fn = dlsym(dlopen(0, RTLD_LAZY), "test_strchr");
-#endif
 	if (!strchr_fn)
 		strchr_fn = strchr;
 
@@ -288,9 +282,7 @@ ATF_TC_BODY(strchr_basic, tc)
 			verify_strchr(buf + a, 0xff, t, a);
 		}
 	}
-#ifdef	__FreeBSD__
 	(void)dlclose(dl_handle);
-#endif
 }
 
 ATF_TP_ADD_TCS(tp)
diff --git a/contrib/netbsd-tests/lib/libc/string/t_strerror.c b/contrib/netbsd-tests/lib/libc/string/t_strerror.c
index 888a826..99b95b4 100644
--- a/contrib/netbsd-tests/lib/libc/string/t_strerror.c
+++ b/contrib/netbsd-tests/lib/libc/string/t_strerror.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strerror.c,v 1.3 2011/05/10 06:55:27 jruoho Exp $ */
+/* $NetBSD: t_strerror.c,v 1.4 2017/01/10 20:35:49 christos Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,18 +29,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_strerror.c,v 1.3 2011/05/10 06:55:27 jruoho Exp $");
+__RCSID("$NetBSD: t_strerror.c,v 1.4 2017/01/10 20:35:49 christos Exp $");
 
 #include <atf-c.h>
 #include <errno.h>
+#include <stdio.h>	/* Needed for sys_nerr on FreeBSD */
 #include <limits.h>
 #include <locale.h>
 #include <string.h>
 
-#ifdef __FreeBSD__
-#include <stdio.h>
-#endif
-
 ATF_TC(strerror_basic);
 ATF_TC_HEAD(strerror_basic, tc)
 {