diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | localedata/Makefile | 4 | ||||
| -rwxr-xr-x | localedata/tst-mbswcs.sh | 10 | ||||
| -rw-r--r-- | localedata/tst-mbswcs4.c | 63 | ||||
| -rw-r--r-- | localedata/tst-mbswcs5.c | 75 |
5 files changed, 156 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index e7c3bda0ba..295253de6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2000-04-27 Ulrich Drepper <drepper@redhat.com> + * localedata/Makefile (test-srcs): Add tst-mbswcs4 and tst-mbswcs5. + (do-tst-mbswcs): Add tst-mbswcs4 and tst-mbswcs5 to dependencies. + * localedata/tst-mbswcs.sh: Run tst-mbswcs4 and tst-mbswcs5. + * localedata/tst-mbswcs4.c: New file. + * localedata/tst-mbswcs5.c: New file. + * wcsmbs/wcrtomb.c (__wcrtomb): Set end of buffer correctly if s == NULL. Little optimization. diff --git a/localedata/Makefile b/localedata/Makefile index c552d401ee..218e68e09c 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-mbswcs3 + tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 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))) @@ -92,7 +92,7 @@ do-tst-rpmatch: tst-rpmatch.sh $(objpfx)tst-rpmatch do-tst-fmon 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 \ - $(objpfx)tst-mbswcs3 + $(objpfx)tst-mbswcs3 $(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 $(SHELL) -e $< $(common-objpfx) endif endif diff --git a/localedata/tst-mbswcs.sh b/localedata/tst-mbswcs.sh index f69b1d6bdf..936db382e3 100755 --- a/localedata/tst-mbswcs.sh +++ b/localedata/tst-mbswcs.sh @@ -58,4 +58,14 @@ ${common_objpfx}elf/ld.so --library-path $common_objpfx \ ${common_objpfx}localedata/tst-mbswcs3 \ >> ${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-mbswcs4 \ + >> ${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-mbswcs5 \ + >> ${common_objpfx}localedata/tst-mbswcs.out || status=1 + exit $status diff --git a/localedata/tst-mbswcs4.c b/localedata/tst-mbswcs4.c new file mode 100644 index 0000000000..1fa52e4446 --- /dev/null +++ b/localedata/tst-mbswcs4.c @@ -0,0 +1,63 @@ +/* Test restarting behaviour of mbsrtowcs. + Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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, wcexp, end) \ + n = expr; \ + printf (#expr " -> %Zd", n); \ + printf (", wc = %lu, src = buf+%d", (unsigned long int) wc, \ + src - (const char *) buf); \ + if (n != (size_t) nexp || wc != wcexp || src != (const char *) (end)) \ + { \ + printf (", expected %Zd and %lu and buf+%d", nexp, \ + (unsigned long int) wcexp, (end) - buf); \ + result = 1; \ + } \ + putc ('\n', stdout) + +int +main (void) +{ + unsigned char buf[6] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb }; + mbstate_t state; + const char *src; + wchar_t wc = 42; + size_t n; + 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 = (const char *) buf; + show (mbsrtowcs (&wc, &src, 1, &state), 1, 37, buf + 1); + show (mbsrtowcs (&wc, &src, 1, &state), 1, 8364, buf + 4); + show (mbsrtowcs (&wc, &src, 1, &state), 1, 955, buf + 6); + + return result; +} diff --git a/localedata/tst-mbswcs5.c b/localedata/tst-mbswcs5.c new file mode 100644 index 0000000000..81d7d5b4ab --- /dev/null +++ b/localedata/tst-mbswcs5.c @@ -0,0 +1,75 @@ +/* Test restarting behaviour of wcrtomb. + 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, bufexp) \ + { \ + size_t res = expr; \ + printf (#expr " -> %Zd", res); \ + dst += res; \ + printf (", dst = buf+%td", dst - (char *) buf); \ + if (res != nexp || dst != (char *) (bufexp)) \ + { \ + printf (", expected %Zd and buf+%td", nexp, \ + (bufexp) - (unsigned char *) buf); \ + result = 1; \ + } \ + putc ('\n', stdout); \ + } + +int +main (void) +{ + unsigned char buf[7] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + const unsigned char bufcheck[7] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb, 0 }; + 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 (wcrtomb (dst, *src++, &state), 1, buf + 1); + show (wcrtomb (dst, *src++, &state), 3, buf + 4); + show (wcrtomb (dst, *src++, &state), 2, buf + 6); + show (wcrtomb (dst, *src, &state), 1, buf + 7); + + if (memcmp (buf, bufcheck, 7)) + { + puts ("wrong results"); + result = 1; + } + + return result; +} |