MFC r316213:

Implement the memset_s(3) function as specified by the C11 ISO/IEC
9899:2011 Appendix K 3.7.4.1.

MFC r316258:
Only activate __EXT1_VISIBLE block when using sys/errno.h in userspace.

2 files changed, 64 insertions, 0 deletions

diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile
index c681cb6..2718918 100644
--- a/lib/libc/tests/stdlib/Makefile
+++ b/lib/libc/tests/stdlib/Makefile
@@ -5,6 +5,7 @@
 ATF_TESTS_C+=		heapsort_test
 ATF_TESTS_C+=		mergesort_test
 ATF_TESTS_C+=		qsort_test
+ATF_TESTS_C+=		set_constraint_handler_s_test
 ATF_TESTS_C+=		tsearch_test
 .if ${COMPILER_FEATURES:Mc++11}
 ATF_TESTS_CXX+=		cxa_thread_atexit_test
diff --git a/lib/libc/tests/stdlib/set_constraint_handler_s_test.c b/lib/libc/tests/stdlib/set_constraint_handler_s_test.c
new file mode 100644
index 0000000..6a33c98
--- /dev/null
+++ b/lib/libc/tests/stdlib/set_constraint_handler_s_test.c
@@ -0,0 +1,63 @@
+/*-
+ * Copyright (c) 2017 Juniper Networks.  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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <assert.h>
+#include <stdlib.h>
+
+#include <atf-c.h>
+
+/* null */
+ATF_TC_WITHOUT_HEAD(null_handler);
+ATF_TC_BODY(null_handler, tc)
+{
+	assert(set_constraint_handler_s(abort_handler_s) == NULL);
+}
+
+/* abort handler */
+ATF_TC_WITHOUT_HEAD(abort_handler);
+ATF_TC_BODY(abort_handler, tc)
+{
+	set_constraint_handler_s(abort_handler_s);
+	assert(set_constraint_handler_s(ignore_handler_s) == abort_handler_s);
+}
+
+/* ignore handler */
+ATF_TC_WITHOUT_HEAD(ignore_handler);
+ATF_TC_BODY(ignore_handler, tc)
+{
+	set_constraint_handler_s(ignore_handler_s);
+	assert(set_constraint_handler_s(abort_handler_s) == ignore_handler_s);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, null_handler);
+	ATF_TP_ADD_TC(tp, abort_handler);
+	ATF_TP_ADD_TC(tp, ignore_handler);
+	return (atf_no_error());
+}