mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 22:10:13 +00:00
2373b30ea8
2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconvdata/cp1255.c: Completely rewritten. * iconvdata/Makefile (gen-8bit-gap-modules): Remove cp1255. * iconvdata/testdata/WINDOWS-1255: New file. * iconvdata/testdata/WINDOWS-1255..UTF8: New file. * iconvdata/TESTS: Add WINDOWS-1255 test. * iconvdata/CP1255.irreversible: New file. 2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconvdata/cp1258.c: Completely rewritten. * iconvdata/Makefile (gen-8bit-gap-modules): Remove cp1258. * iconvdata/testdata/WINDOWS-1258: New file. * iconvdata/testdata/WINDOWS-1258..UTF8: New file. * iconvdata/TESTS: Add WINDOWS-1258 test. * iconvdata/tst-table-from.c (try): Reset the iconv descriptor before the main call, and flush it afterwards. (utf8_decode): Return a string, possibly containing several Unicode characters. (main): Update all utf8_decode calls. * iconvdata/CP1258.irreversible: New file. 2001-05-20 Bruno Haible <haible@clisp.cons.org> * iconv/gconv.c (__gconv): For flush without output, pass do_flush = 2. * iconv/skeleton.c: Distinguish do_flush = 1 and do_flush = 2. In the first case, set outbuf, outstart, outend, and call PREPARE_LOOP before EMIT_SHIFT_TO_INIT; then pass the output produced by this step down to the next step. In the second case, clear the state without calling EMIT_SHIFT_TO_INIT. * iconvdata/ibm930.c (EMIT_SHIFT_TO_INIT): Use outbuf instead of data->__outbuf, and outend instead of data->__outbufend. * iconvdata/ibm933.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm935.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm937.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/ibm939.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-cn.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-cn-ext.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-jp.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/iso-2022-kr.c (EMIT_SHIFT_TO_INIT): Likewise. * iconvdata/utf-7.c (EMIT_SHIFT_TO_INIT): Likewise. 2001-05-21 Jakub Jelinek <jakub@redhat.com> * elf/rtld.c (dl_main): Compute l_map_end for the main program. * elf/dl-sym.c (_dl_sym): Don't check for l_addr == 0. If match == _dl_loaded, caller can still come from the main program. (_dl_vsym): Likewise. * elf/dl-open.c (dl_open_worker): Don't check for l_addr == 0. * elf/dl-error.c (_dl_signal_error): Change NULL objname into "". * elf/restest2.c: New test. * elf/Makefile (tests): Add restest2. (restest2, LDFLAGS-restest2): Add rules.
296 lines
9.5 KiB
C
296 lines
9.5 KiB
C
/* Conversion from and to IBM933.
|
|
Copyright (C) 2000, 2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 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 <dlfcn.h>
|
|
#include <stdint.h>
|
|
#include <wchar.h>
|
|
#include <byteswap.h>
|
|
#include "ibm933.h"
|
|
|
|
/* The shift sequences for this charset (it does not use ESC). */
|
|
#define SI 0x0F /* Shift In, host code to turn DBCS off. */
|
|
#define SO 0x0E /* Shift Out, host code to turn DBCS on. */
|
|
|
|
/* Definitions used in the body of the `gconv' function. */
|
|
#define CHARSET_NAME "IBM933//"
|
|
#define FROM_LOOP from_ibm933
|
|
#define TO_LOOP to_ibm933
|
|
#define MIN_NEEDED_FROM 1
|
|
#define MAX_NEEDED_FROM 2
|
|
#define MIN_NEEDED_TO 4
|
|
#define MAX_NEEDED_TO 4
|
|
#define PREPARE_LOOP \
|
|
int save_curcs; \
|
|
int *curcsp = &data->__statep->__count;
|
|
#define EXTRA_LOOP_ARGS , curcsp
|
|
|
|
/* Definitions of initialization and destructor function. */
|
|
#define DEFINE_INIT 1
|
|
#define DEFINE_FINI 1
|
|
|
|
|
|
/* Since this is a stateful encoding we have to provide code which resets
|
|
the output state to the initial state. This has to be done during the
|
|
flushing. */
|
|
#define EMIT_SHIFT_TO_INIT \
|
|
if ((data->__statep->__count & ~7) != sb) \
|
|
{ \
|
|
if (FROM_DIRECTION) \
|
|
data->__statep->__count &= 7; \
|
|
else \
|
|
{ \
|
|
/* We are not in the initial state. To switch back we have \
|
|
to emit `SI'. */ \
|
|
if (__builtin_expect (outbuf >= outend, 0)) \
|
|
/* We don't have enough room in the output buffer. */ \
|
|
status = __GCONV_FULL_OUTPUT; \
|
|
else \
|
|
{ \
|
|
/* Write out the shift sequence. */ \
|
|
*outbuf++ = SI; \
|
|
data->__statep->__count &= 7; \
|
|
} \
|
|
} \
|
|
}
|
|
|
|
|
|
/* Since we might have to reset input pointer we must be able to save
|
|
and retore the state. */
|
|
#define SAVE_RESET_STATE(Save) \
|
|
if (Save) \
|
|
save_curcs = *curcsp; \
|
|
else \
|
|
*curcsp = save_curcs
|
|
|
|
|
|
/* Current codeset type. */
|
|
enum
|
|
{
|
|
sb = 0,
|
|
db = 64
|
|
};
|
|
|
|
/* First, define the conversion function from IBM-933 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 \
|
|
{ \
|
|
uint32_t ch = *inptr; \
|
|
uint32_t res; \
|
|
\
|
|
if (__builtin_expect (ch, 0) == SO) \
|
|
{ \
|
|
/* Shift OUT, change to DBCS converter. */ \
|
|
if (curcs == db) \
|
|
{ \
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
break; \
|
|
} \
|
|
curcs = db; \
|
|
++inptr; \
|
|
continue; \
|
|
} \
|
|
else if (__builtin_expect (ch, 0) == SI) \
|
|
{ \
|
|
/* Shift IN, change to SBCS converter. */ \
|
|
if (curcs == sb) \
|
|
{ \
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
break; \
|
|
} \
|
|
curcs = sb; \
|
|
++inptr; \
|
|
continue; \
|
|
} \
|
|
\
|
|
if (curcs == sb) \
|
|
{ \
|
|
/* Use the IBM933 table for single byte. */ \
|
|
res = __ibm933sb_to_ucs4[ch]; \
|
|
if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0') \
|
|
{ \
|
|
/* This is an illegal character. */ \
|
|
if (! ignore_errors_p ()) \
|
|
{ \
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
break; \
|
|
} \
|
|
++*irreversible; \
|
|
} \
|
|
else \
|
|
{ \
|
|
put32 (outptr, res); \
|
|
outptr += 4; \
|
|
} \
|
|
++inptr; \
|
|
} \
|
|
else \
|
|
{ \
|
|
const struct gap *rp2 = __ibm933db_to_ucs4_idx; \
|
|
\
|
|
assert (curcs == db); \
|
|
\
|
|
/* Use the IBM933 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 = __ibm933db_to_ucs4[ch + rp2->idx], \
|
|
__builtin_expect (res, L'\1') == L'\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; \
|
|
} \
|
|
} \
|
|
}
|
|
#define LOOP_NEED_FLAGS
|
|
#define EXTRA_LOOP_DECLS , int *curcsp
|
|
#define INIT_PARAMS int curcs = *curcsp & ~7
|
|
#define UPDATE_PARAMS *curcsp = curcs
|
|
#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 \
|
|
{ \
|
|
uint32_t ch = get32 (inptr); \
|
|
const struct gap *rp1 = __ucs4_to_ibm933sb_idx; \
|
|
const struct gap *rp2 = __ucs4_to_ibm933db_idx; \
|
|
const char *cp; \
|
|
\
|
|
if (__builtin_expect (ch, 0) >= 0xffff) \
|
|
{ \
|
|
if (! ignore_errors_p ()) \
|
|
{ \
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
break; \
|
|
} \
|
|
++*irreversible; \
|
|
inptr += 4; \
|
|
continue; \
|
|
} \
|
|
\
|
|
while (ch > rp1->end) \
|
|
++rp1; \
|
|
\
|
|
/* Use the UCS4 table for single byte. */ \
|
|
if (__builtin_expect (ch < rp1->start, 0) \
|
|
|| (cp = __ucs4_to_ibm933sb[ch + rp1->idx], \
|
|
__builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \
|
|
{ \
|
|
/* Use the UCS4 table for double byte. */ \
|
|
while (ch > rp2->end) \
|
|
++rp2; \
|
|
\
|
|
if (__builtin_expect (ch < rp2->start, 0) \
|
|
|| (cp = __ucs4_to_ibm933db[ch + rp2->idx], \
|
|
__builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \
|
|
{ \
|
|
/* This is an illegal character. */ \
|
|
if (! ignore_errors_p ()) \
|
|
{ \
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
break; \
|
|
} \
|
|
++*irreversible; \
|
|
} \
|
|
else \
|
|
{ \
|
|
if (curcs == sb) \
|
|
{ \
|
|
if (__builtin_expect (outptr+1 > outend, 0)) \
|
|
{ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
*outptr++ = SO; \
|
|
curcs = db; \
|
|
} \
|
|
\
|
|
if (__builtin_expect (outptr + 2 > outend, 0)) \
|
|
{ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
*outptr++ = cp[0]; \
|
|
*outptr++ = cp[1]; \
|
|
} \
|
|
} \
|
|
else \
|
|
{ \
|
|
if (curcs == db) \
|
|
{ \
|
|
if (__builtin_expect (outptr + 1 > outend, 0)) \
|
|
{ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
*outptr++ = SI; \
|
|
} \
|
|
\
|
|
if (__builtin_expect (outptr + 1 > outend, 0)) \
|
|
{ \
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
break; \
|
|
} \
|
|
*outptr++ = cp[0]; \
|
|
curcs = sb; \
|
|
} \
|
|
\
|
|
/* Now that we wrote the output increment the input pointer. */ \
|
|
inptr += 4; \
|
|
}
|
|
#define LOOP_NEED_FLAGS
|
|
#define EXTRA_LOOP_DECLS , int *curcsp
|
|
#define INIT_PARAMS int curcs = *curcsp & ~7
|
|
#define UPDATE_PARAMS *curcsp = curcs
|
|
#include <iconv/loop.c>
|
|
|
|
/* Now define the toplevel functions. */
|
|
#include <iconv/skeleton.c>
|