This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
ISIRI-3342 converter broken
- To: libc-alpha at sourceware dot cygnus dot com
- Subject: ISIRI-3342 converter broken
- From: Bruno Haible <haible at ilog dot fr>
- Date: Mon, 31 Jul 2000 17:22:29 +0200 (CEST)
- cc: Pablo Saratxaga <pablo at mandrakesoft dot com>
- cc: Roozbeh Pournader <roozbeh at sina dot sharif dot ac dot ir>
The iconv converter module for ISIRI-3342 is broken: In the char -> Unicode
direction, it does not convert 0x80 to U+0000, as described in the charmap.
And the Unicode -> char conversion is completely broken, because the script
to generate the .h file from the charmap cannot cope with the non-injective
mapping: the from_ucs4 table contains extraneous elements. Here is a fix.
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.
*** glibc-20000729/iconvdata/Makefile.bak Fri Jul 14 15:15:32 2000
--- glibc-20000729/iconvdata/Makefile Sun Jul 30 18:32:18 2000
***************
*** 159,165 ****
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
gen-special-modules := iso8859-7jp
--- 159,165 ----
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
gen-special-modules := iso8859-7jp
*** glibc-20000729/iconvdata/isiri-3342.h.bak Sun Jul 30 18:30:44 2000
--- glibc-20000729/iconvdata/isiri-3342.h Sun Jul 30 18:25:03 2000
***************
*** 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',
+ };
*** glibc-20000729/iconvdata/isiri-3342.c.bak Sun Dec 19 02:47:47 1999
--- glibc-20000729/iconvdata/isiri-3342.c Sun Jul 30 18:46:46 2000
***************
*** 1,5 ****
/* Conversion from and to ISIRI-3342.
! Copyright (C) 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
--- 1,5 ----
/* Conversion from and to ISIRI-3342.
! 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,29 ****
#define TABLES <isiri-3342.h>
#define CHARSET_NAME "ISIRI-3342//"
! #define HAS_HOLES 1 /* Not all 256 character are defined. */
#include <8bit-gap.c>
--- 24,29 ----
#define TABLES <isiri-3342.h>
#define CHARSET_NAME "ISIRI-3342//"
! #define HAS_HOLES (*inptr > 0x80) /* 0x80 really maps to 0x0000. */
#include <8bit-gap.c>