diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-06-06 03:16:30 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-06 03:16:30 +0000 |
| commit | 85830c4c4688b30d3d76111aa9a26745c7b141d6 (patch) | |
| tree | 8b2b99b4e538983ac760fb4faa94ce0a42121fa2 /iconvdata/gbgbk.c | |
| parent | b0f1ca68448e9049cb6d266f327ca36523f3f675 (diff) | |
| download | glibc-85830c4c4688b30d3d76111aa9a26745c7b141d6.tar.gz | |
Update.
* iconv/gconv.h (__GCONV_IS_LAST, __GCONV_IGNORE_ERRORS): Define.
(struct __gconv_step_data): Rename __is_last to __flags.
* iconv/gconv_close.c: Change all uses of __is_last.
* iconv/skeleton.c: Likewise.
* iconvdata/iso-2022-cn.c: Likewise.
* iconvdata/iso-2022-jp.c: Likewise.
* iconvdata/iso-2022-kr.c: Likewise.
* iconv/gconv_open.c: Likewise. Avoid unneeded initializations.
Recognize IGNORE error handling, set flag, and remove from name.
* iconv/loop.c (ignore_errors_p): Define.
Add flags parameter to both functions.
* iconv/skeleton.c: Pass flags to all conversion functions.
* iconv/gconv_simple.c: Add flags parameter to all functions.
Don't return error for invald error if ignore flag is set.
(ucs4_internal_loop_single): Add missing pointer increment.
(internal_ucs4le_loop_single): Likewise.
* iconv/iconv_prog.c: Implement handling of -c parameter.
* iconvdata/8bit-gap.c: Don't return error for invald error if
ignore flag is set.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/ansi_x3.110.c: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/big5hkscs.c: Likewise.
* iconvdata/euc-cn.c: Likewise.
* iconvdata/euc-jp.c: Likewise.
* iconvdata/euc-kr.c: Likewise.
* iconvdata/gbgbk.c: Likewise.
* iconvdata/gbk.c: Likewise.
* iconvdata/iso-2022-cn.c: Likewise.
* iconvdata/iso-2022-jp.c: Likewise.
* iconvdata/iso-2022-kr.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso_6937-2.c: Likewise.
* iconvdata/iso_6937.c: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t.61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* iconvdata/unicode.c: Likewise.
* iconvdata/utf-16.c: Likewise.
* libio/fileops.c: Likewise.
* libio/iofwide.c: Likewise.
* wcsmbs/btowc.c: Likewise.
* wcsmbs/mbrtowc.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wctob.c: Likewise.
* iconvdata/ksc5601.h (ksc5601_to_ucs4): Undo *s change in all cases of
Diffstat (limited to 'iconvdata/gbgbk.c')
| -rw-r--r-- | iconvdata/gbgbk.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/iconvdata/gbgbk.c b/iconvdata/gbgbk.c index 64da7a4634..88617ae6c0 100644 --- a/iconvdata/gbgbk.c +++ b/iconvdata/gbgbk.c @@ -89,28 +89,28 @@ ch = (ch << 8) | inptr[1]; \ \ /* Now determine whether the character is valid. */ \ - if (ch >= 0xa1a1 && ch <= 0xf7fe && inptr[1] >= 0xa1) \ + if (ch < 0xa1a1 || ch > 0xf7fe || inptr[1] < 0xa1 \ + /* Now test the exceptions. */ \ + || (ch >= 0xa2a1 && ch <= 0xa2aa) \ + || (ch >= 0xa6e0 && ch <= 0xa6f5) \ + || (ch >= 0xa8bb && ch <= 0xa8c0)) \ { \ - /* So far so good. Now test the exceptions. */ \ - if ((ch >= 0xa2a1 && ch <= 0xa2aa) \ - || (ch >= 0xa6e0 && ch <= 0xa6f5) \ - || (ch >= 0xa8bb && ch <= 0xa8c0)) \ + /* One of the characters we cannot map. */ \ + if (! ignore_errors_p ()) \ { \ - /* One of the exceptions. */ \ result = __GCONV_ILLEGAL_INPUT; \ break; \ } \ + \ + inptr += 2; \ + ++*converted; \ } \ else \ { \ - /* One of the characters we cannot map. */ \ - result = __GCONV_ILLEGAL_INPUT; \ - break; \ + /* Copy the two bytes. */ \ + *outptr++ = *inptr++; \ + *outptr++ = *inptr++; \ } \ - \ - /* Copy the two bytes. */ \ - *outptr++ = *inptr++; \ - *outptr++ = *inptr++; \ } \ } #include <iconv/loop.c> |