mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 05:50:14 +00:00
601d294296
2001-06-04 Bruno Haible <haible@clisp.cons.org> * iconv/loop.c (UNICODE_TAG_HANDLER): New macro. * iconv/gconv_simple.c (__gconv_transform_internal_ascii): Invoke UNICODE_TAG_HANDLER. (__gconv_transform_internal_ucs2): Likewise. (__gconv_transform_internal_ucs2reverse): Likewise. * iconvdata/8bit-gap.c (BODY for TO_LOOP): Invoke UNICODE_TAG_HANDLER. * iconvdata/8bit-generic.c (BODY for TO_LOOP): Likewise. * iconvdata/ansi_x3.110.c (BODY for TO_LOOP): Likewise. * iconvdata/big5.c (BODY for TO_LOOP): Likewise. * iconvdata/big5hkscs.c (BODY for TO_LOOP): Likewise. * iconvdata/cp1255.c (BODY for TO_LOOP): Likewise. * iconvdata/cp1258.c (BODY for TO_LOOP): Likewise. * iconvdata/euc-cn.c (BODY for TO_LOOP): Likewise. * iconvdata/euc-jp.c (BODY for TO_LOOP): Likewise. * iconvdata/euc-kr.c (BODY for TO_LOOP): Likewise. * iconvdata/euc-tw.c (BODY for TO_LOOP): Likewise. * iconvdata/gbk.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm930.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm932.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm933.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm935.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm937.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm939.c (BODY for TO_LOOP): Likewise. * iconvdata/ibm943.c (BODY for TO_LOOP): Likewise. * iconvdata/iso646.c (BODY for TO_LOOP): Likewise. * iconvdata/iso8859-1.c (BODY for TO_LOOP): Likewise. * iconvdata/iso_6937.c (BODY for TO_LOOP): Likewise. * iconvdata/iso_6937-2.c (BODY for TO_LOOP): Likewise. * iconvdata/iso-2022-cn.c (BODY for TO_LOOP): Likewise. * iconvdata/iso-2022-cn-ext.c (BODY for TO_LOOP): Likewise. * iconvdata/iso-2022-kr.c (BODY for TO_LOOP): Likewise. * iconvdata/johab.c (BODY for TO_LOOP): Likewise. * iconvdata/sjis.c (BODY for TO_LOOP): Likewise. * iconvdata/t.61.c (BODY for TO_LOOP): Likewise. * iconvdata/uhc.c (BODY for TO_LOOP): Likewise. * iconvdata/unicode.c (BODY for TO_LOOP): Likewise. * iconvdata/iso-2022-jp.c (TAG_none, TAG_language, TAG_language_j, TAG_language_ja, TAG_language_k, TAG_language_ko, TAG_language_z, TAG_language_zh, CURRENT_TAG_MASK): New enum values. (EMIT_SHIFT_TO_INIT): Don't emit an escape sequence if ASCII_set is already selected but set2 or tag are set. (conversion): New enum type. (cvlist_t): New type. (CVLIST, CVLIST_FIRST, CVLIST_REST): New macros. (conversion_lists): New array. (BODY for TO_LOOP): Keep track of Unicode 3.1 language tag. If "ja", prefer conversion to Japanese character sets. If "zh", prefer conversion to GB2312. If "ko", prefer conversion to KSC5601. Small optimizations. (INIT_PARAMS): Add tag. (UPDATE_PARAMS): Add tag. 2001-06-04 Bruno Haible <haible@clisp.cons.org> * locale/programs/locfile.c (write_locale_data): Before creat(), unlink the file, to avoid crashing the processes that mmap it. Change a double slash to a single slash. Free fname in case of error return. 2001-06-02 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/fpu/s_frexpl.S (__frexpl): Mostly revert 2000-12-03 changes, do the special handling for denormal numbers, not for normalized numbers (patch by <trevin@xmission.com>). * math/test-misc.c (main): Test frexpl with denormal arguments. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * math/libm-test.inc (llround_test): Add two new llround tests. * sysdeps/ieee754/ldbl-96/s_llroundl.c (__llroundl): Don't allow overflow when rounding away from zero. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * math/Makefile (libm-calls): Add e_log2, w_log2, remove s_log2. * math/math_private.h (__ieee754_log2, __ieee754_log2f, __ieee754_log2l): New prototypes. * sysdeps/generic/w_log2.c: New file. * sysdeps/generic/w_log2f.c: New file. * sysdeps/generic/w_log2l.c: New file. * sysdeps/generic/s_log2l.c: Move... * sysdeps/generic/e_log2l.c: ...to here. Rename to __ieee754_log2l. * sysdeps/ieee754/k_standard.c (__kernel_standard): Handle log2(0) and log2(x < 0). * sysdeps/i386/fpu/s_log2.S: Move... * sysdeps/i386/fpu/e_log2.S: ...to here. Rename to __ieee754_log2. * sysdeps/i386/fpu/s_log2f.S: Move... * sysdeps/i386/fpu/e_log2f.S: ...to here. Rename to __ieee754_log2f. * sysdeps/i386/fpu/s_log2l.S: Move... * sysdeps/i386/fpu/e_log2l.S: ...to here. Rename to __ieee754_log2l. * sysdeps/m68k/fpu/s_log2.S: Move... * sysdeps/m68k/fpu/e_log2.S: ...to here. Rename to __ieee754_log2. * sysdeps/m68k/fpu/s_log2f.S: Move... * sysdeps/m68k/fpu/e_log2f.S: ...to here. Rename to __ieee754_log2f. * sysdeps/m68k/fpu/s_log2l.S: Move... * sysdeps/m68k/fpu/e_log2l.S: ...to here. Rename to __ieee754_log2l. * sysdeps/ieee754/dbl-64/s_log2.c: Move... * sysdeps/ieee754/dbl-64/e_log2.c: ...to here. Rename to __ieee754_log2. * sysdeps/ieee754/flt-32/s_log2f.c: Move... * sysdeps/ieee754/flt-32/e_log2f.c: ...to here. Rename to __ieee754_log2f. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * sysdeps/generic/w_exp2.c (u_threshold): Lower threshold so that even arguments which result in denormalized exp2 are accepted. (__exp2): Arguments equal to u_threshold already result into underflow. * sysdeps/generic/w_exp2f.c (u_threshold, __exp2f): Likewise. * sysdeps/generic/w_exp2l.c (u_threshold, __exp2l): Likewise. * sysdeps/ieee754/dbl-64/e_exp2.c (__ieee754_exp2): Lomark was too low, with corrected lowmark use greaterequal, not greater. * sysdeps/ieee754/flt-32/e_exp2f.c (__ieee754_exp2f): Likewise. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * math/libm-test.inc (ilogb_test): Test that ilogb(+-Inf) == INT_MAX. * sysdeps/i386/fpu/s_ilogb.S (__ilogb): Return INT_MAX for +-Inf. * sysdeps/i386/fpu/s_ilogbf.S (__ilogbf): Likewise. * sysdeps/i386/fpu/s_ilogbl.S (__ilogbl): Likewise. * sysdeps/ieee754/dbl-64/s_ilogb.c (__ilogb): Likewise. * sysdeps/ieee754/flt-32/s_ilogbf.c (__ilogbf): Likewise. * sysdeps/ieee754/ldbl-128/s_ilogbl.c (__ilogbl): Likewise. * sysdeps/ieee754/ldbl-96/s_ilogbl.c (__ilogbl): Likewise. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * sysdeps/generic/w_coshl.c (__coshl): Test if finite argument gave non-finite result instead of using constant in generic version. * sysdeps/generic/w_coshf.c (__coshf): Likewise. * sysdeps/generic/w_cosh.c (__cosh): Likewise. * sysdeps/generic/w_exp10.c (o_threshold, u_threshold): Remove. (__exp10): Test if finite argument gave non-finite result. * sysdeps/generic/w_exp10f.c (o_threshold, u_threshold, __exp10f): Likewise. * sysdeps/generic/w_exp10l.c (o_threshold, u_threshold, __exp10l): Likewise. 2001-06-04 Jakub Jelinek <jakub@redhat.com> * sysdeps/ieee754/ldbl-96/e_coshl.c (__ieee754_coshl): Fix overflow threshold constant (log(LDBL_MAX)+M_LN2l). 2001-05-29 Bruno Haible <haible@clisp.cons.org> * locale/programs/ld-ctype.c (idx_table): New struct type. (idx_table_init, idx_table_get, idx_table_add): New functions. (MAX_CHARNAMES_IDX): Remove macro. (locale_ctype_t): Change type of charnames_idx field. (ctype_startup): Change initialization of charnames_idx field. (find_idx): Use idx_table_get and idx_table_add for speed. * locale/programs/charmap.c (charmap_new_char): Fix ucs4 value computation of characters in a range. 2001-05-29 Bruno Haible <haible@clisp.cons.org> * iconvdata/gb18030.c (__fourbyte_to_ucs1): Add mappings for <U03F4>, <U03F5>. (__ucs_to_gb18030_tab1): Likewise. (BODY for FROM_LOOP): Add mapping for <U00010000>..<U0010FFFF>. (BODY for TO_LOOP): Likewise. * iconvdata/tst-table-charmap.sh: Update for charmaps containing <U00xxxxxx> syntax. * iconvdata/tst-table-from.c (bmp_only): New variable. (utf8_decode): If bmp_only, don't return characters outside Unicode plane 0. (main): When testing UTF-8 or GB18030, set bmp_only to 1. Don't print a conversion line if utf8_decode returns NULL. * iconvdata/tst-table-to.c (main): When testing encodings other than UTF-8 and GB18030, loop upto U+30000 instead of U+10000. Use UTF-8 instead of UCS-2 as input. * iconvdata/tst-table.sh: For GB18030, use only the part < 0x10000 of the charmap. 2001-05-29 Bruno Haible <haible@clisp.cons.org> * iconvdata/cns11643l1.c: Update to Unicode 3.1. (__cns11643l1_to_ucs4_tab): Regenerated. (__cns11643l1_from_ucs4_tab12): Regenerated. * iconvdata/cns11643.c: Update to Unicode 3.1. (__cns11643l14_to_ucs4_tab): Remove array. (__cns11643l3_to_ucs4_tab, __cns11643l4_to_ucs4_tab, __cns11643l5_to_ucs4_tab, __cns11643l6_to_ucs4_tab, __cns11643l7_to_ucs4_tab, __cns11643l15_to_ucs4_tab): New arrays. (__cns11643_from_ucs4p0_tab): Renamed from __cns11643_from_ucs4_tab. (__cns11643_from_ucs4p2_tab): New array. * iconvdata/cns11643.h (__cns11643l14_to_ucs4_tab): Remove declaration. (__cns11643l3_to_ucs4_tab, __cns11643l4_to_ucs4_tab, __cns11643l5_to_ucs4_tab, __cns11643l6_to_ucs4_tab, __cns11643l7_to_ucs4_tab, __cns11643l15_to_ucs4_tab): New declarations. (cns11643_to_ucs4): Treat planes 3, 4, 5, 6, 7, 15 instead of 14. (__cns11643_from_ucs4_tab): Remove declaration. (__cns11643_from_ucs4p0_tab, __cns11643_from_ucs4p2_tab): New declarations. (ucs4_to_cns11643): Update for new arrays. Treat U+3400..U+4DFF and U+20000..U+2A6D6. * iconvdata/cns11643l2.h (__cns11643_from_ucs4_tab): Remove declaration. (__cns11643_from_ucs4p0_tab): New declaration. (ucs4_to_cns11643l2): Update for new arrays. * iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Handle planes 3 to 7. (BODY for TO_LOOP): Handle planes 3 to 7, instead of plane 14. * iconvdata/EUC-TW.irreversible: New file. * iconvdata/tst-table.sh: Use it. * iconvdata/Makefile (distribute): Add CP1255.irreversible, CP1258.irreversible, EUC-TW.irreversible. 2001-05-29 Bruno Haible <haible@clisp.cons.org> * locale/C-translit.h.in: Add transliterations for new Unicode 3.1 mathematical symbols.
302 lines
7.0 KiB
C
302 lines
7.0 KiB
C
/* Copyright (C) 2000-2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Bruno Haible <haible@clisp.cons.org>, 2000.
|
|
|
|
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. */
|
|
|
|
/* Create a table from CHARSET to Unicode.
|
|
This is a good test for CHARSET's iconv() module, in particular the
|
|
FROM_LOOP BODY macro. */
|
|
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <iconv.h>
|
|
#include <errno.h>
|
|
|
|
/* If nonzero, ignore conversions outside Unicode plane 0. */
|
|
static int bmp_only;
|
|
|
|
/* Converts a byte buffer to a hexadecimal string. */
|
|
static const char*
|
|
hexbuf (unsigned char buf[], unsigned int buflen)
|
|
{
|
|
static char msg[50];
|
|
|
|
switch (buflen)
|
|
{
|
|
case 1:
|
|
sprintf (msg, "0x%02X", buf[0]);
|
|
break;
|
|
case 2:
|
|
sprintf (msg, "0x%02X%02X", buf[0], buf[1]);
|
|
break;
|
|
case 3:
|
|
sprintf (msg, "0x%02X%02X%02X", buf[0], buf[1], buf[2]);
|
|
break;
|
|
case 4:
|
|
sprintf (msg, "0x%02X%02X%02X%02X", buf[0], buf[1], buf[2], buf[3]);
|
|
break;
|
|
default:
|
|
abort ();
|
|
}
|
|
return msg;
|
|
}
|
|
|
|
/* Attempts to convert a byte buffer BUF (BUFLEN bytes) to OUT (6 bytes)
|
|
using the conversion descriptor CD. Returns the number of written bytes,
|
|
or 0 if ambiguous, or -1 if invalid. */
|
|
static int
|
|
try (iconv_t cd, unsigned char buf[], unsigned int buflen, unsigned char *out)
|
|
{
|
|
const char *inbuf = (const char *) buf;
|
|
size_t inbytesleft = buflen;
|
|
char *outbuf = (char *) out;
|
|
size_t outbytesleft = 6;
|
|
size_t result;
|
|
|
|
iconv (cd, NULL, NULL, NULL, NULL);
|
|
result = iconv (cd, (char **) &inbuf, &inbytesleft, &outbuf, &outbytesleft);
|
|
if (result != (size_t)(-1))
|
|
result = iconv (cd, NULL, NULL, &outbuf, &outbytesleft);
|
|
|
|
if (result == (size_t)(-1))
|
|
{
|
|
if (errno == EILSEQ)
|
|
{
|
|
return -1;
|
|
}
|
|
else if (errno == EINVAL)
|
|
{
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
int saved_errno = errno;
|
|
fprintf (stderr, "%s: iconv error: ", hexbuf (buf, buflen));
|
|
errno = saved_errno;
|
|
perror ("");
|
|
exit (1);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (inbytesleft != 0)
|
|
{
|
|
fprintf (stderr, "%s: inbytes = %ld, outbytes = %ld\n",
|
|
hexbuf (buf, buflen),
|
|
(long) (buflen - inbytesleft),
|
|
(long) (6 - outbytesleft));
|
|
exit (1);
|
|
}
|
|
return 6 - outbytesleft;
|
|
}
|
|
}
|
|
|
|
/* Returns the out[] buffer as a Unicode value, formatted as 0x%04X. */
|
|
static const char *
|
|
utf8_decode (const unsigned char *out, unsigned int outlen)
|
|
{
|
|
static char hexbuf[42];
|
|
char *p = hexbuf;
|
|
|
|
while (outlen > 0)
|
|
{
|
|
if (p > hexbuf)
|
|
*p++ = ' ';
|
|
|
|
if (out[0] < 0x80)
|
|
{
|
|
sprintf (p, "0x%04X", out[0]);
|
|
out += 1; outlen -= 1;
|
|
}
|
|
else if (out[0] >= 0xc0 && out[0] < 0xe0 && outlen >= 2)
|
|
{
|
|
sprintf (p, "0x%04X", ((out[0] & 0x1f) << 6) + (out[1] & 0x3f));
|
|
out += 2; outlen -= 2;
|
|
}
|
|
else if (out[0] >= 0xe0 && out[0] < 0xf0 && outlen >= 3)
|
|
{
|
|
sprintf (p, "0x%04X", ((out[0] & 0x0f) << 12)
|
|
+ ((out[1] & 0x3f) << 6) + (out[2] & 0x3f));
|
|
out += 3; outlen -= 3;
|
|
}
|
|
else if (out[0] >= 0xf0 && out[0] < 0xf8 && outlen >= 4)
|
|
{
|
|
sprintf (p, "0x%04X", ((out[0] & 0x07) << 18)
|
|
+ ((out[1] & 0x3f) << 12)
|
|
+ ((out[2] & 0x3f) << 6) + (out[3] & 0x3f));
|
|
out += 4; outlen -= 4;
|
|
}
|
|
else if (out[0] >= 0xf8 && out[0] < 0xfc && outlen >= 5)
|
|
{
|
|
sprintf (p, "0x%04X", ((out[0] & 0x03) << 24)
|
|
+ ((out[1] & 0x3f) << 18)
|
|
+ ((out[2] & 0x3f) << 12)
|
|
+ ((out[3] & 0x3f) << 6) + (out[4] & 0x3f));
|
|
out += 5; outlen -= 5;
|
|
}
|
|
else if (out[0] >= 0xfc && out[0] < 0xfe && outlen >= 6)
|
|
{
|
|
sprintf (p, "0x%04X", ((out[0] & 0x01) << 30)
|
|
+ ((out[1] & 0x3f) << 24)
|
|
+ ((out[2] & 0x3f) << 18)
|
|
+ ((out[3] & 0x3f) << 12)
|
|
+ ((out[4] & 0x3f) << 6) + (out[5] & 0x3f));
|
|
out += 6; outlen -= 6;
|
|
}
|
|
else
|
|
{
|
|
sprintf (p, "0x????");
|
|
out += 1; outlen -= 1;
|
|
}
|
|
|
|
if (bmp_only && strlen (p) > 6)
|
|
/* Ignore conversions outside Unicode plane 0. */
|
|
return NULL;
|
|
|
|
p += strlen (p);
|
|
}
|
|
|
|
return hexbuf;
|
|
}
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
const char *charset;
|
|
iconv_t cd;
|
|
int search_depth;
|
|
|
|
if (argc != 2)
|
|
{
|
|
fprintf (stderr, "Usage: tst-table-to charset\n");
|
|
exit (1);
|
|
}
|
|
charset = argv[1];
|
|
|
|
cd = iconv_open ("UTF-8", charset);
|
|
if (cd == (iconv_t)(-1))
|
|
{
|
|
perror ("iconv_open");
|
|
exit (1);
|
|
}
|
|
|
|
/* When testing UTF-8 or GB18030, stop at 0x10000, otherwise the output
|
|
file gets too big. */
|
|
bmp_only = (strcmp (charset, "UTF-8") == 0
|
|
|| strcmp (charset, "GB18030") == 0);
|
|
search_depth = (strcmp (charset, "UTF-8") == 0 ? 3 : 4);
|
|
|
|
{
|
|
unsigned char out[6];
|
|
unsigned char buf[4];
|
|
unsigned int i0, i1, i2, i3;
|
|
int result;
|
|
|
|
for (i0 = 0; i0 < 0x100; i0++)
|
|
{
|
|
buf[0] = i0;
|
|
result = try (cd, buf, 1, out);
|
|
if (result < 0)
|
|
{
|
|
}
|
|
else if (result > 0)
|
|
{
|
|
const char *unicode = utf8_decode (out, result);
|
|
if (unicode != NULL)
|
|
printf ("0x%02X\t%s\n", i0, unicode);
|
|
}
|
|
else
|
|
{
|
|
for (i1 = 0; i1 < 0x100; i1++)
|
|
{
|
|
buf[1] = i1;
|
|
result = try (cd, buf, 2, out);
|
|
if (result < 0)
|
|
{
|
|
}
|
|
else if (result > 0)
|
|
{
|
|
const char *unicode = utf8_decode (out, result);
|
|
if (unicode != NULL)
|
|
printf ("0x%02X%02X\t%s\n", i0, i1, unicode);
|
|
}
|
|
else
|
|
{
|
|
for (i2 = 0; i2 < 0x100; i2++)
|
|
{
|
|
buf[2] = i2;
|
|
result = try (cd, buf, 3, out);
|
|
if (result < 0)
|
|
{
|
|
}
|
|
else if (result > 0)
|
|
{
|
|
const char *unicode = utf8_decode (out, result);
|
|
if (unicode != NULL)
|
|
printf ("0x%02X%02X%02X\t%s\n",
|
|
i0, i1, i2, unicode);
|
|
}
|
|
else if (search_depth > 3)
|
|
{
|
|
for (i3 = 0; i3 < 0x100; i3++)
|
|
{
|
|
buf[3] = i3;
|
|
result = try (cd, buf, 4, out);
|
|
if (result < 0)
|
|
{
|
|
}
|
|
else if (result > 0)
|
|
{
|
|
const char *unicode =
|
|
utf8_decode (out, result);
|
|
if (unicode != NULL)
|
|
printf ("0x%02X%02X%02X%02X\t%s\n",
|
|
i0, i1, i2, i3, unicode);
|
|
}
|
|
else
|
|
{
|
|
fprintf (stderr,
|
|
"%s: incomplete byte sequence\n",
|
|
hexbuf (buf, 4));
|
|
exit (1);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (iconv_close (cd) < 0)
|
|
{
|
|
perror ("iconv_close");
|
|
exit (1);
|
|
}
|
|
|
|
if (ferror (stdin) || fflush (stdout) || ferror (stdout))
|
|
{
|
|
fprintf (stderr, "I/O error\n");
|
|
exit (1);
|
|
}
|
|
|
|
return 0;
|
|
}
|