mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 02:40:08 +00:00
Update.
* iconvdata/run-iconv-test.sh: Reorgnize a bit to allow running only the ASCII test. * iconvdata/TESTS: Add entries for IBM932 and IBM943. * iconvdata/Makefile (modules): Add IBM932 and IBM943. * iconvdata/gconv-modules: Add entries for IBM932 and IBM943. * iconvdata/ibm932.c: New file. * iconvdata/ibm932.h: New file. * iconvdata/ibm943.c: New file. * iconvdata/ibm943.h: New file. Patches by Masahide Washizawa <washi@jp.ibm.com>.
This commit is contained in:
parent
b72f9d5197
commit
3b7caeac2c
12
ChangeLog
12
ChangeLog
@ -1,5 +1,17 @@
|
||||
2001-01-20 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* iconvdata/run-iconv-test.sh: Reorgnize a bit to allow running only
|
||||
the ASCII test.
|
||||
* iconvdata/TESTS: Add entries for IBM932 and IBM943.
|
||||
|
||||
* iconvdata/Makefile (modules): Add IBM932 and IBM943.
|
||||
* iconvdata/gconv-modules: Add entries for IBM932 and IBM943.
|
||||
* iconvdata/ibm932.c: New file.
|
||||
* iconvdata/ibm932.h: New file.
|
||||
* iconvdata/ibm943.c: New file.
|
||||
* iconvdata/ibm943.h: New file.
|
||||
Patches by Masahide Washizawa <washi@jp.ibm.com>.
|
||||
|
||||
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Fix typo
|
||||
preventing optimization from being done. Set the correct type bit
|
||||
in seen. Don't define and use _dl_base_addr unless
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
|
||||
# The GNU C Library is free software; you can redistribute it and/or
|
||||
@ -37,7 +37,7 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
|
||||
IBM280 IBM281 IBM284 IBM285 IBM290 IBM297 IBM420 IBM424 \
|
||||
IBM437 IBM850 IBM851 IBM852 IBM855 IBM857 IBM860 IBM861 \
|
||||
IBM862 IBM863 IBM864 IBM865 IBM868 IBM869 IBM875 IBM880 \
|
||||
IBM866 CP1258 IBM922 IBM1124 IBM1129 \
|
||||
IBM866 CP1258 IBM922 IBM1124 IBM1129 IBM932 IBM943 \
|
||||
IBM856 IBM930 IBM933 IBM935 IBM937 IBM939 IBM1046 \
|
||||
IBM918 IBM1004 IBM1026 CP1250 CP1251 CP1252 CP1253 CP1254 \
|
||||
CP1255 CP1256 CP1257 ISO-2022-JP MACINTOSH IEC_P27-1 \
|
||||
@ -135,7 +135,8 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk \
|
||||
t.61.c uhc.c sami-ws2.c iso-ir-197.c tis-620.c koi8-u.c \
|
||||
isiri-3342.c isiri-3342.h gbgbk.c iso-2022-cn.c cns11643l2.h \
|
||||
iso8859-16.c utf-16.c unicode.c utf-7.c big5hkscs.c \
|
||||
iso-ir-165.c iso-ir-165.h gb18030.c iso-2022-cn-ext.c
|
||||
iso-ir-165.c iso-ir-165.h gb18030.c iso-2022-cn-ext.c \
|
||||
ibm932.c ibm932.h ibm943.c ibm943.h
|
||||
|
||||
# We build the transformation modules only when we build shared libs.
|
||||
ifeq (yes,$(build-shared))
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Available tests for iconv(1) (and therefore iconv(3)) in GNU libc.
|
||||
# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
# Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
||||
#
|
||||
@ -95,3 +95,5 @@ IBM935 IBM935 N UTF8
|
||||
IBM937 IBM937 N UTF8
|
||||
IBM939 IBM939 N UTF8
|
||||
IBM1046 IBM1046 Y UTF8
|
||||
IBM932 IBM932 N
|
||||
IBM943 IBM943 N
|
||||
|
@ -840,6 +840,12 @@ alias CSIBM930// IBM930//
|
||||
module IBM930// INTERNAL IBM930 1
|
||||
module INTERNAL IBM930// IBM930 1
|
||||
|
||||
# from to module cost
|
||||
alias IBM-932// IBM932//
|
||||
alias CSIBM932// IBM932//
|
||||
module IBM932// INTERNAL IBM932 1
|
||||
module INTERNAL IBM932// IBM932 1
|
||||
|
||||
# from to module cost
|
||||
alias IBM-933// IBM933//
|
||||
alias CP933// IBM933//
|
||||
@ -872,6 +878,12 @@ alias CSIBM939// IBM939//
|
||||
module IBM939// INTERNAL IBM939 1
|
||||
module INTERNAL IBM939// IBM939 1
|
||||
|
||||
# from to module cost
|
||||
alias IBM-943// IBM943//
|
||||
alias CSIBM943// IBM943//
|
||||
module IBM943// INTERNAL IBM943 1
|
||||
module INTERNAL IBM943// IBM943 1
|
||||
|
||||
# from to module cost
|
||||
alias CP1004// IBM1004//
|
||||
alias OS2LATIN1// IBM1004//
|
||||
|
234
iconvdata/ibm932.c
Normal file
234
iconvdata/ibm932.c
Normal file
@ -0,0 +1,234 @@
|
||||
/* Conversion from and to IBM932.
|
||||
Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Masahide Washizawa <washi@jp.ibm.com>, 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. */
|
||||
|
||||
#include "ibm932.h"
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
#define FROM 0
|
||||
#define TO 1
|
||||
|
||||
/* Definitions used in the body of the `gconv' function. */
|
||||
#define CHARSET_NAME "IBM932//"
|
||||
#define FROM_LOOP from_ibm932
|
||||
#define TO_LOOP to_ibm932
|
||||
|
||||
/* Definitions of initialization and destructor function. */
|
||||
#define DEFINE_INIT 1
|
||||
#define DEFINE_FINI 1
|
||||
|
||||
#define MIN_NEEDED_FROM 1
|
||||
#define MAX_NEEDED_FROM 2
|
||||
#define MIN_NEEDED_TO 4
|
||||
|
||||
/* First, define the conversion function from IBM-932 to UCS4. */
|
||||
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
|
||||
#define MAX_NEEDED_INPUT MAX_NEEDED_FROM
|
||||
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
|
||||
#define LOOPFCT FROM_LOOP
|
||||
#define BODY \
|
||||
{ \
|
||||
const struct gap *rp1 = __ibm932sb_to_ucs4_idx; \
|
||||
const struct gap *rp2 = __ibm932db_to_ucs4_idx; \
|
||||
uint32_t ch = *inptr; \
|
||||
uint32_t res; \
|
||||
\
|
||||
if (__builtin_expect (ch, 0) >= 0xffff) \
|
||||
{ \
|
||||
rp1 = NULL; \
|
||||
rp2 = NULL; \
|
||||
} \
|
||||
else if (__builtin_expect (ch, 0) == 0x80 \
|
||||
|| __builtin_expect (ch, 0) == 0xa0 \
|
||||
|| __builtin_expect (ch, 0) == 0xfd \
|
||||
|| __builtin_expect (ch, 0) == 0xfe \
|
||||
|| __builtin_expect (ch, 0) == 0xff) \
|
||||
{ \
|
||||
/* This is an illegal character. */ \
|
||||
if (! ignore_errors_p ()) \
|
||||
{ \
|
||||
result = __GCONV_ILLEGAL_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
while (ch > rp1->end) \
|
||||
++rp1; \
|
||||
} \
|
||||
\
|
||||
/* Use the IBM932 table for single byte. */ \
|
||||
if (__builtin_expect (rp1 == NULL, 0) \
|
||||
|| __builtin_expect (ch < rp1->start, 0) \
|
||||
|| (res = __ibm932sb_to_ucs4[ch + rp1->idx], \
|
||||
__builtin_expect (res, '\1') == 0 && ch != 0)) \
|
||||
{ \
|
||||
\
|
||||
/* Use the IBM932 table for double byte. */ \
|
||||
if (__builtin_expect (inptr + 1 >= inend, 0)) \
|
||||
{ \
|
||||
/* The second character is not available. \
|
||||
Store the intermediate result. */ \
|
||||
result = __GCONV_INCOMPLETE_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
\
|
||||
ch = (ch * 0x100) + inptr[1]; \
|
||||
while (ch > rp2->end) \
|
||||
++rp2; \
|
||||
\
|
||||
if (__builtin_expect (rp2 == NULL, 0) \
|
||||
|| __builtin_expect (ch < rp2->start, 0) \
|
||||
|| (res = __ibm932db_to_ucs4[ch + rp2->idx], \
|
||||
__builtin_expect (res, '\1') == 0 && ch !=0)) \
|
||||
{ \
|
||||
/* This is an illegal character. */ \
|
||||
if (! ignore_errors_p ()) \
|
||||
{ \
|
||||
result = __GCONV_ILLEGAL_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
++*irreversible; \
|
||||
inptr += 2; \
|
||||
continue; \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
put32 (outptr, res); \
|
||||
outptr += 4; \
|
||||
inptr += 2; \
|
||||
} \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
if (res == 0x1c) \
|
||||
res = 0x1a; \
|
||||
else if (res == 0x7f) \
|
||||
res = 0x1c; \
|
||||
else if (res == 0xa5) \
|
||||
res = 0x5c; \
|
||||
else if (res == 0x203e) \
|
||||
res = 0x7e; \
|
||||
else if (res == 0x1a) \
|
||||
res = 0x7f; \
|
||||
put32 (outptr, res); \
|
||||
outptr += 4; \
|
||||
inptr++; \
|
||||
} \
|
||||
}
|
||||
#define LOOP_NEED_FLAGS
|
||||
#include <iconv/loop.c>
|
||||
|
||||
/* Next, define the other direction. */
|
||||
#define MIN_NEEDED_INPUT MIN_NEEDED_TO
|
||||
#define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
|
||||
#define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM
|
||||
#define LOOPFCT TO_LOOP
|
||||
#define BODY \
|
||||
{ \
|
||||
const struct gap *rp = __ucs4_to_ibm932sb_idx; \
|
||||
unsigned char sc; \
|
||||
uint32_t ch = get32(inptr); \
|
||||
uint16_t found = TRUE; \
|
||||
uint32_t i; \
|
||||
uint32_t low; \
|
||||
uint32_t high; \
|
||||
uint16_t pccode; \
|
||||
\
|
||||
if (__builtin_expect (ch, 0) >= 0xffff) \
|
||||
rp = NULL; \
|
||||
else \
|
||||
while (ch > rp->end) \
|
||||
++rp; \
|
||||
\
|
||||
/* Use the UCS4 table for single byte. */ \
|
||||
if (__builtin_expect (rp == NULL, 0) \
|
||||
|| __builtin_expect (ch < rp->start, 0) \
|
||||
|| (sc = __ucs4_to_ibm932sb[ch + rp->idx], \
|
||||
__builtin_expect (sc, '\1') == '\0' && ch != L'\0')) \
|
||||
{ \
|
||||
\
|
||||
/* Use the UCS4 table for double byte. */ \
|
||||
found = FALSE; \
|
||||
low = 0; \
|
||||
high = (sizeof (__ucs4_to_ibm932db) >> 1) \
|
||||
/ sizeof (__ucs4_to_ibm932db[0][FROM]); \
|
||||
pccode = ch; \
|
||||
while (low <= high) \
|
||||
{ \
|
||||
i = (low + high) >> 1; \
|
||||
if (pccode < __ucs4_to_ibm932db[i][FROM]) \
|
||||
high = i - 1; \
|
||||
else if (pccode > __ucs4_to_ibm932db[i][FROM]) \
|
||||
low = i + 1; \
|
||||
else \
|
||||
{ \
|
||||
pccode = __ucs4_to_ibm932db[i][TO]; \
|
||||
found = TRUE; \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
if (found) \
|
||||
{ \
|
||||
if (__builtin_expect (outptr + 2 > outend, 0)) \
|
||||
{ \
|
||||
result = __GCONV_FULL_OUTPUT; \
|
||||
break; \
|
||||
} \
|
||||
*outptr++ = pccode >> 8 & 0xff; \
|
||||
*outptr++ = pccode & 0xff; \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
/* This is an illegal character. */ \
|
||||
if (! ignore_errors_p ()) \
|
||||
{ \
|
||||
result = __GCONV_ILLEGAL_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
++*irreversible; \
|
||||
} \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
if (__builtin_expect (outptr + 1 > outend, 0)) \
|
||||
{ \
|
||||
result = __GCONV_FULL_OUTPUT; \
|
||||
break; \
|
||||
} \
|
||||
if (ch == 0x5c) \
|
||||
*outptr++ = 0x5c; \
|
||||
else if (ch == 0x7e) \
|
||||
*outptr++ = 0x7e; \
|
||||
else \
|
||||
*outptr++ = sc; \
|
||||
} \
|
||||
\
|
||||
/* Now that we wrote the output increment the input pointer. */ \
|
||||
inptr += 4; \
|
||||
}
|
||||
#define LOOP_NEED_FLAGS
|
||||
#include <iconv/loop.c>
|
||||
|
||||
/* Now define the toplevel functions. */
|
||||
#include <iconv/skeleton.c>
|
3678
iconvdata/ibm932.h
Normal file
3678
iconvdata/ibm932.h
Normal file
File diff suppressed because it is too large
Load Diff
234
iconvdata/ibm943.c
Normal file
234
iconvdata/ibm943.c
Normal file
@ -0,0 +1,234 @@
|
||||
/* Conversion from and to IBM943.
|
||||
Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Masahide Washizawa <washi@jp.ibm.com>, 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. */
|
||||
|
||||
#include "ibm943.h"
|
||||
|
||||
#ifndef TRUE
|
||||
#define TRUE 1
|
||||
#define FALSE 0
|
||||
#endif
|
||||
|
||||
#define FROM 0
|
||||
#define TO 1
|
||||
|
||||
/* Definitions used in the body of the `gconv' function. */
|
||||
#define CHARSET_NAME "IBM943//"
|
||||
#define FROM_LOOP from_ibm943
|
||||
#define TO_LOOP to_ibm943
|
||||
|
||||
/* Definitions of initialization and destructor function. */
|
||||
#define DEFINE_INIT 1
|
||||
#define DEFINE_FINI 1
|
||||
|
||||
#define MIN_NEEDED_FROM 1
|
||||
#define MAX_NEEDED_FROM 2
|
||||
#define MIN_NEEDED_TO 4
|
||||
|
||||
/* First, define the conversion function from IBM-943 to UCS4. */
|
||||
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
|
||||
#define MAX_NEEDED_INPUT MAX_NEEDED_FROM
|
||||
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
|
||||
#define LOOPFCT FROM_LOOP
|
||||
#define BODY \
|
||||
{ \
|
||||
const struct gap *rp1 = __ibm943sb_to_ucs4_idx; \
|
||||
const struct gap *rp2 = __ibm943db_to_ucs4_idx; \
|
||||
uint32_t ch = *inptr; \
|
||||
uint32_t res; \
|
||||
\
|
||||
if (__builtin_expect (ch, 0) >= 0xffff) \
|
||||
{ \
|
||||
rp1 = NULL; \
|
||||
rp2 = NULL; \
|
||||
} \
|
||||
else if (__builtin_expect (ch, 0) == 0x80 \
|
||||
|| __builtin_expect (ch, 0) == 0xa0 \
|
||||
|| __builtin_expect (ch, 0) == 0xfd \
|
||||
|| __builtin_expect (ch, 0) == 0xfe \
|
||||
|| __builtin_expect (ch, 0) == 0xff) \
|
||||
{ \
|
||||
/* This is an illegal character. */ \
|
||||
if (! ignore_errors_p ()) \
|
||||
{ \
|
||||
result = __GCONV_ILLEGAL_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
while (ch > rp1->end) \
|
||||
++rp1; \
|
||||
} \
|
||||
\
|
||||
/* Use the IBM943 table for single byte. */ \
|
||||
if (__builtin_expect (rp1 == NULL, 0) \
|
||||
|| __builtin_expect (ch < rp1->start, 0) \
|
||||
|| (res = __ibm943sb_to_ucs4[ch + rp1->idx], \
|
||||
__builtin_expect (res, '\1') == 0 && ch != 0)) \
|
||||
{ \
|
||||
\
|
||||
/* Use the IBM943 table for double byte. */ \
|
||||
if (__builtin_expect (inptr + 1 >= inend, 0)) \
|
||||
{ \
|
||||
/* The second character is not available. \
|
||||
Store the intermediate result. */ \
|
||||
result = __GCONV_INCOMPLETE_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
\
|
||||
ch = (ch * 0x100) + inptr[1]; \
|
||||
while (ch > rp2->end) \
|
||||
++rp2; \
|
||||
\
|
||||
if (__builtin_expect (rp2 == NULL, 0) \
|
||||
|| __builtin_expect (ch < rp2->start, 0) \
|
||||
|| (res = __ibm943db_to_ucs4[ch + rp2->idx], \
|
||||
__builtin_expect (res, '\1') == 0 && ch !=0)) \
|
||||
{ \
|
||||
/* This is an illegal character. */ \
|
||||
if (! ignore_errors_p ()) \
|
||||
{ \
|
||||
result = __GCONV_ILLEGAL_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
++*irreversible; \
|
||||
inptr += 2; \
|
||||
continue; \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
put32 (outptr, res); \
|
||||
outptr += 4; \
|
||||
inptr += 2; \
|
||||
} \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
if (res == 0x1c) \
|
||||
res = 0x1a; \
|
||||
else if (res == 0x7f) \
|
||||
res = 0x1c; \
|
||||
else if (res == 0xa5) \
|
||||
res = 0x5c; \
|
||||
else if (res == 0x203e) \
|
||||
res = 0x7e; \
|
||||
else if (res == 0x1a) \
|
||||
res = 0x7f; \
|
||||
put32 (outptr, res); \
|
||||
outptr += 4; \
|
||||
inptr++; \
|
||||
} \
|
||||
}
|
||||
#define LOOP_NEED_FLAGS
|
||||
#include <iconv/loop.c>
|
||||
|
||||
/* Next, define the other direction. */
|
||||
#define MIN_NEEDED_INPUT MIN_NEEDED_TO
|
||||
#define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
|
||||
#define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM
|
||||
#define LOOPFCT TO_LOOP
|
||||
#define BODY \
|
||||
{ \
|
||||
const struct gap *rp = __ucs4_to_ibm943sb_idx; \
|
||||
unsigned char sc; \
|
||||
uint32_t ch = get32(inptr); \
|
||||
uint16_t found = TRUE; \
|
||||
uint32_t i; \
|
||||
uint32_t low; \
|
||||
uint32_t high; \
|
||||
uint16_t pccode; \
|
||||
\
|
||||
if (__builtin_expect (ch, 0) >= 0xffff) \
|
||||
rp = NULL; \
|
||||
else \
|
||||
while (ch > rp->end) \
|
||||
++rp; \
|
||||
\
|
||||
/* Use the UCS4 table for single byte. */ \
|
||||
if (__builtin_expect (rp == NULL, 0) \
|
||||
|| __builtin_expect (ch < rp->start, 0) \
|
||||
|| (sc = __ucs4_to_ibm943sb[ch + rp->idx], \
|
||||
__builtin_expect (sc, '\1') == '\0' && ch != L'\0')) \
|
||||
{ \
|
||||
\
|
||||
/* Use the UCS4 table for double byte. */ \
|
||||
found = FALSE; \
|
||||
low = 0; \
|
||||
high = (sizeof (__ucs4_to_ibm943db) >> 1) \
|
||||
/ sizeof (__ucs4_to_ibm943db[0][FROM]); \
|
||||
pccode = ch; \
|
||||
while (low <= high) \
|
||||
{ \
|
||||
i = (low + high) >> 1; \
|
||||
if (pccode < __ucs4_to_ibm943db[i][FROM]) \
|
||||
high = i - 1; \
|
||||
else if (pccode > __ucs4_to_ibm943db[i][FROM]) \
|
||||
low = i + 1; \
|
||||
else \
|
||||
{ \
|
||||
pccode = __ucs4_to_ibm943db[i][TO]; \
|
||||
found = TRUE; \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
if (found) \
|
||||
{ \
|
||||
if (__builtin_expect (outptr + 2 > outend, 0)) \
|
||||
{ \
|
||||
result = __GCONV_FULL_OUTPUT; \
|
||||
break; \
|
||||
} \
|
||||
*outptr++ = pccode >> 8 & 0xff; \
|
||||
*outptr++ = pccode & 0xff; \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
/* This is an illegal character. */ \
|
||||
if (! ignore_errors_p ()) \
|
||||
{ \
|
||||
result = __GCONV_ILLEGAL_INPUT; \
|
||||
break; \
|
||||
} \
|
||||
++*irreversible; \
|
||||
} \
|
||||
} \
|
||||
else \
|
||||
{ \
|
||||
if (__builtin_expect (outptr + 1 > outend, 0)) \
|
||||
{ \
|
||||
result = __GCONV_FULL_OUTPUT; \
|
||||
break; \
|
||||
} \
|
||||
if (ch == 0x5c) \
|
||||
*outptr++ = 0x5c; \
|
||||
else if (ch == 0x7e) \
|
||||
*outptr++ = 0x7e; \
|
||||
else \
|
||||
*outptr++ = sc; \
|
||||
} \
|
||||
\
|
||||
/* Now that we wrote the output increment the input pointer. */ \
|
||||
inptr += 4; \
|
||||
}
|
||||
#define LOOP_NEED_FLAGS
|
||||
#include <iconv/loop.c>
|
||||
|
||||
/* Now define the toplevel functions. */
|
||||
#include <iconv/skeleton.c>
|
3732
iconvdata/ibm943.h
Normal file
3732
iconvdata/ibm943.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
#! /bin/sh -f
|
||||
# Run available iconv(1) tests.
|
||||
# Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
||||
# This file is part of the GNU C Library.
|
||||
# Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
||||
#
|
||||
@ -51,71 +51,78 @@ fi
|
||||
failed=0
|
||||
while read from to subset targets; do
|
||||
# Ignore empty and comment lines.
|
||||
if test -z "$targets" || test "$from" = '#'; then continue; fi
|
||||
if test -z "$subset" || test "$from" = '#'; then continue; fi
|
||||
|
||||
# Expand the variables now.
|
||||
PROG=`eval echo $ICONV`
|
||||
|
||||
for t in $targets; do
|
||||
echo $ac_n "test data: $from -> $t $ac_c"
|
||||
$PROG -f $from -t $t testdata/$from > $temp1 ||
|
||||
{ if test $? -gt 128; then exit 1; fi
|
||||
echo "FAILED"
|
||||
failed=1
|
||||
continue
|
||||
}
|
||||
echo $ac_n "OK$ac_c"
|
||||
if test -s testdata/$from..$t; then
|
||||
cmp $temp1 testdata/$from..$t > /dev/null 2>&1 ||
|
||||
{ echo "/FAILED"; failed=1; continue; }
|
||||
echo $ac_n "/OK$ac_c"
|
||||
fi
|
||||
echo $ac_n " -> $from $ac_c"
|
||||
$PROG -f $t -t $to -o $temp2 $temp1 ||
|
||||
{ if test $? -gt 128; then exit 1; fi
|
||||
echo "FAILED"
|
||||
failed=1
|
||||
continue
|
||||
}
|
||||
echo $ac_n "OK$ac_c"
|
||||
test -s $temp1 && cmp testdata/$from $temp2 > /dev/null 2>&1 ||
|
||||
{ echo "/FAILED"; failed=1; continue; }
|
||||
echo "/OK"
|
||||
rm -f $temp1 $temp2
|
||||
if test -n "$targets"; then
|
||||
for t in $targets; do
|
||||
if test -f testdata/$from; then
|
||||
echo $ac_n "test data: $from -> $t $ac_c"
|
||||
$PROG -f $from -t $t testdata/$from > $temp1 ||
|
||||
{ if test $? -gt 128; then exit 1; fi
|
||||
echo "FAILED"
|
||||
failed=1
|
||||
continue
|
||||
}
|
||||
echo $ac_n "OK$ac_c"
|
||||
if test -s testdata/$from..$t; then
|
||||
cmp $temp1 testdata/$from..$t > /dev/null 2>&1 ||
|
||||
{ echo "/FAILED"; failed=1; continue; }
|
||||
echo $ac_n "/OK$ac_c"
|
||||
fi
|
||||
echo $ac_n " -> $from $ac_c"
|
||||
$PROG -f $t -t $to -o $temp2 $temp1 ||
|
||||
{ if test $? -gt 128; then exit 1; fi
|
||||
echo "FAILED"
|
||||
failed=1
|
||||
continue
|
||||
}
|
||||
echo $ac_n "OK$ac_c"
|
||||
test -s $temp1 && cmp testdata/$from $temp2 > /dev/null 2>&1 ||
|
||||
{ echo "/FAILED"; failed=1; continue; }
|
||||
echo "/OK"
|
||||
rm -f $temp1 $temp2
|
||||
fi
|
||||
|
||||
# Now test some bigger text, entirely in ASCII. If ASCII is no subset
|
||||
# of the coded character set we convert the text to this coded character
|
||||
# set. Otherwise we convert to all the TARGETS.
|
||||
if test $subset = Y; then
|
||||
echo $ac_n " suntzu: $from -> $t -> $to $ac_c"
|
||||
$PROG -f $from -t $t testdata/suntzus |
|
||||
$PROG -f $t -t $to > $temp1 ||
|
||||
{ if test $? -gt 128; then exit 1; fi
|
||||
echo "FAILED"
|
||||
failed=1
|
||||
continue
|
||||
}
|
||||
echo $ac_n "OK$ac_c"
|
||||
cmp testdata/suntzus $temp1 ||
|
||||
{ echo "/FAILED";
|
||||
failed=1; continue; }
|
||||
else
|
||||
echo $ac_n " suntzu: ASCII -> $to -> ASCII $ac_c"
|
||||
$PROG -f ASCII -t $to testdata/suntzus |
|
||||
$PROG -f $to -t ASCII > $temp1 ||
|
||||
{ if test $? -gt 128; then exit 1; fi
|
||||
echo "FAILED"
|
||||
failed=1
|
||||
continue
|
||||
}
|
||||
echo $ac_n "OK$ac_c"
|
||||
cmp testdata/suntzus $temp1 ||
|
||||
{ echo "/FAILED";
|
||||
failed=1; continue; }
|
||||
fi
|
||||
# Now test some bigger text, entirely in ASCII. If ASCII is no subset
|
||||
# of the coded character set we convert the text to this coded character
|
||||
# set. Otherwise we convert to all the TARGETS.
|
||||
if test $subset = Y; then
|
||||
echo $ac_n " suntzu: $from -> $t -> $to $ac_c"
|
||||
$PROG -f $from -t $t testdata/suntzus |
|
||||
$PROG -f $t -t $to > $temp1 ||
|
||||
{ if test $? -gt 128; then exit 1; fi
|
||||
echo "FAILED"
|
||||
failed=1
|
||||
continue
|
||||
}
|
||||
echo $ac_n "OK$ac_c"
|
||||
cmp testdata/suntzus $temp1 ||
|
||||
{ echo "/FAILED";
|
||||
failed=1; continue; }
|
||||
echo "/OK"
|
||||
fi
|
||||
rm -f $temp1
|
||||
done
|
||||
fi
|
||||
|
||||
if test "$subset" != Y; then
|
||||
echo $ac_n " suntzu: ASCII -> $to -> ASCII $ac_c"
|
||||
$PROG -f ASCII -t $to testdata/suntzus |
|
||||
$PROG -f $to -t ASCII > $temp1 ||
|
||||
{ if test $? -gt 128; then exit 1; fi
|
||||
echo "FAILED"
|
||||
failed=1
|
||||
continue
|
||||
}
|
||||
echo $ac_n "OK$ac_c"
|
||||
cmp testdata/suntzus $temp1 ||
|
||||
{ echo "/FAILED";
|
||||
failed=1; continue; }
|
||||
echo "/OK"
|
||||
rm -f $temp1
|
||||
done
|
||||
fi
|
||||
done < TESTS
|
||||
|
||||
exit $failed
|
||||
|
Loading…
Reference in New Issue
Block a user