Adding upstream version 1:7.9p1.upstream/1%7.9p1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 116 insertions, 0 deletions

diff --git a/regress/unittests/utf8/Makefile b/regress/unittests/utf8/Makefile
new file mode 100644
index 0000000..f8eec04
--- /dev/null
+++ b/regress/unittests/utf8/Makefile
@@ -0,0 +1,14 @@
+#	$OpenBSD: Makefile,v 1.5 2017/12/21 00:41:22 djm Exp $
+
+PROG=test_utf8
+SRCS=tests.c
+
+# From usr.bin/ssh
+SRCS+=utf8.c atomicio.c
+
+REGRESS_TARGETS=run-regress-${PROG}
+
+run-regress-${PROG}: ${PROG}
+	env ${TEST_ENV} ./${PROG}
+
+.include <bsd.regress.mk>
diff --git a/regress/unittests/utf8/tests.c b/regress/unittests/utf8/tests.c
new file mode 100644
index 0000000..f0bbca5
--- /dev/null
+++ b/regress/unittests/utf8/tests.c
@@ -0,0 +1,102 @@
+/*	$OpenBSD: tests.c,v 1.4 2017/02/19 00:11:29 djm Exp $ */
+/*
+ * Regress test for the utf8.h *mprintf() API
+ *
+ * Written by Ingo Schwarze <schwarze@openbsd.org> in 2016
+ * and placed in the public domain.
+ */
+
+#include "includes.h"
+
+#include <locale.h>
+#include <string.h>
+
+#include "../test_helper/test_helper.h"
+
+#include "utf8.h"
+
+static void
+badarg(void)
+{
+	char	 buf[16];
+	int	 len, width;
+
+	width = 1;
+	TEST_START("utf8_badarg");
+	len = snmprintf(buf, sizeof(buf), &width, "\377");
+	ASSERT_INT_EQ(len, -1);
+	ASSERT_STRING_EQ(buf, "");
+	ASSERT_INT_EQ(width, 0);
+	TEST_DONE();
+}
+
+static void
+one(int utf8, const char *name, const char *mbs, int width,
+    int wantwidth, int wantlen, const char *wants)
+{
+	char	 buf[16];
+	int	*wp;
+	int	 len;
+
+	if (wantlen == -2)
+		wantlen = strlen(wants);
+	(void)strlcpy(buf, utf8 ? "utf8_" : "c_", sizeof(buf));
+	(void)strlcat(buf, name, sizeof(buf));
+	TEST_START(buf);
+	wp = wantwidth == -2 ? NULL : &width;
+	len = snmprintf(buf, sizeof(buf), wp, "%s", mbs);
+	ASSERT_INT_EQ(len, wantlen);
+	ASSERT_STRING_EQ(buf, wants);
+	ASSERT_INT_EQ(width, wantwidth);
+	TEST_DONE();
+}
+
+void
+tests(void)
+{
+	char	*loc;
+
+	TEST_START("utf8_setlocale");
+	loc = setlocale(LC_CTYPE, "en_US.UTF-8");
+	ASSERT_PTR_NE(loc, NULL);
+	TEST_DONE();
+
+	badarg();
+	one(1, "empty", "", 2, 0, 0, "");
+	one(1, "ascii", "x", -2, -2, -2, "x");
+	one(1, "newline", "a\nb", -2, -2, -2, "a\nb");
+	one(1, "cr", "a\rb", -2, -2, -2, "a\rb");
+	one(1, "tab", "a\tb", -2, -2, -2, "a\tb");
+	one(1, "esc", "\033x", -2, -2, -2, "\\033x");
+	one(1, "inv_badbyte", "\377x", -2, -2, -2, "\\377x");
+	one(1, "inv_nocont", "\341x", -2, -2, -2, "\\341x");
+	one(1, "inv_nolead", "a\200b", -2, -2, -2, "a\\200b");
+	one(1, "sz_ascii", "1234567890123456", -2, -2, 16, "123456789012345");
+	one(1, "sz_esc", "123456789012\033", -2, -2, 16, "123456789012");
+	one(1, "width_ascii", "123", 2, 2, -1, "12");
+	one(1, "width_double", "a\343\201\201", 2, 1, -1, "a");
+	one(1, "double_fit", "a\343\201\201", 3, 3, 4, "a\343\201\201");
+	one(1, "double_spc", "a\343\201\201", 4, 3, 4, "a\343\201\201");
+
+	TEST_START("C_setlocale");
+	loc = setlocale(LC_CTYPE, "C");
+	ASSERT_PTR_NE(loc, NULL);
+	TEST_DONE();
+
+	badarg();
+	one(0, "empty", "", 2, 0, 0, "");
+	one(0, "ascii", "x", -2, -2, -2, "x");
+	one(0, "newline", "a\nb", -2, -2, -2, "a\nb");
+	one(0, "cr", "a\rb", -2, -2, -2, "a\rb");
+	one(0, "tab", "a\tb", -2, -2, -2, "a\tb");
+	one(0, "esc", "\033x", -2, -2, -2, "\\033x");
+	one(0, "inv_badbyte", "\377x", -2, -2, -2, "\\377x");
+	one(0, "inv_nocont", "\341x", -2, -2, -2, "\\341x");
+	one(0, "inv_nolead", "a\200b", -2, -2, -2, "a\\200b");
+	one(0, "sz_ascii", "1234567890123456", -2, -2, 16, "123456789012345");
+	one(0, "sz_esc", "123456789012\033", -2, -2, 16, "123456789012");
+	one(0, "width_ascii", "123", 2, 2, -1, "12");
+	one(0, "width_double", "a\343\201\201", 2, 1, -1, "a");
+	one(0, "double_fit", "a\343\201\201", 7, 5, -1, "a\\343");
+	one(0, "double_spc", "a\343\201\201", 13, 13, 13, "a\\343\\201\\201");
+}