From 5134584a32101dad1ed7691a25cf3309c2994e50 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 31 Jul 2000 22:47:52 +0000 Subject: Update. 2000-07-30 Bruno Haible * iconvdata/sjis.c (BODY for FROM_LOOP): Treat the case ch >= 0x81 && ch2 < 0x40 as invalid. 2000-07-30 Bruno Haible * iconvdata/uhc.c (BODY for FROM_LOOP): Reject ch2 == 0xff as invalid. (BODY for TO_LOOP): Accept 0x7f. Increment outptr as needed. 2000-07-30 Bruno Haible * iconvdata/johab.c (BODY for TO_LOOP): After calling ucs4_to_ksc5601_sym, fix the conversion to JOHAB. 2000-07-30 Bruno Haible * iconvdata/t.61.c (to_ucs4): Change values of 0xa4, 0a6, 0xa8, 0xb4, 0xb8. (from_ucs4): Change values of U+00A4, U+00BB, U+00ED. 2000-07-30 Bruno Haible * iconvdata/macintosh.c (HAS_HOLES): Set to 1. 2000-07-30 Bruno Haible * iconvdata/iso_6937.c (to_ucs4): Change values of 0x24 and 0xb4. (from_ucs4): Change values of U+00A4 and U+00ED. (BODY of TO_LOOP): Remove mapping from U+02DC to 0x0020. 2000-07-30 Bruno Haible * iconvdata/ansi_x3.110.c (from_ucs4): Change entry for 0xed. (BODY for TO_LOOP): Map U+2122, U+2126, not U+2022, U+2026. 2000-07-30 Bruno Haible * iconvdata/Makefile (gen-8bit-gap-modules): Remove isiri-3342. * iconvdata/isiri-3342.h: New file. * iconvdata/isiri-3342.c (HAS_HOLES): Avoid gaps >= 0xe0, but don't treat 0x80 as a gap. 2000-07-30 Bruno Haible * string/strxfrm.c (encoding_mask, encoding_byte): Remove. (utf8_encode): Use simple shifts instead. Fix return value. --- iconvdata/uhc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'iconvdata/uhc.c') diff --git a/iconvdata/uhc.c b/iconvdata/uhc.c index 38ae65ba2e..c191b1127e 100644 --- a/iconvdata/uhc.c +++ b/iconvdata/uhc.c @@ -3118,6 +3118,7 @@ static const char uhc_hangul_from_ucs[11172][2] = { \ if (__builtin_expect (ch, 0xc5) > 0xc6 \ || __builtin_expect (ch2, 0x41) < 0x41 \ + || __builtin_expect (ch2, 0x41) > 0xfe \ || (__builtin_expect (ch2, 0x41) > 0x5a && ch2 < 0x61) \ || (__builtin_expect (ch2, 0x41) > 0x7a && ch2 < 0x81) \ || (__builtin_expect (ch, 0xc5) == 0xc6 && ch2 > 0x52)) \ @@ -3194,9 +3195,9 @@ static const char uhc_hangul_from_ucs[11172][2] = { \ uint32_t ch = get32 (inptr); \ \ - if (ch < 0x7f) \ + if (ch <= 0x7f) \ /* XXX Think about 0x5c ; '\'. */ \ - *outptr = ch; \ + *outptr++ = ch; \ else if (ch >= 0xac00 && ch <= 0xd7a3) \ { \ const char *s = uhc_hangul_from_ucs[ch - 0xac00]; \ -- cgit 1.4.1