mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +00:00
d620426811
2000-06-19 Ulrich Drepper <drepper@redhat.com> * iconv/gconv.h (__gconv_trans_fct): Add new parameter. General namespace cleanup. (struct __gconv_trans_data): Add next field. (struct __gconv_step_data): Make __trans a pointer. * iconv/gconv_conf.c: Split out code to find gconv directories from __gconv_read_conf in new functions. * iconv/gconv_int.h: Define new data structure and declare new functions for handling of gconv directory list. * iconv/gconv_open.c: Allow more than one error handling step being used. Call function to load error handling module if it is none of the builtin transformations. * iconv/gconv_close.c: Add code to free transliteration data. * iconv/gconv_trans.c: Add functions to load and unload modules implementing transliteration etc. * iconv/skeleton.c: Call all context functions now that more than one module is allowed. * iconv/loop.c (STANDARD_ERR_HANDLING): New macro. * iconv/gconv_simple.c: Use STANDARD_ERR_HANDLING macro for places where the full error handling using transliteration is needed. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/big5hkscs.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gbgbk.c: Likewise. * iconvdata/gbk.c: Likewise. * iconvdata/iso-2022-cn.c: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * iconvdata/unicode.c: Likewise. * iconvdata/utf-16.c: Likewise. * libio/iofwide.c: Reset __trans member of __gconv_trans_data structure correctly after last change. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * localedata/Makefile: Set -Wno-format for some files since gcc does not know all the format specifiers. 2000-06-18 Ulrich Drepper <drepper@redhat.com> * locale/loadlocale.c (_nl_unload_locale): Remove a bit of unneeded code. * locale/lc-time.c (_nl_init_era_entries): Likewise.
157 lines
5.8 KiB
C
157 lines
5.8 KiB
C
/* Mapping tables from GBK to GB2312 and vice versa.
|
|
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.
|
|
|
|
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 <dlfcn.h>
|
|
#include <gconv.h>
|
|
#include <stdint.h>
|
|
|
|
|
|
/* Definitions used in the body of the `gconv' function. */
|
|
#define CHARSET_NAME "GBK//"
|
|
#define FROM_LOOP from_gbk_to_gb
|
|
#define TO_LOOP from_gb_to_gbk
|
|
#define DEFINE_INIT 1
|
|
#define DEFINE_FINI 1
|
|
#define MIN_NEEDED_FROM 1
|
|
#define MAX_NEEDED_FROM 2
|
|
#define MIN_NEEDED_TO 1
|
|
#define MAX_NEEDED_TO 2
|
|
|
|
|
|
/* First define the conversion function from GBK to GB2312. */
|
|
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
|
|
#define MAX_NEEDED_INPUT MAX_NEEDED_FROM
|
|
#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO
|
|
#define MAX_NEEDED_OUTPUT MAX_NEEDED_TO
|
|
#define LOOPFCT FROM_LOOP
|
|
#define BODY \
|
|
{ \
|
|
uint32_t ch = *inptr; \
|
|
\
|
|
if (ch <= 0x7f) \
|
|
*outptr++ = *inptr++; \
|
|
else \
|
|
{ \
|
|
/* It's a two-byte sequence. We have to mask out all the sequences \
|
|
which are not in GB2312. Besides all of them in the range \
|
|
0x8140 to 0xA0FE this also includes in the remaining range the \
|
|
sequences which the second byte being in the range from 0x40 to \
|
|
0xA0 and the following exceptions: \
|
|
\
|
|
0xA2A1 to 0xA2A9, \
|
|
0xA2AA, \
|
|
0xA6E0 to 0xA6EB, \
|
|
0xA6EE to 0xA6F2, \
|
|
0xA6F4, 0xA6F5, \
|
|
0xA8BB to 0xA8C0 \
|
|
\
|
|
All these characters are not defined in GB2312. Besides this \
|
|
there is an incomatibility in the mapping. The Unicode tables \
|
|
say that 0xA1A4 maps in GB2312 to U30FB while in GBK it maps to \
|
|
U00B7. Since we are free to do whatever we want if a mapping \
|
|
is not available we will not flag this as an error but instead \
|
|
map the two positions. But this means that the mapping \
|
|
\
|
|
UCS4 -> GB2312 -> GBK -> UCS4 \
|
|
\
|
|
might not produce identical text. */ \
|
|
if (__builtin_expect (inptr + 1 >= inend, 0)) \
|
|
{ \
|
|
/* The second character is not available. Store \
|
|
the intermediate result. */ \
|
|
result = __GCONV_INCOMPLETE_INPUT; \
|
|
break; \
|
|
} \
|
|
\
|
|
if (__builtin_expect (outend - outptr < 2, 0)) \
|
|
{ \
|
|
/* We ran out of space. */ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
\
|
|
ch = (ch << 8) | inptr[1]; \
|
|
\
|
|
/* Now determine whether the character is valid. */ \
|
|
if (__builtin_expect (ch, 0xa1a1) < 0xa1a1 \
|
|
|| __builtin_expect (ch, 0xa1a1) > 0xf7fe \
|
|
|| __builtin_expect (inptr[1], 0xa1) < 0xa1 \
|
|
/* Now test the exceptions. */ \
|
|
|| (__builtin_expect (ch, 0xa1a1) >= 0xa2a1 \
|
|
&& __builtin_expect (ch, 0xa1a1) <= 0xa2aa) \
|
|
|| (__builtin_expect (ch, 0xa1a1) >= 0xa6e0 \
|
|
&& __builtin_expect (ch, 0xa1a1) <= 0xa6f5) \
|
|
|| (__builtin_expect (ch, 0xa1a1) >= 0xa8bb \
|
|
&& __builtin_expect (ch, 0xa1a1) <= 0xa8c0)) \
|
|
{ \
|
|
/* One of the characters we cannot map. */ \
|
|
STANDARD_ERR_HANDLER (2); \
|
|
} \
|
|
\
|
|
/* Copy the two bytes. */ \
|
|
*outptr++ = *inptr++; \
|
|
*outptr++ = *inptr++; \
|
|
} \
|
|
}
|
|
#define LOOP_NEED_FLAGS
|
|
#include <iconv/loop.c>
|
|
|
|
|
|
/* Next, define the other direction. */
|
|
#define MIN_NEEDED_INPUT MIN_NEEDED_TO
|
|
#define MAX_NEEDED_INPUT MAX_NEEDED_TO
|
|
#define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM
|
|
#define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM
|
|
#define LOOPFCT TO_LOOP
|
|
#define BODY \
|
|
{ \
|
|
/* We don't have to care about characters we cannot map. The only \
|
|
problem is the mapping of 0xA1A4 but as explained above we do not \
|
|
do anything special here. */ \
|
|
unsigned char ch = *inptr++; \
|
|
\
|
|
if (ch > 0x7f) \
|
|
{ \
|
|
if (__builtin_expect (inptr + 1 >= inend, 0)) \
|
|
{ \
|
|
/* The second character is not available. Store \
|
|
the intermediate result. */ \
|
|
result = __GCONV_INCOMPLETE_INPUT; \
|
|
break; \
|
|
} \
|
|
\
|
|
if (__builtin_expect (outend - outptr < 2, 0)) \
|
|
{ \
|
|
/* We ran out of space. */ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
\
|
|
*outptr++ = ch; \
|
|
ch = *inptr++; \
|
|
} \
|
|
*outptr++ = ch; \
|
|
}
|
|
#include <iconv/loop.c>
|
|
|
|
|
|
/* Now define the toplevel functions. */
|
|
#include <iconv/skeleton.c>
|