From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-2.9 required=3.0 tests=AWL,BAYES_00,BODY_8BITS, DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 203D51F463 for ; Sun, 5 Jan 2020 11:28:50 +0000 (UTC) Received: from localhost ([::1]:41234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io45Q-0007NM-K7 for normalperson@yhbt.net; Sun, 05 Jan 2020 06:28:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49507) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io45K-0007NE-C0 for bug-gnulib@gnu.org; Sun, 05 Jan 2020 06:28:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io45H-0002bU-Cs for bug-gnulib@gnu.org; Sun, 05 Jan 2020 06:28:42 -0500 Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::4]:30103) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1io45G-0002W7-GZ for bug-gnulib@gnu.org; Sun, 05 Jan 2020 06:28:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1578223715; s=strato-dkim-0002; d=clisp.org; h=Message-ID:Date:Subject:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=AYJ9OGhGaZZfZsRAw0e8OvTLnIje0vIoXLLUdZNpqIw=; b=NYVgrVJmlVsDaV/wju7hxRZCKwdti0oYIWPYfODxNzTG53iZUfW9pLD5wp/XJw4PHk gFbWENiwiICLAXabB0W3Fbb44J6bTTNVwpPlruWPiFgF8TrRzyWMNjeqNbxLlvqHcZgy pLV4QkFrRJvLOi4FLgF4nUBz1IQrOg7pfGSnb66Jde3ETUVgJnXVzoEBy3jP0/lRD51/ Rlrpf/UipFrIcTq0ADPAkpxjcGcB4AdsImKpSH6Q4mLzTcVgS8lIhHHoelgbTsaNph6B 2pDFBUB2xNvVNyLl11excdclTZNW7nVwNEmjIWwH01zk8lfLLutZmbw6UblI561aOLTe 2tiQ== X-RZG-AUTH: ":Ln4Re0+Ic/6oZXR1YgKryK8brlshOcZlIWs+iCP5vnk6shH+AHjwLuWOH6fzxfs=" X-RZG-CLASS-ID: mo00 Received: from bruno.haible.de by smtp.strato.de (RZmta 46.1.3 DYNA|AUTH) with ESMTPSA id R06a06w05BSYRw2 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (curve X9_62_prime256v1 with 256 ECDH bits, eq. 3072 bits RSA)) (Client did not present a certificate); Sun, 5 Jan 2020 12:28:34 +0100 (CET) From: Bruno Haible To: bug-gnulib@gnu.org Subject: new module 'mbstoc32s' Date: Sun, 05 Jan 2020 12:28:34 +0100 Message-ID: <2634022.RCnRmxlyi0@omega> User-Agent: KMail/5.1.3 (Linux/4.4.0-170-generic; KDE/5.18.0; x86_64; ; ) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart1949671.Xcd06bYnWE" Content-Transfer-Encoding: 7Bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:238:20a:202:5300::4 X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" This is a multi-part message in MIME format. --nextPart1949671.Xcd06bYnWE Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" mbstoc32s is like mbstowcs, except that it produces a sequence of char32_t wide characters. 2020-01-05 Bruno Haible mbstoc32s: Add tests. * tests/test-mbstoc32s.c: New file, based on tests/test-mbsrtoc32s.c. * tests/test-mbstoc32s-1.sh: New file, based on tests/test-mbsrtoc32s-1.sh. * tests/test-mbstoc32s-2.sh: New file, based on tests/test-mbsrtoc32s-2.sh. * tests/test-mbstoc32s-3.sh: New file, based on tests/test-mbsrtoc32s-3.sh. * tests/test-mbstoc32s-4.sh: New file, based on tests/test-mbsrtoc32s-4.sh. * modules/mbstoc32s-tests: New file, based on modules/mbsrtoc32s-tests. mbstoc32s: New module. * lib/uchar.in.h (mbstoc32s): New declaration. * lib/mbstoc32s.c: New file. * m4/uchar.m4 (gl_UCHAR_H_DEFAULTS): Initialize GNULIB_MBSTOC32S. * modules/uchar (Makefile.am): Substitute GNULIB_MBSTOC32S. * modules/mbstoc32s: New file. * tests/test-uchar-c++.cc: Test the signature of mbstoc32s. * doc/posix-functions/mbstowcs.texi: Mention the new module. --nextPart1949671.Xcd06bYnWE Content-Disposition: attachment; filename="0001-mbstoc32s-New-module.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0001-mbstoc32s-New-module.patch" >From 8208c314448c4a26beda29b9666a5626521b7312 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jan 2020 12:23:00 +0100 Subject: [PATCH 1/2] mbstoc32s: New module. * lib/uchar.in.h (mbstoc32s): New declaration. * lib/mbstoc32s.c: New file. * m4/uchar.m4 (gl_UCHAR_H_DEFAULTS): Initialize GNULIB_MBSTOC32S. * modules/uchar (Makefile.am): Substitute GNULIB_MBSTOC32S. * modules/mbstoc32s: New file. * tests/test-uchar-c++.cc: Test the signature of mbstoc32s. * doc/posix-functions/mbstowcs.texi: Mention the new module. --- ChangeLog | 11 +++++++++++ doc/posix-functions/mbstowcs.texi | 7 +++++-- lib/mbstoc32s.c | 33 +++++++++++++++++++++++++++++++++ lib/uchar.in.h | 11 +++++++++++ m4/uchar.m4 | 3 ++- modules/mbstoc32s | 28 ++++++++++++++++++++++++++++ modules/uchar | 1 + tests/test-uchar-c++.cc | 5 +++++ 8 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 lib/mbstoc32s.c create mode 100644 modules/mbstoc32s diff --git a/ChangeLog b/ChangeLog index 1a1d8b9..f2d507b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2020-01-05 Bruno Haible + mbstoc32s: New module. + * lib/uchar.in.h (mbstoc32s): New declaration. + * lib/mbstoc32s.c: New file. + * m4/uchar.m4 (gl_UCHAR_H_DEFAULTS): Initialize GNULIB_MBSTOC32S. + * modules/uchar (Makefile.am): Substitute GNULIB_MBSTOC32S. + * modules/mbstoc32s: New file. + * tests/test-uchar-c++.cc: Test the signature of mbstoc32s. + * doc/posix-functions/mbstowcs.texi: Mention the new module. + +2020-01-05 Bruno Haible + Tweak recently added tests. * tests/test-mbrtoc32.c: Make signature consistent with uchar.in.h. * tests/test-mbsrtoc32s.c: Likewise. diff --git a/doc/posix-functions/mbstowcs.texi b/doc/posix-functions/mbstowcs.texi index af6ea73..5d7dc4c 100644 --- a/doc/posix-functions/mbstowcs.texi +++ b/doc/posix-functions/mbstowcs.texi @@ -13,6 +13,9 @@ Portability problems fixed by Gnulib: Portability problems not fixed by Gnulib: @itemize @item -On Windows and 32-bit AIX platforms, @code{wchar_t} is a 16-bit type and therefore cannot -accommodate all Unicode characters. +On Windows and 32-bit AIX platforms, @code{wchar_t} is a 16-bit type and +therefore cannot accommodate all Unicode characters. +However, the Gnulib function @code{mbstoc32s}, provided by Gnulib module +@code{mbstoc32s}, operates on 32-bit wide characters and therefore does not +have this limitation. @end itemize diff --git a/lib/mbstoc32s.c b/lib/mbstoc32s.c new file mode 100644 index 0000000..ede2786 --- /dev/null +++ b/lib/mbstoc32s.c @@ -0,0 +1,33 @@ +/* Convert string to 32-bit wide string. + Copyright (C) 2020 Free Software Foundation, Inc. + Written by Bruno Haible , 2020. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +/* Specification. */ +#include + +#include +#include + +size_t +mbstoc32s (char32_t *dest, const char *src, size_t len) +{ + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + return mbsrtoc32s (dest, &src, len, &state); +} diff --git a/lib/uchar.in.h b/lib/uchar.in.h index f31b18c..513fa8c 100644 --- a/lib/uchar.in.h +++ b/lib/uchar.in.h @@ -132,4 +132,15 @@ _GL_CXXALIASWARN (mbsrtoc32s); #endif +/* Convert a string to a 32-bit wide string. */ +#if @GNULIB_MBSTOC32S@ +_GL_FUNCDECL_SYS (mbstoc32s, size_t, + (char32_t *dest, const char *src, size_t len) + _GL_ARG_NONNULL ((2))); +_GL_CXXALIAS_SYS (mbstoc32s, size_t, + (char32_t *dest, const char *src, size_t len)); +_GL_CXXALIASWARN (mbstoc32s); +#endif + + #endif /* _@GUARD_PREFIX@_UCHAR_H */ diff --git a/m4/uchar.m4 b/m4/uchar.m4 index 4e0f43a..0b5c662 100644 --- a/m4/uchar.m4 +++ b/m4/uchar.m4 @@ -1,4 +1,4 @@ -# uchar.m4 serial 7 +# uchar.m4 serial 8 dnl Copyright (C) 2019-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -52,6 +52,7 @@ AC_DEFUN([gl_UCHAR_H_DEFAULTS], GNULIB_MBRTOC32=0; AC_SUBST([GNULIB_MBRTOC32]) GNULIB_MBSNRTOC32S=0; AC_SUBST([GNULIB_MBSNRTOC32S]) GNULIB_MBSRTOC32S=0; AC_SUBST([GNULIB_MBSRTOC32S]) + GNULIB_MBSTOC32S=0; AC_SUBST([GNULIB_MBSTOC32S]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_MBRTOC32=1; AC_SUBST([HAVE_MBRTOC32]) REPLACE_MBRTOC32=0; AC_SUBST([REPLACE_MBRTOC32]) diff --git a/modules/mbstoc32s b/modules/mbstoc32s new file mode 100644 index 0000000..e2b1662 --- /dev/null +++ b/modules/mbstoc32s @@ -0,0 +1,28 @@ +Description: +mbstoc32s() function: convert string to 32-bit wide string. + +Files: +lib/mbstoc32s.c + +Depends-on: +uchar +wchar +mbsrtoc32s + +configure.ac: +gl_UCHAR_MODULE_INDICATOR([mbstoc32s]) + +Makefile.am: +lib_SOURCES += mbstoc32s.c + +Include: + + +Link: +$(LIB_MBRTOWC) + +License: +LGPLv2+ + +Maintainer: +Bruno Haible diff --git a/modules/uchar b/modules/uchar index a50eb5a..29bc7ae 100644 --- a/modules/uchar +++ b/modules/uchar @@ -33,6 +33,7 @@ uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) -e 's/@''GNULIB_MBRTOC32''@/$(GNULIB_MBRTOC32)/g' \ -e 's/@''GNULIB_MBSNRTOC32S''@/$(GNULIB_MBSNRTOC32S)/g' \ -e 's/@''GNULIB_MBSRTOC32S''@/$(GNULIB_MBSRTOC32S)/g' \ + -e 's/@''GNULIB_MBSTOC32S''@/$(GNULIB_MBSTOC32S)/g' \ -e 's|@''HAVE_MBRTOC32''@|$(HAVE_MBRTOC32)|g' \ -e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ diff --git a/tests/test-uchar-c++.cc b/tests/test-uchar-c++.cc index a630eec..3e71c89 100644 --- a/tests/test-uchar-c++.cc +++ b/tests/test-uchar-c++.cc @@ -48,6 +48,11 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrtoc32s, size_t, (char32_t *, const char **, size_t, mbstate_t *)); #endif +#if GNULIB_TEST_MBSTOC32S +SIGNATURE_CHECK (GNULIB_NAMESPACE::mbstoc32s, size_t, + (char32_t *, const char *, size_t)); +#endif + int main () -- 2.7.4 --nextPart1949671.Xcd06bYnWE Content-Disposition: attachment; filename="0002-mbstoc32s-Add-tests.patch" Content-Transfer-Encoding: quoted-printable Content-Type: text/x-patch; charset="UTF-8"; name="0002-mbstoc32s-Add-tests.patch" =46rom aca8cb793a857b254b8244f8e7cb528fa0d023ab Mon Sep 17 00:00:00 2001 =46rom: Bruno Haible Date: Sun, 5 Jan 2020 12:23:37 +0100 Subject: [PATCH 2/2] mbstoc32s: Add tests. * tests/test-mbstoc32s.c: New file, based on tests/test-mbsrtoc32s.c. * tests/test-mbstoc32s-1.sh: New file, based on tests/test-mbsrtoc32s-1.sh. * tests/test-mbstoc32s-2.sh: New file, based on tests/test-mbsrtoc32s-2.sh. * tests/test-mbstoc32s-3.sh: New file, based on tests/test-mbsrtoc32s-3.sh. * tests/test-mbstoc32s-4.sh: New file, based on tests/test-mbsrtoc32s-4.sh. * modules/mbstoc32s-tests: New file, based on modules/mbsrtoc32s-tests. =2D-- ChangeLog | 12 +++ modules/mbstoc32s-tests | 32 ++++++ tests/test-mbstoc32s-1.sh | 15 +++ tests/test-mbstoc32s-2.sh | 15 +++ tests/test-mbstoc32s-3.sh | 15 +++ tests/test-mbstoc32s-4.sh | 15 +++ tests/test-mbstoc32s.c | 244 ++++++++++++++++++++++++++++++++++++++++++= ++++ 7 files changed, 348 insertions(+) create mode 100644 modules/mbstoc32s-tests create mode 100755 tests/test-mbstoc32s-1.sh create mode 100755 tests/test-mbstoc32s-2.sh create mode 100755 tests/test-mbstoc32s-3.sh create mode 100755 tests/test-mbstoc32s-4.sh create mode 100644 tests/test-mbstoc32s.c diff --git a/ChangeLog b/ChangeLog index f2d507b..e2278a3 100644 =2D-- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2020-01-05 Bruno Haible =20 + mbstoc32s: Add tests. + * tests/test-mbstoc32s.c: New file, based on tests/test-mbsrtoc32s.c. + * tests/test-mbstoc32s-1.sh: New file, based on + tests/test-mbsrtoc32s-1.sh. + * tests/test-mbstoc32s-2.sh: New file, based on + tests/test-mbsrtoc32s-2.sh. + * tests/test-mbstoc32s-3.sh: New file, based on + tests/test-mbsrtoc32s-3.sh. + * tests/test-mbstoc32s-4.sh: New file, based on + tests/test-mbsrtoc32s-4.sh. + * modules/mbstoc32s-tests: New file, based on modules/mbsrtoc32s-tests. + mbstoc32s: New module. * lib/uchar.in.h (mbstoc32s): New declaration. * lib/mbstoc32s.c: New file. diff --git a/modules/mbstoc32s-tests b/modules/mbstoc32s-tests new file mode 100644 index 0000000..7234daa =2D-- /dev/null +++ b/modules/mbstoc32s-tests @@ -0,0 +1,32 @@ +Files: +tests/test-mbstoc32s-1.sh +tests/test-mbstoc32s-2.sh +tests/test-mbstoc32s-3.sh +tests/test-mbstoc32s-4.sh +tests/test-mbstoc32s.c +tests/signature.h +tests/macros.h +m4/locale-fr.m4 +m4/locale-ja.m4 +m4/locale-zh.m4 +m4/codeset.m4 + +Depends-on: +c32tob +setlocale + +configure.ac: +gt_LOCALE_FR +gt_LOCALE_FR_UTF8 +gt_LOCALE_JA +gt_LOCALE_ZH_CN + +Makefile.am: +TESTS +=3D test-mbstoc32s-1.sh test-mbstoc32s-2.sh test-mbstoc32s-3.sh tes= t-mbstoc32s-4.sh +TESTS_ENVIRONMENT +=3D \ + LOCALE_FR=3D'@LOCALE_FR@' \ + LOCALE_FR_UTF8=3D'@LOCALE_FR_UTF8@' \ + LOCALE_JA=3D'@LOCALE_JA@' \ + LOCALE_ZH_CN=3D'@LOCALE_ZH_CN@' +check_PROGRAMS +=3D test-mbstoc32s +test_mbstoc32s_LDADD =3D $(LDADD) $(LIB_SETLOCALE) $(LIB_MBRTOWC) diff --git a/tests/test-mbstoc32s-1.sh b/tests/test-mbstoc32s-1.sh new file mode 100755 index 0000000..24d80f2 =2D-- /dev/null +++ b/tests/test-mbstoc32s-1.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test in an ISO-8859-1 or ISO-8859-15 locale. +: ${LOCALE_FR=3Dfr_FR} +if test $LOCALE_FR =3D none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no traditional french locale is installed" + else + echo "Skipping test: no traditional french locale is supported" + fi + exit 77 +fi + +LC_ALL=3D$LOCALE_FR \ +${CHECKER} ./test-mbstoc32s${EXEEXT} 1 diff --git a/tests/test-mbstoc32s-2.sh b/tests/test-mbstoc32s-2.sh new file mode 100755 index 0000000..c21f2e8 =2D-- /dev/null +++ b/tests/test-mbstoc32s-2.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test whether a specific UTF-8 locale is installed. +: ${LOCALE_FR_UTF8=3Dfr_FR.UTF-8} +if test $LOCALE_FR_UTF8 =3D none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no french Unicode locale is installed" + else + echo "Skipping test: no french Unicode locale is supported" + fi + exit 77 +fi + +LC_ALL=3D$LOCALE_FR_UTF8 \ +${CHECKER} ./test-mbstoc32s${EXEEXT} 2 diff --git a/tests/test-mbstoc32s-3.sh b/tests/test-mbstoc32s-3.sh new file mode 100755 index 0000000..d62af62 =2D-- /dev/null +++ b/tests/test-mbstoc32s-3.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test whether a specific EUC-JP locale is installed. +: ${LOCALE_JA=3Dja_JP} +if test $LOCALE_JA =3D none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no traditional japanese locale is installed" + else + echo "Skipping test: no traditional japanese locale is supported" + fi + exit 77 +fi + +LC_ALL=3D$LOCALE_JA \ +${CHECKER} ./test-mbstoc32s${EXEEXT} 3 diff --git a/tests/test-mbstoc32s-4.sh b/tests/test-mbstoc32s-4.sh new file mode 100755 index 0000000..b0d1343 =2D-- /dev/null +++ b/tests/test-mbstoc32s-4.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Test whether a specific GB18030 locale is installed. +: ${LOCALE_ZH_CN=3Dzh_CN.GB18030} +if test $LOCALE_ZH_CN =3D none; then + if test -f /usr/bin/localedef; then + echo "Skipping test: no transitional chinese locale is installed" + else + echo "Skipping test: no transitional chinese locale is supported" + fi + exit 77 +fi + +LC_ALL=3D$LOCALE_ZH_CN \ +${CHECKER} ./test-mbstoc32s${EXEEXT} 4 diff --git a/tests/test-mbstoc32s.c b/tests/test-mbstoc32s.c new file mode 100644 index 0000000..0e8fbcc =2D-- /dev/null +++ b/tests/test-mbstoc32s.c @@ -0,0 +1,244 @@ +/* Test of conversion of string to 32-bit wide string. + Copyright (C) 2008-2020 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . = */ + +/* Written by Bruno Haible , 2008. */ + +#include + +#include + +#include "signature.h" +SIGNATURE_CHECK (mbstoc32s, size_t, (char32_t *, const char *, size_t)); + +#include +#include +#include + +#include "macros.h" + +int +main (int argc, char *argv[]) +{ + char32_t wc; + size_t ret; + + /* configure should already have checked that the locale is supported. = */ + if (setlocale (LC_ALL, "") =3D=3D NULL) + return 1; + + /* Test NUL byte input. */ + { + const char *src; + + src =3D ""; + ret =3D mbstoc32s (NULL, src, 0); + ASSERT (ret =3D=3D 0); + + src =3D ""; + ret =3D mbstoc32s (NULL, src, 1); + ASSERT (ret =3D=3D 0); + + wc =3D (char32_t) 0xBADFACE; + src =3D ""; + ret =3D mbstoc32s (&wc, src, 0); + ASSERT (ret =3D=3D 0); + ASSERT (wc =3D=3D (char32_t) 0xBADFACE); + + wc =3D (char32_t) 0xBADFACE; + src =3D ""; + ret =3D mbstoc32s (&wc, src, 1); + ASSERT (ret =3D=3D 0); + ASSERT (wc =3D=3D 0); + } + + if (argc > 1) + { + int unlimited; + + for (unlimited =3D 0; unlimited < 2; unlimited++) + { + #define BUFSIZE 10 + char32_t buf[BUFSIZE]; + const char *src; + + { + size_t i; + for (i =3D 0; i < BUFSIZE; i++) + buf[i] =3D (char32_t) 0xBADFACE; + } + + switch (argv[1][0]) + { + case '1': + /* Locale encoding is ISO-8859-1 or ISO-8859-15. */ + { + char input[] =3D "B\374\337er"; /* "B=C3=BC=C3=9Fer" */ + + wc =3D (char32_t) 0xBADFACE; + ret =3D mbstoc32s (&wc, input, 1); + ASSERT (ret =3D=3D 1); + ASSERT (wc =3D=3D 'B'); + input[0] =3D '\0'; + + wc =3D (char32_t) 0xBADFACE; + ret =3D mbstoc32s (&wc, input + 1, 1); + ASSERT (ret =3D=3D 1); + ASSERT (c32tob (wc) =3D=3D (unsigned char) '\374'); + input[1] =3D '\0'; + + src =3D input + 2; + ret =3D mbstoc32s (NULL, src, unlimited ? BUFSIZE : 1); + ASSERT (ret =3D=3D 3); + + src =3D input + 2; + ret =3D mbstoc32s (buf, src, unlimited ? BUFSIZE : 1); + ASSERT (ret =3D=3D (unlimited ? 3 : 1)); + ASSERT (c32tob (buf[0]) =3D=3D (unsigned char) '\337'); + if (unlimited) + { + ASSERT (buf[1] =3D=3D 'e'); + ASSERT (buf[2] =3D=3D 'r'); + ASSERT (buf[3] =3D=3D 0); + ASSERT (buf[4] =3D=3D (char32_t) 0xBADFACE); + } + else + ASSERT (buf[1] =3D=3D (char32_t) 0xBADFACE); + } + break; + + case '2': + /* Locale encoding is UTF-8. */ + { + char input[] =3D "s\303\274\303\237\360\237\230\213!"; /* = "s=C3=BC=C3=9F=F0=9F=98=8B!" */ + + wc =3D (char32_t) 0xBADFACE; + ret =3D mbstoc32s (&wc, input, 1); + ASSERT (ret =3D=3D 1); + ASSERT (wc =3D=3D 's'); + input[0] =3D '\0'; + + wc =3D (char32_t) 0xBADFACE; + ret =3D mbstoc32s (&wc, input + 1, 1); + ASSERT (ret =3D=3D 1); + ASSERT (wc =3D=3D 0x00FC); /* expect Unicode encoding */ + input[1] =3D '\0'; + input[2] =3D '\0'; + + src =3D input + 3; + ret =3D mbstoc32s (NULL, src, unlimited ? BUFSIZE : 2); + ASSERT (ret =3D=3D 3); + + src =3D input + 3; + ret =3D mbstoc32s (buf, src, unlimited ? BUFSIZE : 2); + ASSERT (ret =3D=3D (unlimited ? 3 : 2)); + ASSERT (buf[0] =3D=3D 0x00DF); /* expect Unicode encoding = */ + ASSERT (buf[1] =3D=3D 0x1F60B); /* expect Unicode encoding= */ + if (unlimited) + { + ASSERT (buf[2] =3D=3D '!'); + ASSERT (buf[3] =3D=3D 0); + ASSERT (buf[4] =3D=3D (char32_t) 0xBADFACE); + } + else + ASSERT (buf[2] =3D=3D (char32_t) 0xBADFACE); + } + break; + + case '3': + /* Locale encoding is EUC-JP. */ + { + char input[] =3D "<\306\374\313\334\270\354>"; /* "<=E6=97= =A5=E6=9C=AC=E8=AA=9E>" */ + + wc =3D (char32_t) 0xBADFACE; + ret =3D mbstoc32s (&wc, input, 1); + ASSERT (ret =3D=3D 1); + ASSERT (wc =3D=3D '<'); + input[0] =3D '\0'; + + wc =3D (char32_t) 0xBADFACE; + ret =3D mbstoc32s (&wc, input + 1, 1); + ASSERT (ret =3D=3D 1); + ASSERT (c32tob (wc) =3D=3D EOF); + input[1] =3D '\0'; + input[2] =3D '\0'; + + src =3D input + 3; + ret =3D mbstoc32s (NULL, src, unlimited ? BUFSIZE : 2); + ASSERT (ret =3D=3D 3); + + src =3D input + 3; + ret =3D mbstoc32s (buf, src, unlimited ? BUFSIZE : 2); + ASSERT (ret =3D=3D (unlimited ? 3 : 2)); + ASSERT (c32tob (buf[0]) =3D=3D EOF); + ASSERT (c32tob (buf[1]) =3D=3D EOF); + if (unlimited) + { + ASSERT (buf[2] =3D=3D '>'); + ASSERT (buf[3] =3D=3D 0); + ASSERT (buf[4] =3D=3D (char32_t) 0xBADFACE); + } + else + ASSERT (buf[2] =3D=3D (char32_t) 0xBADFACE); + } + break; + + case '4': + /* Locale encoding is GB18030. */ + { + char input[] =3D "s\250\271\201\060\211\070\224\071\375\06= 7!"; /* "s=C3=BC=C3=9F=F0=9F=98=8B!" */ + + wc =3D (char32_t) 0xBADFACE; + ret =3D mbstoc32s (&wc, input, 1); + ASSERT (ret =3D=3D 1); + ASSERT (wc =3D=3D 's'); + input[0] =3D '\0'; + + wc =3D (char32_t) 0xBADFACE; + ret =3D mbstoc32s (&wc, input + 1, 1); + ASSERT (ret =3D=3D 1); + ASSERT (c32tob (wc) =3D=3D EOF); + input[1] =3D '\0'; + + src =3D input + 3; + ret =3D mbstoc32s (NULL, src, unlimited ? BUFSIZE : 2); + ASSERT (ret =3D=3D 3); + + src =3D input + 3; + ret =3D mbstoc32s (buf, src, unlimited ? BUFSIZE : 2); + ASSERT (ret =3D=3D (unlimited ? 3 : 2)); + ASSERT (c32tob (buf[0]) =3D=3D EOF); + ASSERT (c32tob (buf[1]) =3D=3D EOF); + if (unlimited) + { + ASSERT (buf[2] =3D=3D '!'); + ASSERT (buf[3] =3D=3D 0); + ASSERT (buf[4] =3D=3D (char32_t) 0xBADFACE); + } + else + ASSERT (buf[2] =3D=3D (char32_t) 0xBADFACE); + } + break; + + default: + return 1; + } + } + + return 0; + } + + return 1; +} =2D-=20 2.7.4 --nextPart1949671.Xcd06bYnWE--