aboutsummaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-27 07:19:36 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-27 07:19:36 +0000
commit3c5adb76675fdb14c3073c995ccdb514c5199f1b (patch)
tree60f3ed2f0fad1c26633907b26bf987672919438f /localedata
parent1da6cab218fb9210547d8b5dbea06e142974dcee (diff)
downloadglibc-3c5adb76675fdb14c3073c995ccdb514c5199f1b.tar
glibc-3c5adb76675fdb14c3073c995ccdb514c5199f1b.tar.gz
glibc-3c5adb76675fdb14c3073c995ccdb514c5199f1b.tar.bz2
glibc-3c5adb76675fdb14c3073c995ccdb514c5199f1b.zip
Update.
2000-04-27 Ulrich Drepper <drepper@redhat.com> * localedata/Makefile (test-srcs); Add tst-mbswcs3. Add rule to build tst-mbswcs3 before running tst-mbswcs.sh. * localedata/tst-mbswcs.sh: Run tst-mbswcs3. * localedata/tst-mbswcs3.c: New file.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/Makefile5
-rwxr-xr-xlocaledata/tst-mbswcs.sh5
-rw-r--r--localedata/tst-mbswcs3.c95
3 files changed, 103 insertions, 2 deletions
diff --git a/localedata/Makefile b/localedata/Makefile
index 934b94685b..c552d401ee 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -36,7 +36,7 @@ repertoiremaps := $(filter-out $(addprefix repertoiremaps/, CVS RCS SCCS %~), \
$(wildcard repertoiremaps/*))
test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
- tst-mbswcs1 tst-mbswcs2
+ tst-mbswcs1 tst-mbswcs2 tst-mbswcs3
test-input := de_DE.ISO-8859-1 da_DK.ISO-8859-1 fr_CA,2.13.ISO-8859-1 \
hr_HR.ISO-8859-2 # once it is fixed: cs_CZ.ISO-8859-2
test-input-data = $(addsuffix .in, $(basename $(test-input)))
@@ -91,7 +91,8 @@ do-tst-rpmatch: tst-rpmatch.sh $(objpfx)tst-rpmatch do-tst-fmon
$(SHELL) -e $< $(common-objpfx)
do-tst-trans: tst-trans.sh $(objpfx)tst-trans
$(SHELL) -e $< $(common-objpfx)
-do-tst-mbswcs: tst-mbswcs.sh $(objpfx)tst-mbswcs1 $(objpfx)tst-mbswcs2
+do-tst-mbswcs: tst-mbswcs.sh $(objpfx)tst-mbswcs1 $(objpfx)tst-mbswcs2 \
+ $(objpfx)tst-mbswcs3
$(SHELL) -e $< $(common-objpfx)
endif
endif
diff --git a/localedata/tst-mbswcs.sh b/localedata/tst-mbswcs.sh
index 3f26bcf250..f69b1d6bdf 100755
--- a/localedata/tst-mbswcs.sh
+++ b/localedata/tst-mbswcs.sh
@@ -53,4 +53,9 @@ ${common_objpfx}elf/ld.so --library-path $common_objpfx \
${common_objpfx}localedata/tst-mbswcs2 \
>> ${common_objpfx}localedata/tst-mbswcs.out || status=1
+LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
+${common_objpfx}elf/ld.so --library-path $common_objpfx \
+ ${common_objpfx}localedata/tst-mbswcs3 \
+ >> ${common_objpfx}localedata/tst-mbswcs.out || status=1
+
exit $status
diff --git a/localedata/tst-mbswcs3.c b/localedata/tst-mbswcs3.c
new file mode 100644
index 0000000000..b9846ee8ac
--- /dev/null
+++ b/localedata/tst-mbswcs3.c
@@ -0,0 +1,95 @@
+/* Test restarting behaviour of wcsrtombs.
+ Copyright (C) 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Bruno Haible <haible@ilog.fr>.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#include <locale.h>
+
+#define show(expr, nexp, srcexp, bufexp) \
+ { \
+ size_t res = expr; \
+ printf (#expr " -> %Zd", res); \
+ dst += res; \
+ printf (", src = srcbuf+%td, dst = buf+%td", \
+ src - srcbuf, dst - (char *) buf); \
+ if (res != nexp || src != (srcexp) || dst != (char *) (bufexp)) \
+ { \
+ printf (", expected %Zd and srcbuf+%td and buf+%td", nexp, \
+ (srcexp) - srcbuf, (bufexp) - (unsigned char *) buf); \
+ result = 1; \
+ } \
+ putc ('\n', stdout); \
+ }
+
+int
+main (void)
+{
+ unsigned char buf[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+ const unsigned char bufcheck[6] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb };
+ const wchar_t srcbuf[4] = { 0x25, 0x20ac, 0x03bb, 0 };
+ mbstate_t state;
+ const wchar_t *src;
+ char *dst;
+ int result = 0;
+ const char *used_locale;
+
+ setlocale (LC_CTYPE, "de_DE.UTF-8");
+ /* Double check. */
+ used_locale = setlocale (LC_CTYPE, NULL);
+ printf ("used locale: \"%s\"\n", used_locale);
+ result = strcmp (used_locale, "de_DE.UTF-8");
+
+ memset (&state, '\0', sizeof (state));
+
+ src = srcbuf;
+ dst = (char *) buf;
+ show (wcsrtombs (dst, &src, 1, &state), 1, srcbuf + 1, buf + 1);
+ show (wcsrtombs (dst, &src, 1, &state), 0, srcbuf + 1, buf + 1);
+ show (wcsrtombs (dst, &src, 4, &state), 3, srcbuf + 2, buf + 4);
+ show (wcsrtombs (dst, &src, 2, &state), 2, srcbuf + 3, buf + 6);
+
+ if (memcmp (buf, bufcheck, 6))
+ {
+ puts ("wrong results");
+ result = 1;
+ }
+
+ return result;
+}
+
+/* Expected output:
+
+wcsrtombs(dst,&src,1,&state) -> 1, src = srcbuf+1, dst = buf+1
+wcsrtombs(dst,&src,1,&state) -> 1, src = srcbuf+2, dst = buf+2
+wcsrtombs(dst,&src,3,&state) -> 3, src = srcbuf+3, dst = buf+5
+wcsrtombs(dst,&src,1,&state) -> 1, src = srcbuf+3, dst = buf+6
+
+*/
+
+/* Output of a non-restarting implementation:
+
+wcsrtombs(dst,&src,1,&state) -> 1, src = srcbuf+1, dst = buf+1
+wcsrtombs(dst,&src,1,&state) -> 0, src = srcbuf+1, dst = buf+1
+wcsrtombs(dst,&src,3,&state) -> 3, src = srcbuf+2, dst = buf+4
+wcsrtombs(dst,&src,1,&state) -> 0, src = srcbuf+2, dst = buf+4
+wrong results
+
+*/