Module Name:    src
Committed By:   jruoho
Date:           Fri Jul 15 07:35:21 UTC 2011

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/lib/libc/locale: Makefile
Added Files:
        src/tests/lib/libc/locale: t_mbrtowc.c t_mbstowcs.c
Removed Files:
        src/tests/lib/libc/locale: t_ctype1.c t_ctype2.c

Log Message:
Rename two test files to get functional scope (and avoid confusion
with ctype(3)). No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.374 -r1.375 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/locale/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/lib/libc/locale/t_ctype1.c \
    src/tests/lib/libc/locale/t_ctype2.c
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/locale/t_mbrtowc.c \
    src/tests/lib/libc/locale/t_mbstowcs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.374 src/distrib/sets/lists/tests/mi:1.375
--- src/distrib/sets/lists/tests/mi:1.374	Fri Jul 15 06:41:29 2011
+++ src/distrib/sets/lists/tests/mi	Fri Jul 15 07:35:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.374 2011/07/15 06:41:29 jruoho Exp $
+# $NetBSD: mi,v 1.375 2011/07/15 07:35:21 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -393,11 +393,13 @@
 ./usr/libdata/debug/usr/tests/lib/libc/ieeefp/t_round.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/ieeefp/t_subnormal.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/locale				tests-lib-debug
-./usr/libdata/debug/usr/tests/lib/libc/locale/t_ctype1.debug			tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/locale/t_ctype2.debug			tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbtowc.debug			tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/locale/t_wcstod.debug			tests-lib-debug		debug,atf
-./usr/libdata/debug/usr/tests/lib/libc/locale/t_wctomb.debug			tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/locale/t_ctype1.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/lib/libc/locale/t_ctype2.debug		tests-obsolete		obsolete
+./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbrtowc.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbstowcs.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/locale/t_mbtowc.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/locale/t_wcstod.debug		tests-lib-debug		debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/locale/t_wctomb.debug		tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/inet				tests-lib-debug
 ./usr/libdata/debug/usr/tests/lib/libc/inet/t_inet_network.debug	tests-lib-debug		debug,atf
 ./usr/libdata/debug/usr/tests/lib/libc/net				tests-lib-debug
@@ -1923,8 +1925,10 @@
 ./usr/tests/lib/libc/ieeefp/t_subnormal		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale			tests-lib-tests
 ./usr/tests/lib/libc/locale/Atffile		tests-lib-tests		atf
-./usr/tests/lib/libc/locale/t_ctype1		tests-lib-tests		atf
-./usr/tests/lib/libc/locale/t_ctype2		tests-lib-tests		atf
+./usr/tests/lib/libc/locale/t_ctype1		tests-obsolete		obsolete
+./usr/tests/lib/libc/locale/t_ctype2		tests-obsolete		obsolete
+./usr/tests/lib/libc/locale/t_mbrtowc		tests-lib-tests		atf
+./usr/tests/lib/libc/locale/t_mbstowcs		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_mbtowc		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_wcstod		tests-lib-tests		atf
 ./usr/tests/lib/libc/locale/t_wctomb		tests-lib-tests		atf

Index: src/tests/lib/libc/locale/Makefile
diff -u src/tests/lib/libc/locale/Makefile:1.2 src/tests/lib/libc/locale/Makefile:1.3
--- src/tests/lib/libc/locale/Makefile:1.2	Mon Apr 11 17:16:43 2011
+++ src/tests/lib/libc/locale/Makefile	Fri Jul 15 07:35:21 2011
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2011/04/11 17:16:43 tron Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/15 07:35:21 jruoho Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=	${TESTSBASE}/lib/libc/locale
 
-TESTS_C+=	t_ctype1
-TESTS_C+=	t_ctype2
+TESTS_C+=	t_mbrtowc
+TESTS_C+=	t_mbstowcs
 TESTS_C+=	t_mbtowc
 TESTS_C+=	t_wcstod
 TESTS_C+=	t_wctomb

Added files:

Index: src/tests/lib/libc/locale/t_mbrtowc.c
diff -u /dev/null src/tests/lib/libc/locale/t_mbrtowc.c:1.1
--- /dev/null	Fri Jul 15 07:35:22 2011
+++ src/tests/lib/libc/locale/t_mbrtowc.c	Fri Jul 15 07:35:21 2011
@@ -0,0 +1,267 @@
+/* $NetBSD: t_mbrtowc.c,v 1.1 2011/07/15 07:35:21 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by YAMAMOTO Takashi
+ *
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*-
+ * Copyright (c)2003 Citrus Project,
+ * 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 AUTHOR 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 AUTHOR 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>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_mbrtowc.c,v 1.1 2011/07/15 07:35:21 jruoho Exp $");
+
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vis.h>
+#include <wchar.h>
+
+#include <atf-c.h>
+
+#define SIZE 256
+
+static struct test {
+	const char *locale;
+	const char *data;
+	const wchar_t wchars[64];
+	const wchar_t widths[64];
+	size_t length;
+} tests[] = {
+{
+	"C",
+	"ABCD01234_\\",
+	{ 0x41, 0x42, 0x43, 0x44, 0x30, 0x31, 0x32, 0x33, 0x34, 0x5F, 0x5C },
+	{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+	11
+}, {
+	"en_US.UTF-8",
+	"[\001\177][\302\200\337\277][\340\240\200\357\277\277][\360\220\200"
+	"\200\367\277\277\277][\370\210\200\200\200\373\277\277\277\277][\374"
+	"\204\200\200\200\200\375\277\277\277\277\277]",
+	{ 0x5b, 0x01, 0x7f, 0x5d, 0x5b, 0x80, 0x7ff, 0x5d, 0x5b, 0x800, 0xffff,
+	  0x5d, 0x5b, 0x10000, 0x1fffff, 0x5d, 0x5b, 0x200000, 0x3ffffff, 0x5d,
+	  0x5b, 0x4000000, 0x7fffffff, 0x5d },
+	{ 1, 1, 1, 1, 1, 2, 2, 1, 1, 3, 3, 1, 1, 4, 4, 1, 1, 5, 5, 1, 1, 6, 6, 1 },
+	24
+}, {
+	"ja_JP.ISO2022-JP2",
+	"\033$BF|K\1348l\033(BA\033$B$\"\033(BB\033$B$$\033(B",
+	{ 0x4200467c, 0x42004b5c, 0x4200386c, 0x41, 0x42002422, 0x42, 0x42002424 },
+	{ 5, 2, 2, 4, 5, 4, 5 },
+	7
+}, {
+	"ja_JP.SJIS",
+	"\223\372\226{\214\352A\202\240B\202\242",
+	{ 0x93fa, 0x967b, 0x8cea, 0x41, 0x82a0, 0x42, 0x82a2 },
+	{ 2, 2, 2, 1, 2, 1, 2 },
+	7
+}, {
+	"ja_JP.eucJP",
+	"\306\374\313\334\270\354A\244\242B\244\244",
+	{ 0xc6fc, 0xcbdc, 0xb8ec, 0x41, 0xa4a2, 0x42, 0xa4a4 },
+	{ 2, 2, 2, 1, 2, 1, 2 },
+	7
+}, {
+	NULL,
+	NULL,
+	{ },
+	{ },
+	0
+}
+};
+
+static void
+h_ctype2(const struct test *t, bool use_mbstate)
+{
+	mbstate_t *stp;
+	mbstate_t st;
+	char buf[SIZE];
+	char *str;
+	size_t n;
+
+	ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
+	ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL);
+
+	(void)strvis(buf, t->data, VIS_WHITE | VIS_OCTAL);
+	(void)printf("Checking string: \"%s\"\n", buf);
+
+	ATF_REQUIRE((str = setlocale(LC_ALL, NULL)) != NULL);
+	(void)printf("Using locale: %s\n", str);
+
+	(void)printf("Using mbstate: %s\n", use_mbstate ? "yes" : "no");
+
+	(void)memset(&st, 0, sizeof(st));
+//	mbrtowc(0, 0, 0, &st); /* XXX for ISO2022-JP */
+	stp = use_mbstate ? &st : 0;
+
+	for (n = 9; n > 0; n--) {
+		const char *src = t->data;
+		wchar_t dst;
+		size_t nchar = 0;
+		int width = 0;
+
+		ATF_REQUIRE(mbsinit(stp) != 0);
+
+		for (;;) {
+			size_t rv = mbrtowc(&dst, src, n, stp);
+
+			if (rv == 0)
+				break;
+
+			if (rv == (size_t)-2) {
+				src += n;
+				width += n;
+
+				continue;
+			}
+			if (rv == (size_t)-1) {
+				ATF_REQUIRE_EQ(errno, EILSEQ);
+				atf_tc_fail("Invalid sequence");
+				/* NOTREACHED */
+			}
+
+			width += rv;
+			src += rv;
+
+			if (dst != t->wchars[nchar] ||
+			    width != t->widths[nchar]) {
+				(void)printf("At position %zd:\n", nchar);
+				(void)printf("  expected: 0x%04X (%u)\n",
+					t->wchars[nchar], t->widths[nchar]);
+				(void)printf("  got     : 0x%04X (%u)\n",
+					dst, width);
+				atf_tc_fail("Test failed");
+			}
+
+			nchar++;
+			width = 0;
+		}
+
+		ATF_REQUIRE_EQ_MSG(dst, 0, "Incorrect terminating character: "
+			"0x%04X (expected: 0x00)", dst);
+
+		ATF_REQUIRE_EQ_MSG(nchar, t->length, "Incorrect length: "
+			"%zd (expected: %zd)", nchar, t->length);
+	}
+
+	{
+		wchar_t wbuf[SIZE];
+		size_t rv;
+		char const *src = t->data;
+		int i;
+
+		(void)memset(wbuf, 0xFF, sizeof(wbuf));
+
+		rv = mbsrtowcs(wbuf, &src, SIZE, stp);
+
+		ATF_REQUIRE_EQ_MSG(rv, t->length, "Incorrect length: %zd "
+			"(expected: %zd)", rv, t->length);
+		ATF_REQUIRE_EQ(src, NULL);
+
+		for (i = 0; wbuf[i] != 0; ++i) {
+			if (wbuf[i] == t->wchars[i])
+				continue;
+
+			(void)printf("At position %d:\n", i);
+			(void)printf("  expected: 0x%04X\n", t->wchars[i]);
+			(void)printf("  got     : 0x%04X\n", wbuf[i]);
+			atf_tc_fail("Test failed");
+		}
+
+		ATF_REQUIRE_EQ_MSG((size_t)i, t->length, "Incorrect length: "
+			"%d (expected: %zd)", i, t->length);
+	}
+
+	(void)printf("Ok.\n");
+}
+
+ATF_TC(mbrtowc_internal);
+ATF_TC_HEAD(mbrtowc_internal, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks mbrtowc(3) and mbsrtowcs(3) (using internal "
+		"state) with different locales");
+}
+ATF_TC_BODY(mbrtowc_internal, tc)
+{
+	struct test *t;
+
+	for (t = &tests[0]; t->data != NULL; ++t)
+		h_ctype2(t, false);
+}
+
+ATF_TC(mbrtowc_object);
+ATF_TC_HEAD(mbrtowc_object, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks mbrtowc(3) and mbsrtowcs(3) (using state "
+		"object) with different locales");
+}
+ATF_TC_BODY(mbrtowc_object, tc)
+{
+	struct test *t;
+
+	for (t = &tests[0]; t->data != NULL; ++t)
+		h_ctype2(t, true);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+	ATF_TP_ADD_TC(tp, mbrtowc_internal);
+	ATF_TP_ADD_TC(tp, mbrtowc_object);
+
+	return atf_no_error();
+}
Index: src/tests/lib/libc/locale/t_mbstowcs.c
diff -u /dev/null src/tests/lib/libc/locale/t_mbstowcs.c:1.1
--- /dev/null	Fri Jul 15 07:35:22 2011
+++ src/tests/lib/libc/locale/t_mbstowcs.c	Fri Jul 15 07:35:21 2011
@@ -0,0 +1,202 @@
+/* $NetBSD: t_mbstowcs.c,v 1.1 2011/07/15 07:35:21 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*-
+ * Copyright (c)2003 Citrus Project,
+ * 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 AUTHOR 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 AUTHOR 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>
+__COPYRIGHT("@(#) Copyright (c) 2011\
+ The NetBSD Foundation, inc. All rights reserved.");
+__RCSID("$NetBSD: t_mbstowcs.c,v 1.1 2011/07/15 07:35:21 jruoho Exp $");
+
+#include <errno.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <vis.h>
+#include <wchar.h>
+
+#include <atf-c.h>
+
+#define REQUIRE_ERRNO(x, v) \
+	ATF_REQUIRE_MSG((x) != (v), "%s: %s", #x, strerror(errno))
+
+#define SIZE 256
+
+static struct test {
+	const char *locale;
+	const char *data;
+	wchar_t wchars[64];
+	int widths[64];
+	int width;
+} tests[] = {
+{
+	"en_US.UTF-8",
+	"[\001\177][\302\200\337\277][\340\240\200\357\277\277][\360\220\200"
+	"\200\367\277\277\277][\370\210\200\200\200\373\277\277\277\277][\374"
+	"\204\200\200\200\200\375\277\277\277\277\277]",
+	{
+		0x5B, 0x01, 0x7F, 0x5D, 0x5B, 0x80, 0x07FF, 0x5D, 0x5B, 0x0800,
+		0xFFFF, 0x5D, 0x5B, 0x10000, 0x1FFFFF, 0x5D, 0x5B, 0x200000,
+		0x3FFFFFF, 0x5D, 0x5B, 0x4000000, 0x7FFFFFFF, 0x5D, 0x0A
+	},
+	{	 1, -1, -1,  1,  1, -1, -1,  1,  1, -1, -1,  1,  1, -1, -1,
+		 1,  1, -1, -1,  1,  1, -1, -1,  1, -1
+	}, 
+	-1
+}, {
+	"ja_JP.ISO2022-JP",
+	"\033$B#J#I#S$G$9!#\033(Baaaa\033$B$\"$$$&$($*\033(B",
+	{
+		0x4200234A, 0x42002349, 0x42002353, 0x42002447, 0x42002439,
+		0x42002123, 0x61, 0x61, 0x61, 0x61, 0x42002422, 0x42002424,
+		0x42002426, 0x42002428, 0x4200242A, 0x0A
+	},
+	{ 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, -1 },
+	26
+}, {
+	"ja_JP.SJIS",
+	"\202r\202i\202h\202r\202\305\202\267\201Baaaa\202\240\202\242"
+	"\202\244\202\246\202\250",
+	{
+		0x8272, 0x8269, 0x8268, 0x8272, 0x82C5, 0x82B7, 0x8142, 0x61,
+		0x61, 0x61, 0x61, 0x82A0, 0x82A2, 0x82A4, 0x82A6, 0x82A8, 0x0A
+	},
+	{ 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, -1 },
+	28
+}, {
+	"ja_JP.eucJP",
+	"\243\305\243\325\243\303\244\307\244\271\241\243aaaa\244\242\244"
+	"\244\244\246\244\250\244\252",
+	{
+		0xA3C5, 0xA3D5, 0xA3C3, 0xA4C7, 0xA4B9, 0xA1A3, 0x61, 0x61, 0x61,
+		0x61, 0xA4A2, 0xA4A4, 0xA4A6, 0xA4A8, 0xA4AA, 0x0A
+	},
+	{ 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, -1 },
+	26
+}, {
+	NULL,
+	NULL,
+	{},
+	{},
+	0
+}
+};
+
+ATF_TC(mbstowcs_basic);
+ATF_TC_HEAD(mbstowcs_basic, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Checks wide character functions with different locales");
+}
+ATF_TC_BODY(mbstowcs_basic, tc)
+{
+	struct test *t;
+
+	for (t = &tests[0]; t->data != NULL; ++t) {
+		wchar_t	wbuf[SIZE];
+		char buf[SIZE];
+		char visbuf[SIZE];
+		char *str;
+		int i;
+
+		ATF_REQUIRE_STREQ(setlocale(LC_ALL, "C"), "C");
+		ATF_REQUIRE(setlocale(LC_CTYPE, t->locale) != NULL);
+
+		(void)strvis(visbuf, t->data, VIS_WHITE | VIS_OCTAL);
+		(void)printf("Checking string: \"%s\"\n", visbuf);
+
+		ATF_REQUIRE((str = setlocale(LC_ALL, NULL)) != NULL);
+		(void)printf("Using locale: %s\n", str);
+
+		REQUIRE_ERRNO((ssize_t)mbstowcs(wbuf, t->data, SIZE-1), -1);
+		REQUIRE_ERRNO((ssize_t)wcstombs(buf, wbuf, SIZE-1), -1);
+
+		if (strcmp(buf, t->data) != 0) {
+			(void)strvis(visbuf, buf, VIS_WHITE | VIS_OCTAL);
+			(void)printf("Conversion to wcs and back failed: "
+				"\"%s\"\n", visbuf);
+			atf_tc_fail("Test failed");
+		}
+
+		/* The output here is implementation-dependent. */
+
+		for (i = 0; wbuf[i] != 0; ++i) {
+			if (wbuf[i] == t->wchars[i] &&
+			    wcwidth(wbuf[i]) == t->widths[i])
+				continue;
+
+			(void)printf("At position %d:\n", i);
+			(void)printf("  expected: 0x%04X (%d)\n",
+				t->wchars[i], t->widths[i]);
+			(void)printf("  got     : 0x%04X (%d)\n", wbuf[i],
+				wcwidth(wbuf[i]));
+			atf_tc_fail("Test failed");
+		}
+
+		if (wcswidth(wbuf, SIZE-1) != t->width) {
+			(void)printf("Incorrect wcswidth:\n");
+			(void)printf("  expected: %d\n", t->width);
+			(void)printf("  got     : %d\n", wcswidth(wbuf, SIZE-1));
+			atf_tc_fail("Test failed");
+		}
+
+		(void)printf("Ok.\n");
+	}
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, mbstowcs_basic);
+
+	return atf_no_error();
+}

Reply via email to