diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | localedata/Makefile | 4 | ||||
| -rwxr-xr-x | localedata/tst-mbswcs.sh | 5 | ||||
| -rw-r--r-- | localedata/tst-mbswcs2.c | 65 | ||||
| -rw-r--r-- | wcsmbs/mbsnrtowcs.c | 24 | ||||
| -rw-r--r-- | wcsmbs/mbsrtowcs.c | 2 |
6 files changed, 96 insertions, 12 deletions
@@ -1,5 +1,13 @@ 2000-04-26 Ulrich Drepper <drepper@redhat.com> + * wcsmbs/mbsnrtowcs.c: Correctly compute number of converted + characters. Don't handle incomplete characters as errors. + * wcsmbs/mbsrtowcs.c: Don't handle incomplete characters as errors. + * localedata/Makefile (test-srcs): Add tst-mbswcs2. + Add rule to build tst-mbswcs2 before running tst-mbswcs.sh. + * localedata/tst-mbswcs.sh: Run tst-mbswcs2. + * localedata/tst-mbswcs2.c: New file. + * iconv/gconv_simple.c (utf8_internal_loop): Correctly reconstruct stored character in state in UNPACK_BYTES macro. * iconv/loop.c (SINGLE(LOOPFCT)): Make it actually work. Correct diff --git a/localedata/Makefile b/localedata/Makefile index f752a7dad8..934b94685b 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-mbswcs1 tst-mbswcs2 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,7 @@ 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 +do-tst-mbswcs: tst-mbswcs.sh $(objpfx)tst-mbswcs1 $(objpfx)tst-mbswcs2 $(SHELL) -e $< $(common-objpfx) endif endif diff --git a/localedata/tst-mbswcs.sh b/localedata/tst-mbswcs.sh index c9a1600513..3f26bcf250 100755 --- a/localedata/tst-mbswcs.sh +++ b/localedata/tst-mbswcs.sh @@ -48,4 +48,9 @@ ${common_objpfx}elf/ld.so --library-path $common_objpfx \ ${common_objpfx}localedata/tst-mbswcs1 \ > ${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-mbswcs2 \ + >> ${common_objpfx}localedata/tst-mbswcs.out || status=1 + exit $status diff --git a/localedata/tst-mbswcs2.c b/localedata/tst-mbswcs2.c new file mode 100644 index 0000000000..57959dce84 --- /dev/null +++ b/localedata/tst-mbswcs2.c @@ -0,0 +1,65 @@ +/* Test restarting behaviour of mbsnrtowcs. + 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, 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 (mbsnrtowcs (&wc, &src, 1, 1, &state), 1, 37, buf + 1); + show (mbsnrtowcs (&wc, &src, 3, 1, &state), 1, 8364, buf + 4); + show (mbsnrtowcs (&wc, &src, 1, 1, &state), 0, 8364, buf + 5); + show (mbsnrtowcs (&wc, &src, 1, 1, &state), 1, 955, buf + 6); + + return result; +} diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c index 94bd7b1ae7..42b5879f38 100644 --- a/wcsmbs/mbsnrtowcs.c +++ b/wcsmbs/mbsnrtowcs.c @@ -46,9 +46,10 @@ __mbsnrtowcs (dst, src, nmc, len, ps) { const unsigned char *srcend; struct __gconv_step_data data; - size_t result = 0; + size_t result; int status; struct __gconv_step *towc; + size_t non_reversible; /* Tell where we want the result. */ data.__invocation_counter = 0; @@ -72,13 +73,16 @@ __mbsnrtowcs (dst, src, nmc, len, ps) wchar_t buf[64]; /* Just an arbitrary size. */ const unsigned char *inbuf = *src; - data.__outbufend = (char *) buf + sizeof (buf); + result = 0; + data.__outbufend = (unsigned char *) buf + sizeof (buf); do { - data.__outbuf = (char *) buf; + data.__outbuf = (unsigned char *) buf; status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, &inbuf, - srcend, &result, 0, 1); + srcend, &non_reversible, 0, 1); + + result += (wchar_t *) data.__outbuf - buf; } while (status == __GCONV_FULL_OUTPUT); @@ -97,14 +101,16 @@ __mbsnrtowcs (dst, src, nmc, len, ps) status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, (const unsigned char **) src, srcend, - &result, 0, 1); + &non_reversible, 0, 1); + + result = (wchar_t *) data.__outbuf - dst; /* We have to determine whether the last character converted is the NUL character. */ if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT) - && ((wchar_t *) dst)[result - 1] == L'\0') + && (assert (result > 0), + ((wchar_t *) dst)[result - 1] == L'\0')) { - assert (result > 0); assert (__mbsinit (data.__statep)); *src = NULL; --result; @@ -113,13 +119,13 @@ __mbsnrtowcs (dst, src, nmc, len, ps) /* There must not be any problems with the conversion but illegal input characters. */ - assert (status == __GCONV_OK || status != __GCONV_EMPTY_INPUT + assert (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT || status == __GCONV_ILLEGAL_INPUT || status == __GCONV_INCOMPLETE_INPUT || status == __GCONV_FULL_OUTPUT); if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT - && status != __GCONV_EMPTY_INPUT) + && status != __GCONV_EMPTY_INPUT && status != __GCONV_INCOMPLETE_INPUT) { result = (size_t) -1; __set_errno (EILSEQ); diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c index afa63a74bb..facec0826b 100644 --- a/wcsmbs/mbsrtowcs.c +++ b/wcsmbs/mbsrtowcs.c @@ -131,7 +131,7 @@ __mbsrtowcs (dst, src, len, ps) || status == __GCONV_FULL_OUTPUT); if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT - && status != __GCONV_EMPTY_INPUT) + && status != __GCONV_EMPTY_INPUT && status != __GCONV_INCOMPLETE_INPUT) { result = (size_t) -1; __set_errno (EILSEQ); |