mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-15 04:20:28 +08:00
faaa6f6283
2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/testdata/EUC-JISX0213: New file. * iconvdata/testdata/EUC-JISX0213..UTF8: New file. * iconvdata/testdata/SHIFT_JISX0213: New file. * iconvdata/testdata/SHIFT_JISX0213..UTF8: New file. * iconvdata/testdata/ISO-2022-JP-3: New file. * iconvdata/testdata/ISO-2022-JP-3..UTF8: New file. * iconvdata/TESTS: Add EUC-JISX0213, SHIFT_JISX0213, ISO-2022-JP-3. * iconvdata/run-iconv-test.sh: Skip the charmap test if the charmap contains comments indicating precomposed characters. 2002-04-21 Bruno Haible <bruno@clisp.org> * iconvdata/iso-2022-jp-3.c: New file. * iconvdata/gconv-modules (ISO-2022-JP-3): New module. * iconvdata/Makefile (modules): Add ISO-2022-JP-3. (LDFLAGS-ISO-2022-JP-3.so): New variable. (ISO-2022-JP-3.so): Depend on libJIS.so and libJISX0213.so. (distribute): Add iso-2022-jp-3.c. 2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/tst-table-to.c (main): Restore handling of transliterations, broken by last patch. 2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/TESTS: Add IBM922, IBM1124, IBM1129. 2002-05-12 Bruno Haible <bruno@clisp.org> * iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Don't advance inptr when there is not enough room in the output buffer. * iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise. 2002-04-20 Bruno Haible <bruno@clisp.org> * iconv/skeleton.c ({FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}): New macros. (RESET_INPUT_BUFFER): Use them instead of {MIN,MAX}_NEEDED_{FROM,TO}. Also make this macro work if FROM_DIRECTION evaluates to 0. (gconv_init): Use the new macros instead of {MIN,MAX}_NEEDED_{FROM,TO}. (FUNCTION_NAME): Likewise, in the handling of unaligned accesses and of consume_incomplete. * iconvdata/cp1255.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 4, not 8. * iconvdata/cp1258.c: Likewise. * iconvdata/ibm930.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 3, not 2. * iconvdata/ibm933.c: Likewise. * iconvdata/ibm935.c: Likewise. * iconvdata/ibm937.c: Likewise. * iconvdata/ibm939.c: Likewise. * iconvdata/iso-2022-cn.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 6, not 4. * iconvdata/iso-2022-cn-ext.c: Likewise. * iconvdata/iso-2022-jp.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. * iconvdata/tcvn5712-1.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_FROM to 1, not 2. * iconvdata/euc-jisx0213.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 8, not 4. * iconvdata/shift_jisx0213.c: Likewise. 2002-05-14 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> * sysdeps/powerpc/Makefile (sysdeps_routines): Add divdi3, cmpdi2, shdi3, fixdfdi, fixsfdi in csu dir. (shared-only-routines): Likewise. * sysdeps/wordsize-32/cmpdi2.c: New file. * sysdeps/wordsize-32/shdi3.c: New file. * sysdeps/wordsize-32/fixdfdi.c: New file. * sysdeps/wordsize-32/fixsfdi.c: New file. * sysdeps/powerpc/Versions (__divdi3, __moddi3, __udivdi3, __umoddi3, __ashldi3, __ashrdi3, __lshrdi3, __cmpdi2, __ucmpdi2, __fixdfdi, __fixsfdi, __fixunsdfdi, __fixunssfdi): Export at GLIBC_2.0. * sysdeps/unix/sysv/linux/semctl.c (__old_semctl, __new_semctl): Only use va_arg if the argument will be used [PR libc/3259]. 2002-05-06 Michael A. Schmidt <mmaass@us.ibm.com> * catgets/catgets.c (catopen): Free buffer if internal catalog open fails. 2002-05-14 Ulrich Drepper <drepper@redhat.com> * debug/xtrace.sh: Make more robust. For realtime tracking use non-buffering methods. * debug/pcprofiledump.c: Implement -u option. Patch by Roger Luethi <rl@hellgate.ch>.
133 lines
3.5 KiB
C
133 lines
3.5 KiB
C
/* Copyright (C) 2000-2002 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
/* Create a table from Unicode to CHARSET.
|
|
This is a good test for CHARSET's iconv() module, in particular the
|
|
TO_LOOP BODY macro. */
|
|
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <iconv.h>
|
|
#include <errno.h>
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
const char *charset;
|
|
iconv_t cd;
|
|
int bmp_only;
|
|
|
|
if (argc != 2)
|
|
{
|
|
fprintf (stderr, "Usage: tst-table-to charset\n");
|
|
return 1;
|
|
}
|
|
charset = argv[1];
|
|
|
|
cd = iconv_open (charset, "UTF-8");
|
|
if (cd == (iconv_t)(-1))
|
|
{
|
|
perror ("iconv_open");
|
|
return 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);
|
|
|
|
{
|
|
unsigned int i;
|
|
unsigned char buf[10];
|
|
|
|
for (i = 0; i < (bmp_only ? 0x10000 : 0x30000); i++)
|
|
{
|
|
unsigned char in[6];
|
|
unsigned int incount =
|
|
(i < 0x80 ? (in[0] = i, 1)
|
|
: i < 0x800 ? (in[0] = 0xc0 | (i >> 6),
|
|
in[1] = 0x80 | (i & 0x3f), 2)
|
|
: i < 0x10000 ? (in[0] = 0xe0 | (i >> 12),
|
|
in[1] = 0x80 | ((i >> 6) & 0x3f),
|
|
in[2] = 0x80 | (i & 0x3f), 3)
|
|
: /* i < 0x200000 */ (in[0] = 0xf0 | (i >> 18),
|
|
in[1] = 0x80 | ((i >> 12) & 0x3f),
|
|
in[2] = 0x80 | ((i >> 6) & 0x3f),
|
|
in[3] = 0x80 | (i & 0x3f), 4));
|
|
const char *inbuf = (const char *) in;
|
|
size_t inbytesleft = incount;
|
|
char *outbuf = (char *) buf;
|
|
size_t outbytesleft = sizeof (buf);
|
|
size_t result;
|
|
size_t result2 = 0;
|
|
|
|
iconv (cd, NULL, NULL, NULL, NULL);
|
|
result = iconv (cd,
|
|
(char **) &inbuf, &inbytesleft,
|
|
&outbuf, &outbytesleft);
|
|
if (result != (size_t)(-1))
|
|
result2 = iconv (cd, NULL, NULL, &outbuf, &outbytesleft);
|
|
|
|
if (result == (size_t)(-1) || result2 == (size_t)(-1))
|
|
{
|
|
if (errno != EILSEQ)
|
|
{
|
|
int saved_errno = errno;
|
|
fprintf (stderr, "0x%02X: iconv error: ", i);
|
|
errno = saved_errno;
|
|
perror ("");
|
|
return 1;
|
|
}
|
|
}
|
|
else if (result == 0) /* ignore conversions with transliteration */
|
|
{
|
|
unsigned int j, jmax;
|
|
if (inbytesleft != 0 || outbytesleft == sizeof (buf))
|
|
{
|
|
fprintf (stderr, "0x%02X: inbytes = %ld, outbytes = %ld\n", i,
|
|
(long) (incount - inbytesleft),
|
|
(long) (sizeof (buf) - outbytesleft));
|
|
return 1;
|
|
}
|
|
jmax = sizeof (buf) - outbytesleft;
|
|
printf ("0x");
|
|
for (j = 0; j < jmax; j++)
|
|
printf ("%02X", buf[j]);
|
|
printf ("\t0x%04X\n", i);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (iconv_close (cd) < 0)
|
|
{
|
|
perror ("iconv_close");
|
|
return 1;
|
|
}
|
|
|
|
if (ferror (stdin) || fflush (stdout) || ferror (stdout))
|
|
{
|
|
fprintf (stderr, "I/O error\n");
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|