diff options
| -rw-r--r-- | ChangeLog | 48 | ||||
| -rw-r--r-- | iconvdata/Makefile | 2 | ||||
| -rw-r--r-- | iconvdata/ansi_x3.110.c | 23 | ||||
| -rw-r--r-- | iconvdata/isiri-3342.c | 4 | ||||
| -rw-r--r-- | iconvdata/isiri-3342.h | 325 | ||||
| -rw-r--r-- | iconvdata/iso_6937.c | 11 | ||||
| -rw-r--r-- | iconvdata/johab.c | 13 | ||||
| -rw-r--r-- | iconvdata/macintosh.c | 4 | ||||
| -rw-r--r-- | iconvdata/sjis.c | 3 | ||||
| -rw-r--r-- | iconvdata/t.61.c | 14 | ||||
| -rw-r--r-- | iconvdata/uhc.c | 5 | ||||
| -rw-r--r-- | string/strxfrm.c | 19 |
12 files changed, 422 insertions, 49 deletions
diff --git a/ChangeLog b/ChangeLog index e6f800d718..c117eebed3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,51 @@ +2000-07-30 Bruno Haible <haible@clisp.cons.org> + + * iconvdata/sjis.c (BODY for FROM_LOOP): Treat the case + ch >= 0x81 && ch2 < 0x40 as invalid. + +2000-07-30 Bruno Haible <haible@clisp.cons.org> + + * 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 <haible@clisp.cons.org> + + * iconvdata/johab.c (BODY for TO_LOOP): After calling + ucs4_to_ksc5601_sym, fix the conversion to JOHAB. + +2000-07-30 Bruno Haible <haible@clisp.cons.org> + + * 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 <haible@clisp.cons.org> + + * iconvdata/macintosh.c (HAS_HOLES): Set to 1. + +2000-07-30 Bruno Haible <haible@clisp.cons.org> + + * 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 <haible@clisp.cons.org> + + * 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 <haible@clisp.cons.org> + + * 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 <haible@clisp.cons.org> + + * string/strxfrm.c (encoding_mask, encoding_byte): Remove. + (utf8_encode): Use simple shifts instead. Fix return value. + 2000-07-31 Ulrich Drepper <drepper@redhat.com> * timezone/private.h: Update from tzcode2000e. diff --git a/iconvdata/Makefile b/iconvdata/Makefile index e7a8dbdd70..914fac30b2 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -159,7 +159,7 @@ gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273 \ inis-cyrillic iso_2033 iso_5427 iso_5427-ext \ iso_5428 iso_10367-box mac-is nats-dano nats-sefi \ iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2 \ - iso-ir-197 cp1258 tis-620 koi8-u ibm874 isiri-3342 + iso-ir-197 cp1258 tis-620 koi8-u ibm874 gen-special-modules := iso8859-7jp diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c index d55af6fba7..ed312a0285 100644 --- a/iconvdata/ansi_x3.110.c +++ b/iconvdata/ansi_x3.110.c @@ -319,7 +319,7 @@ static const char from_ucs4[][2] = /* 0x00dc */ "\xc8\x55", "\xc2\x59", "\xec\x00", "\xfb\x00", "\xc1\x61", /* 0x00e1 */ "\xc2\x61", "\xc3\x61", "\xc4\x61", "\xc8\x61", "\xca\x61", /* 0x00e6 */ "\xf1\x00", "\xcb\x63", "\xc1\x65", "\xc2\x65", "\xc3\x65", - /* 0x00eb */ "\xc8\x65", "\xc1\x69", "\xc2\xe9", "\xc3\x69", "\xc8\x69", + /* 0x00eb */ "\xc8\x65", "\xc1\x69", "\xc2\x69", "\xc3\x69", "\xc8\x69", /* 0x00f0 */ "\xf3\x00", "\xc4\x6e", "\xc1\x6f", "\xc2\x6f", "\xc3\x6f", /* 0x00f5 */ "\xc4\x6f", "\xc8\x6f", "\xb8\x00", "\xf9\x00", "\xc1\x75", /* 0x00fa */ "\xc2\x75", "\xc3\x75", "\xc8\x75", "\xc2\x79", "\xfc\x00", @@ -487,11 +487,10 @@ static const char from_ucs4[][2] = tmp[1] = ' '; \ cp = tmp; \ } \ - else if (ch >= 0x2014 && ch <= 0x2026) \ + else if (ch >= 0x2014 && ch <= 0x201d) \ { \ - static const char map[19] = \ - "\xd0\x00\x00\x00\xa9\xb9\x00\x00\xaa\xba\x00\x00\x00\x00" \ - "\xd4\x00\x00\x00\xe0"; \ + static const char map[10] = \ + "\xd0\x00\x00\x00\xa9\xb9\x00\x00\xaa\xba"; \ \ tmp[0] = map[ch - 0x2014]; \ if (tmp[0] == '\0') \ @@ -502,6 +501,20 @@ static const char from_ucs4[][2] = tmp[1] = '\0'; \ cp = tmp; \ } \ + else if (ch >= 0x2122 && ch <= 0x2126) \ + { \ + static const char map[5] = \ + "\xd4\x00\x00\x00\xe0"; \ + \ + tmp[0] = map[ch - 0x2122]; \ + if (tmp[0] == '\0') \ + { \ + /* Illegal characters. */ \ + STANDARD_ERR_HANDLER (4); \ + } \ + tmp[1] = '\0'; \ + cp = tmp; \ + } \ else if (ch >= 0x215b && ch <= 0x215e) \ { \ tmp[0] = 0xdc + ch - 0x215b; \ diff --git a/iconvdata/isiri-3342.c b/iconvdata/isiri-3342.c index 80f7b90d94..f2415bc778 100644 --- a/iconvdata/isiri-3342.c +++ b/iconvdata/isiri-3342.c @@ -1,5 +1,5 @@ /* Conversion from and to ISIRI-3342. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. @@ -24,6 +24,6 @@ #define TABLES <isiri-3342.h> #define CHARSET_NAME "ISIRI-3342//" -#define HAS_HOLES 1 /* Not all 256 character are defined. */ +#define HAS_HOLES (*inptr > 0x80) /* 0x80 really maps to 0x0000. */ #include <8bit-gap.c> diff --git a/iconvdata/isiri-3342.h b/iconvdata/isiri-3342.h new file mode 100644 index 0000000000..33ef1bb0e0 --- /dev/null +++ b/iconvdata/isiri-3342.h @@ -0,0 +1,325 @@ +static const uint32_t to_ucs4[256] = { + [0x01] = 0x0001, + [0x02] = 0x0002, + [0x03] = 0x0003, + [0x04] = 0x0004, + [0x05] = 0x0005, + [0x06] = 0x0006, + [0x07] = 0x0007, + [0x08] = 0x0008, + [0x09] = 0x0009, + [0x0a] = 0x000A, + [0x0b] = 0x000B, + [0x0c] = 0x000C, + [0x0d] = 0x000D, + [0x0e] = 0x000E, + [0x0f] = 0x000F, + [0x10] = 0x0010, + [0x11] = 0x0011, + [0x12] = 0x0012, + [0x13] = 0x0013, + [0x14] = 0x0014, + [0x15] = 0x0015, + [0x16] = 0x0016, + [0x17] = 0x0017, + [0x18] = 0x0018, + [0x19] = 0x0019, + [0x1a] = 0x001A, + [0x1b] = 0x001B, + [0x1c] = 0x001C, + [0x1d] = 0x001D, + [0x1e] = 0x001E, + [0x1f] = 0x001F, + [0x20] = 0x0020, + [0x21] = 0x0021, + [0x22] = 0x0022, + [0x23] = 0x0023, + [0x24] = 0x0024, + [0x25] = 0x0025, + [0x26] = 0x0026, + [0x27] = 0x0027, + [0x28] = 0x0028, + [0x29] = 0x0029, + [0x2a] = 0x002A, + [0x2b] = 0x002B, + [0x2c] = 0x002C, + [0x2d] = 0x002D, + [0x2e] = 0x002E, + [0x2f] = 0x002F, + [0x30] = 0x0030, + [0x31] = 0x0031, + [0x32] = 0x0032, + [0x33] = 0x0033, + [0x34] = 0x0034, + [0x35] = 0x0035, + [0x36] = 0x0036, + [0x37] = 0x0037, + [0x38] = 0x0038, + [0x39] = 0x0039, + [0x3a] = 0x003A, + [0x3b] = 0x003B, + [0x3c] = 0x003C, + [0x3d] = 0x003D, + [0x3e] = 0x003E, + [0x3f] = 0x003F, + [0x40] = 0x0040, + [0x41] = 0x0041, + [0x42] = 0x0042, + [0x43] = 0x0043, + [0x44] = 0x0044, + [0x45] = 0x0045, + [0x46] = 0x0046, + [0x47] = 0x0047, + [0x48] = 0x0048, + [0x49] = 0x0049, + [0x4a] = 0x004A, + [0x4b] = 0x004B, + [0x4c] = 0x004C, + [0x4d] = 0x004D, + [0x4e] = 0x004E, + [0x4f] = 0x004F, + [0x50] = 0x0050, + [0x51] = 0x0051, + [0x52] = 0x0052, + [0x53] = 0x0053, + [0x54] = 0x0054, + [0x55] = 0x0055, + [0x56] = 0x0056, + [0x57] = 0x0057, + [0x58] = 0x0058, + [0x59] = 0x0059, + [0x5a] = 0x005A, + [0x5b] = 0x005B, + [0x5c] = 0x005C, + [0x5d] = 0x005D, + [0x5e] = 0x005E, + [0x5f] = 0x005F, + [0x60] = 0x0060, + [0x61] = 0x0061, + [0x62] = 0x0062, + [0x63] = 0x0063, + [0x64] = 0x0064, + [0x65] = 0x0065, + [0x66] = 0x0066, + [0x67] = 0x0067, + [0x68] = 0x0068, + [0x69] = 0x0069, + [0x6a] = 0x006A, + [0x6b] = 0x006B, + [0x6c] = 0x006C, + [0x6d] = 0x006D, + [0x6e] = 0x006E, + [0x6f] = 0x006F, + [0x70] = 0x0070, + [0x71] = 0x0071, + [0x72] = 0x0072, + [0x73] = 0x0073, + [0x74] = 0x0074, + [0x75] = 0x0075, + [0x76] = 0x0076, + [0x77] = 0x0077, + [0x78] = 0x0078, + [0x79] = 0x0079, + [0x7a] = 0x007A, + [0x7b] = 0x007B, + [0x7c] = 0x007C, + [0x7d] = 0x007D, + [0x7e] = 0x007E, + [0x7f] = 0x007F, + [0x80] = 0x0000, + [0x81] = 0x0001, + [0x82] = 0x0002, + [0x83] = 0x0003, + [0x84] = 0x0004, + [0x85] = 0x0005, + [0x86] = 0x0006, + [0x87] = 0x0007, + [0x88] = 0x0008, + [0x89] = 0x0009, + [0x8a] = 0x000A, + [0x8b] = 0x000B, + [0x8c] = 0x000C, + [0x8d] = 0x000D, + [0x8e] = 0x000E, + [0x8f] = 0x000F, + [0x90] = 0x0010, + [0x91] = 0x0011, + [0x92] = 0x0012, + [0x93] = 0x0013, + [0x94] = 0x0014, + [0x95] = 0x0015, + [0x96] = 0x0016, + [0x97] = 0x0017, + [0x98] = 0x0018, + [0x99] = 0x0019, + [0x9a] = 0x001A, + [0x9b] = 0x001B, + [0x9c] = 0x001C, + [0x9d] = 0x001D, + [0x9e] = 0x001E, + [0x9f] = 0x001F, + [0xa0] = 0x0020, + [0xa1] = 0x200C, + [0xa2] = 0x200D, + [0xa3] = 0x0021, + [0xa4] = 0x00A4, + [0xa5] = 0x066A, + [0xa6] = 0x002E, + [0xa7] = 0x066C, + [0xa8] = 0x0029, + [0xa9] = 0x0028, + [0xaa] = 0x00D7, + [0xab] = 0x002B, + [0xac] = 0x060C, + [0xad] = 0x002D, + [0xae] = 0x066B, + [0xaf] = 0x002F, + [0xb0] = 0x06F0, + [0xb1] = 0x06F1, + [0xb2] = 0x06F2, + [0xb3] = 0x06F3, + [0xb4] = 0x06F4, + [0xb5] = 0x06F5, + [0xb6] = 0x06F6, + [0xb7] = 0x06F7, + [0xb8] = 0x06F8, + [0xb9] = 0x06F9, + [0xba] = 0x003A, + [0xbb] = 0x061B, + [0xbc] = 0x003C, + [0xbd] = 0x003D, + [0xbe] = 0x003E, + [0xbf] = 0x061F, + [0xc0] = 0x0622, + [0xc1] = 0x0627, + [0xc2] = 0x0621, + [0xc3] = 0x0628, + [0xc4] = 0x067E, + [0xc5] = 0x062A, + [0xc6] = 0x062B, + [0xc7] = 0x062C, + [0xc8] = 0x0686, + [0xc9] = 0x062D, + [0xca] = 0x062E, + [0xcb] = 0x062F, + [0xcc] = 0x0630, + [0xcd] = 0x0631, + [0xce] = 0x0632, + [0xcf] = 0x0698, + [0xd0] = 0x0633, + [0xd1] = 0x0634, + [0xd2] = 0x0635, + [0xd3] = 0x0636, + [0xd4] = 0x0637, + [0xd5] = 0x0638, + [0xd6] = 0x0639, + [0xd7] = 0x063A, + [0xd8] = 0x0641, + [0xd9] = 0x0642, + [0xda] = 0x06A9, + [0xdb] = 0x06AF, + [0xdc] = 0x0644, + [0xdd] = 0x0645, + [0xde] = 0x0646, + [0xdf] = 0x0648, + [0xe0] = 0x0647, + [0xe1] = 0x06CC, + [0xe2] = 0x005D, + [0xe3] = 0x005B, + [0xe4] = 0x007D, + [0xe5] = 0x007B, + [0xe6] = 0x00AB, + [0xe7] = 0x00BB, + [0xe8] = 0x002A, + [0xe9] = 0x0640, + [0xea] = 0x007C, + [0xeb] = 0x005C, + [0xf0] = 0x064E, + [0xf1] = 0x0650, + [0xf2] = 0x064F, + [0xf3] = 0x064B, + [0xf4] = 0x064D, + [0xf5] = 0x064C, + [0xf6] = 0x0651, + [0xf7] = 0x0652, + [0xf8] = 0x0623, + [0xf9] = 0x0624, + [0xfa] = 0x0625, + [0xfb] = 0x0626, + [0xfc] = 0x0629, + [0xfd] = 0x0643, + [0xfe] = 0x064A, + [0xff] = 0x007F, +}; +static const struct gap from_idx[] = { + { start: 0x0000, end: 0x007f, idx: 0 }, + { start: 0x00a4, end: 0x00a4, idx: -36 }, + { start: 0x00ab, end: 0x00ab, idx: -42 }, + { start: 0x00bb, end: 0x00bb, idx: -57 }, + { start: 0x00d7, end: 0x00d7, idx: -84 }, + { start: 0x060c, end: 0x060c, idx: -1416 }, + { start: 0x061b, end: 0x0652, idx: -1430 }, + { start: 0x066a, end: 0x066c, idx: -1453 }, + { start: 0x067e, end: 0x067e, idx: -1470 }, + { start: 0x0686, end: 0x0686, idx: -1477 }, + { start: 0x0698, end: 0x0698, idx: -1494 }, + { start: 0x06a9, end: 0x06af, idx: -1510 }, + { start: 0x06cc, end: 0x06cc, idx: -1538 }, + { start: 0x06f0, end: 0x06f9, idx: -1573 }, + { start: 0x200c, end: 0x200d, idx: -7991 }, + { start: 0xffff, end: 0xffff, idx: 0 } +}; +static const char from_ucs4[] = { + /* 0x0000..0x007f */ + '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', + '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f', + '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', + '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f', + '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27', + '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f', + '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37', + '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f', + '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47', + '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f', + '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57', + '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f', + '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67', + '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f', + '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77', + '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f', + /* 0x00a4..0x00a4 */ + '\xa4', + /* 0x00ab..0x00ab */ + '\xe6', + /* 0x00bb..0x00bb */ + '\xe7', + /* 0x00d7..0x00d7 */ + '\xaa', + /* 0x060c..0x060c */ + '\xac', + /* 0x061b..0x0652 */ + '\xbb', '\x00', '\x00', '\x00', '\xbf', '\x00', '\xc2', '\xc0', + '\xf8', '\xf9', '\xfa', '\xfb', '\xc1', '\xc3', '\xfc', '\xc5', + '\xc6', '\xc7', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', + '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7', + '\x00', '\x00', '\x00', '\x00', '\x00', '\xe9', '\xd8', '\xd9', + '\xfd', '\xdc', '\xdd', '\xde', '\xe0', '\xdf', '\x00', '\xfe', + '\xf3', '\xf5', '\xf4', '\xf0', '\xf2', '\xf1', '\xf6', '\xf7', + /* 0x066a..0x066c */ + '\xa5', '\xae', '\xa7', + /* 0x067e..0x067e */ + '\xc4', + /* 0x0686..0x0686 */ + '\xc8', + /* 0x0698..0x0698 */ + '\xcf', + /* 0x06a9..0x06af */ + '\xda', '\x00', '\x00', '\x00', '\x00', '\x00', '\xdb', + /* 0x06cc..0x06cc */ + '\xe1', + /* 0x06f0..0x06f9 */ + '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7', + '\xb8', '\xb9', + /* 0x200c..0x200d */ + '\xa1', '\xa2', +}; diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c index d51f321d33..ccae483c12 100644 --- a/iconvdata/iso_6937.c +++ b/iconvdata/iso_6937.c @@ -28,7 +28,7 @@ static const uint32_t to_ucs4[256] = /* 0x08 */ 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, /* 0x10 */ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, /* 0x18 */ 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, - /* 0x20 */ 0x0020, 0x0021, 0x0022, 0x0023, 0x0034, 0x0025, 0x0026, 0x0027, + /* 0x20 */ 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, /* 0x28 */ 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, /* 0x30 */ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, /* 0x38 */ 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, @@ -46,7 +46,7 @@ static const uint32_t to_ucs4[256] = /* 0x98 */ 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, /* 0xa0 */ 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x0000, 0x00a5, 0x0000, 0x00a7, /* 0xa8 */ 0x00a4, 0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193, - /* 0xb0 */ 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, + /* 0xb0 */ 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00d7, 0x00b5, 0x00b6, 0x00b7, /* 0xb8 */ 0x00f7, 0x2019, 0x201d, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, /* 0xc0 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0xc8 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -302,7 +302,7 @@ static const char from_ucs4[][2] = /* 0x0091 */ "\x91\x00", "\x92\x00", "\x93\x00", "\x94\x00", "\x95\x00", /* 0x0096 */ "\x96\x00", "\x97\x00", "\x98\x00", "\x99\x00", "\x9a\x00", /* 0x009b */ "\x9b\x00", "\x9c\x00", "\x9d\x00", "\x9e\x00", "\x9f\x00", - /* 0x00a0 */ "\xa0\x00", "\xa1\x00", "\xa2\x00", "\xa3\x00", "\xa4\x00", + /* 0x00a0 */ "\xa0\x00", "\xa1\x00", "\xa2\x00", "\xa3\x00", "\xa8\x00", /* 0x00a5 */ "\xa5\x00", "\xd7\x00", "\xa7\x00", "\xc8\x20", "\xd3\x00", /* 0x00aa */ "\xe3\x00", "\xab\x00", "\xd6\x00", "\xff\x00", "\xd2\x00", /* 0x00af */ "\xc5\x20", "\xb0\x00", "\xb1\x00", "\xb2\x00", "\xb3\x00", @@ -317,7 +317,7 @@ static const char from_ucs4[][2] = /* 0x00dc */ "\xc8\x55", "\xc2\x59", "\xec\x00", "\xfb\x00", "\xc1\x61", /* 0x00e1 */ "\xc2\x61", "\xc3\x61", "\xc4\x61", "\xc8\x61", "\xca\x61", /* 0x00e6 */ "\xf1\x00", "\xcb\x63", "\xc1\x65", "\xc2\x65", "\xc3\x65", - /* 0x00eb */ "\xc8\x65", "\xc1\x69", "\xc2\xe9", "\xc3\x69", "\xc8\x69", + /* 0x00eb */ "\xc8\x65", "\xc1\x69", "\xc2\x69", "\xc3\x69", "\xc8\x69", /* 0x00f0 */ "\xf3\x00", "\xc4\x6e", "\xc1\x6f", "\xc2\x6f", "\xc3\x6f", /* 0x00f5 */ "\xc4\x6f", "\xc8\x6f", "\xb8\x00", "\xf9\x00", "\xc1\x75", /* 0x00fa */ "\xc2\x75", "\xc3\x75", "\xc8\x75", "\xc2\x79", "\xfc\x00", @@ -491,7 +491,8 @@ static const char from_ucs4[][2] = case 0x2c7: \ cp = "\xcf\x20"; \ break; \ - case 0x2d8 ... 0x2dd: \ + case 0x2d8 ... 0x2db: \ + case 0x2dd: \ { \ static const char map[6] = "\xc6\xc7\xca\xce\x00\xcd"; \ \ diff --git a/iconvdata/johab.c b/iconvdata/johab.c index 46649c5923..e4603cb423 100644 --- a/iconvdata/johab.c +++ b/iconvdata/johab.c @@ -413,6 +413,7 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) else \ { \ size_t written; \ + uint32_t temp; \ \ written = ucs4_to_ksc5601_sym (ch, outptr, outend - outptr); \ if (__builtin_expect (written, 1) == 0) \ @@ -425,14 +426,10 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) STANDARD_ERR_HANDLER (4); \ } \ \ - outptr[0] -= 0x4a; \ - outptr[1] += 0x80; \ - \ - outptr[1] += (outptr[0] % 2 \ - ? 0 : (outptr[1] > 0xee ? 0x43 : 0x31)); \ - outptr[1] -= 0xa1; \ - outptr[0] /= 2; \ - outptr[0] += 0xe0; \ + temp = (outptr[0] < 0x4a ? outptr[0] + 0x191 : outptr[0] + 0x176);\ + outptr[1] += (temp % 2 ? 0x5e : 0); \ + outptr[1] += (outptr[1] < 0x6f ? 0x10 : 0x22); \ + outptr[0] = temp / 2; \ \ outptr += 2; \ } \ diff --git a/iconvdata/macintosh.c b/iconvdata/macintosh.c index fba1cbdc97..4bf75faed6 100644 --- a/iconvdata/macintosh.c +++ b/iconvdata/macintosh.c @@ -1,5 +1,5 @@ /* Conversion from and to MACINTOSH. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -24,6 +24,6 @@ #define TABLES <macintosh.h> #define CHARSET_NAME "MACINTOSH//" -#define HAS_HOLES 0 /* All 256 character are defined. */ +#define HAS_HOLES 1 /* Not all 256 characters are defined. */ #include <8bit-gap.c> diff --git a/iconvdata/sjis.c b/iconvdata/sjis.c index 29d558f60c..60d1e28508 100644 --- a/iconvdata/sjis.c +++ b/iconvdata/sjis.c @@ -4388,7 +4388,8 @@ static const char from_ucs4_extra[0x100][2] = \ ch2 = inptr[1]; \ idx = ch * 256 + ch2; \ - if (__builtin_expect (idx, 0x8140) < 0x8140 \ + if (__builtin_expect (ch < 0x81, 0) \ + || __builtin_expect (ch2 < 0x40, 0) \ || (__builtin_expect (idx, 0x8140) > 0x84be && idx < 0x889f) \ || (__builtin_expect (idx, 0x8140) > 0x88fc && idx < 0x8940) \ || (__builtin_expect (idx, 0x8140) > 0x9ffc && idx < 0xe040) \ diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c index 611eca8b39..17a22a3cd1 100644 --- a/iconvdata/t.61.c +++ b/iconvdata/t.61.c @@ -46,10 +46,10 @@ static const uint32_t to_ucs4[256] = /* 0x88 */ 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, /* 0x90 */ 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, /* 0x98 */ 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f, - /* 0xa0 */ 0x0000, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, - /* 0xa8 */ 0x00a8, 0x0000, 0x0000, 0x00ab, 0x0000, 0x0000, 0x0000, 0x0000, - /* 0xb0 */ 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, - /* 0xb8 */ 0x00b8, 0x0000, 0x0000, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, + /* 0xa0 */ 0x0000, 0x00a1, 0x00a2, 0x00a3, 0x0024, 0x00a5, 0x0023, 0x00a7, + /* 0xa8 */ 0x00a4, 0x0000, 0x0000, 0x00ab, 0x0000, 0x0000, 0x0000, 0x0000, + /* 0xb0 */ 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00d7, 0x00b5, 0x00b6, 0x00b7, + /* 0xb8 */ 0x00f7, 0x0000, 0x0000, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, /* 0xc0 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0xc8 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0xd0 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -304,12 +304,12 @@ static const char from_ucs4[][2] = /* 0x0091 */ "\x91\x00", "\x92\x00", "\x93\x00", "\x94\x00", "\x95\x00", /* 0x0096 */ "\x96\x00", "\x97\x00", "\x98\x00", "\x99\x00", "\x9a\x00", /* 0x009b */ "\x9b\x00", "\x9c\x00", "\x9d\x00", "\x9e\x00", "\x9f\x00", - /* 0x00a0 */ "\x00\x00", "\xa1\x00", "\xa2\x00", "\xa3\x00", "\xa4\x00", + /* 0x00a0 */ "\x00\x00", "\xa1\x00", "\xa2\x00", "\xa3\x00", "\xa8\x00", /* 0x00a5 */ "\xa5\x00", "\x00\x00", "\xa7\x00", "\xc8\x20", "\x00\x00", /* 0x00aa */ "\xe3\x00", "\xab\x00", "\x00\x00", "\x00\x00", "\x00\x00", /* 0x00af */ "\xc5\x20", "\xb0\x00", "\xb1\x00", "\xb2\x00", "\xb3\x00", /* 0x00b4 */ "\xc2\x20", "\xb5\x00", "\xb6\x00", "\xb7\x00", "\xcb\x20", - /* 0x00b9 */ "\x00\x00", "\xeb\x00", "\x00\x00", "\xbc\x00", "\xbd\x00", + /* 0x00b9 */ "\x00\x00", "\xeb\x00", "\xbb\x00", "\xbc\x00", "\xbd\x00", /* 0x00be */ "\xbe\x00", "\xbf\x00", "\xc1\x41", "\xc2\x41", "\xc3\x41", /* 0x00c3 */ "\xc4\x41", "\xc8\x41", "\xca\x41", "\xe1\x00", "\xcb\x43", /* 0x00c8 */ "\xc1\x45", "\xc2\x45", "\xc3\x45", "\xc8\x45", "\xc1\x49", @@ -319,7 +319,7 @@ static const char from_ucs4[][2] = /* 0x00dc */ "\xc8\x55", "\xc2\x59", "\xec\x00", "\xfb\x00", "\xc1\x61", /* 0x00e1 */ "\xc2\x61", "\xc3\x61", "\xc4\x61", "\xc8\x61", "\xca\x61", /* 0x00e6 */ "\xf1\x00", "\xcb\x63", "\xc1\x65", "\xc2\x65", "\xc3\x65", - /* 0x00eb */ "\xc8\x65", "\xc1\x69", "\xc2\xe9", "\xc3\x69", "\xc8\x69", + /* 0x00eb */ "\xc8\x65", "\xc1\x69", "\xc2\x69", "\xc3\x69", "\xc8\x69", /* 0x00f0 */ "\xf3\x00", "\xc4\x6e", "\xc1\x6f", "\xc2\x6f", "\xc3\x6f", /* 0x00f5 */ "\xc4\x6f", "\xc8\x6f", "\xb8\x00", "\xf9\x00", "\xc1\x75", /* 0x00fa */ "\xc2\x75", "\xc3\x75", "\xc8\x75", "\xc2\x79", "\xfc\x00", 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]; \ diff --git a/string/strxfrm.c b/string/strxfrm.c index 7ddc5f3f81..dd0ad67835 100644 --- a/string/strxfrm.c +++ b/string/strxfrm.c @@ -46,24 +46,11 @@ #ifndef WIDE_CHAR_VERSION -/* These are definitions used by some of the functions for handling - UTF-8 encoding below. */ -static const uint32_t encoding_mask[] = -{ - ~0x7ff, ~0xffff, ~0x1fffff, ~0x3ffffff -}; - -static const unsigned char encoding_byte[] = -{ - 0xc0, 0xe0, 0xf0, 0xf8, 0xfc -}; - /* We need UTF-8 encoding of numbers. */ static inline int utf8_encode (char *buf, int val) { - char *startp = buf; int retval; if (val < 0x80) @@ -76,11 +63,11 @@ utf8_encode (char *buf, int val) int step; for (step = 2; step < 6; ++step) - if ((val & encoding_mask[step - 2]) == 0) + if ((val & (~(uint32_t)0 << (5 * step + 1))) == 0) break; retval = step; - *buf = encoding_byte[step - 2]; + *buf = (unsigned char) (~0xff >> step); --step; do { @@ -91,7 +78,7 @@ utf8_encode (char *buf, int val) *buf |= val; } - return buf - startp; + return retval; } #endif |