2000-09-13 09:12:02 +00:00
|
|
|
/* Conversion module for ISO-2022-CN-EXT.
|
2008-01-09 20:03:58 +00:00
|
|
|
Copyright (C) 2000-2002, 2004, 2007, 2008 Free Software Foundation, Inc.
|
2000-09-13 09:12:02 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
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.
|
2000-09-13 09:12:02 +00:00
|
|
|
|
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
2000-09-13 09:12:02 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
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. */
|
2000-09-13 09:12:02 +00:00
|
|
|
|
|
|
|
#include <dlfcn.h>
|
|
|
|
#include <gconv.h>
|
|
|
|
#include <stdint.h>
|
2001-06-01 21:08:25 +00:00
|
|
|
#include <stdlib.h>
|
2000-09-13 09:12:02 +00:00
|
|
|
#include <string.h>
|
|
|
|
#include "gb2312.h"
|
|
|
|
#include "iso-ir-165.h"
|
2000-09-18 22:41:47 +00:00
|
|
|
#include "cns11643.h"
|
2000-09-13 09:12:02 +00:00
|
|
|
#include "cns11643l1.h"
|
|
|
|
#include "cns11643l2.h"
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
/* This makes obvious what everybody knows: 0x1b is the Esc character. */
|
|
|
|
#define ESC 0x1b
|
|
|
|
|
|
|
|
/* We have single-byte shift-in and shift-out sequences, and the single
|
|
|
|
shift sequences SS2 and SS3 which replaces the SS2/SS3 designation for
|
|
|
|
the next two bytes. */
|
|
|
|
#define SI 0x0f
|
|
|
|
#define SO 0x0e
|
|
|
|
#define SS2_0 ESC
|
|
|
|
#define SS2_1 0x4e
|
|
|
|
#define SS3_0 ESC
|
|
|
|
#define SS3_1 0x4f
|
|
|
|
|
|
|
|
/* Definitions used in the body of the `gconv' function. */
|
|
|
|
#define CHARSET_NAME "ISO-2022-CN-EXT//"
|
|
|
|
#define DEFINE_INIT 1
|
|
|
|
#define DEFINE_FINI 1
|
|
|
|
#define FROM_LOOP from_iso2022cn_ext_loop
|
|
|
|
#define TO_LOOP to_iso2022cn_ext_loop
|
Update.
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>.
2002-05-15 06:02:35 +00:00
|
|
|
#define FROM_LOOP_MIN_NEEDED_FROM 1
|
|
|
|
#define FROM_LOOP_MAX_NEEDED_FROM 4
|
|
|
|
#define FROM_LOOP_MIN_NEEDED_TO 4
|
|
|
|
#define FROM_LOOP_MAX_NEEDED_TO 4
|
|
|
|
#define TO_LOOP_MIN_NEEDED_FROM 4
|
|
|
|
#define TO_LOOP_MAX_NEEDED_FROM 4
|
|
|
|
#define TO_LOOP_MIN_NEEDED_TO 1
|
|
|
|
#define TO_LOOP_MAX_NEEDED_TO 6
|
2000-09-13 09:12:02 +00:00
|
|
|
#define PREPARE_LOOP \
|
|
|
|
int save_set; \
|
|
|
|
int *setp = &data->__statep->__count;
|
|
|
|
#define EXTRA_LOOP_ARGS , setp
|
|
|
|
|
|
|
|
|
|
|
|
/* The charsets GB/T 12345-90, GB 7589-87, GB/T 13131-9X, GB 7590-87,
|
|
|
|
and GB/T 13132-9X are not registered to the best of my knowledge and
|
|
|
|
therefore have no escape sequence assigned. We cannot handle them
|
|
|
|
for this reason. Tell the implementation about this. */
|
|
|
|
#define X12345 '\0'
|
|
|
|
#define X7589 '\0'
|
|
|
|
#define X13131 '\0'
|
|
|
|
#define X7590 '\0'
|
|
|
|
#define X13132 '\0'
|
|
|
|
|
|
|
|
|
|
|
|
/* The COUNT element of the state keeps track of the currently selected
|
|
|
|
character set. The possible values are: */
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
ASCII_set = 0,
|
|
|
|
GB2312_set,
|
|
|
|
GB12345_set,
|
|
|
|
CNS11643_1_set,
|
|
|
|
ISO_IR_165_set,
|
|
|
|
SO_mask = 7,
|
|
|
|
|
2000-09-18 22:41:47 +00:00
|
|
|
GB7589_set = 1 << 3,
|
|
|
|
GB13131_set = 2 << 3,
|
|
|
|
CNS11643_2_set = 3 << 3,
|
|
|
|
SS2_mask = 3 << 3,
|
2000-09-13 09:12:02 +00:00
|
|
|
|
2000-09-18 22:41:47 +00:00
|
|
|
GB7590_set = 1 << 5,
|
|
|
|
GB13132_set = 2 << 5,
|
|
|
|
CNS11643_3_set = 3 << 5,
|
|
|
|
CNS11643_4_set = 4 << 5,
|
|
|
|
CNS11643_5_set = 5 << 5,
|
|
|
|
CNS11643_6_set = 6 << 5,
|
|
|
|
CNS11643_7_set = 7 << 5,
|
|
|
|
SS3_mask = 7 << 5,
|
2000-09-13 09:12:02 +00:00
|
|
|
|
|
|
|
#define CURRENT_MASK (SO_mask | SS2_mask | SS3_mask)
|
|
|
|
|
2000-09-18 22:41:47 +00:00
|
|
|
GB2312_ann = 1 << 8,
|
|
|
|
GB12345_ann = 2 << 8,
|
|
|
|
CNS11643_1_ann = 3 << 8,
|
|
|
|
ISO_IR_165_ann = 4 << 8,
|
|
|
|
SO_ann = 7 << 8,
|
2000-09-13 09:12:02 +00:00
|
|
|
|
2000-09-18 22:41:47 +00:00
|
|
|
GB7589_ann = 1 << 11,
|
|
|
|
GB13131_ann = 2 << 11,
|
|
|
|
CNS11643_2_ann = 3 << 11,
|
|
|
|
SS2_ann = 3 << 11,
|
2000-09-13 09:12:02 +00:00
|
|
|
|
2000-09-18 22:41:47 +00:00
|
|
|
GB7590_ann = 1 << 13,
|
|
|
|
GB13132_ann = 2 << 13,
|
|
|
|
CNS11643_3_ann = 3 << 13,
|
|
|
|
CNS11643_4_ann = 4 << 13,
|
|
|
|
CNS11643_5_ann = 5 << 13,
|
|
|
|
CNS11643_6_ann = 6 << 13,
|
|
|
|
CNS11643_7_ann = 7 << 13,
|
|
|
|
SS3_ann = 7 << 13
|
2000-09-13 09:12:02 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* 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 \
|
2000-09-25 05:12:05 +00:00
|
|
|
if (data->__statep->__count >> 3 != ASCII_set) \
|
2000-09-13 09:12:02 +00:00
|
|
|
{ \
|
|
|
|
if (FROM_DIRECTION) \
|
|
|
|
/* It's easy, we don't have to emit anything, we just reset the \
|
|
|
|
state for the input. */ \
|
2000-09-25 05:12:05 +00:00
|
|
|
data->__statep->__count = ASCII_set << 3; \
|
2000-09-13 09:12:02 +00:00
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
/* We are not in the initial state. To switch back we have \
|
|
|
|
to emit `SI'. */ \
|
Update.
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.
2001-05-22 22:30:18 +00:00
|
|
|
if (__builtin_expect (outbuf == outend, 0)) \
|
2000-09-13 09:12:02 +00:00
|
|
|
/* We don't have enough room in the output buffer. */ \
|
|
|
|
status = __GCONV_FULL_OUTPUT; \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
/* Write out the shift sequence. */ \
|
|
|
|
*outbuf++ = SI; \
|
|
|
|
if (data->__flags & __GCONV_IS_LAST) \
|
|
|
|
*irreversible += 1; \
|
2000-09-25 05:12:05 +00:00
|
|
|
data->__statep->__count = ASCII_set << 3; \
|
2000-09-13 09:12:02 +00:00
|
|
|
} \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* 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_set = *setp; \
|
|
|
|
else \
|
|
|
|
*setp = save_set
|
|
|
|
|
|
|
|
|
|
|
|
/* First define the conversion function from ISO-2022-CN to UCS4. */
|
Update.
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>.
2002-05-15 06:02:35 +00:00
|
|
|
#define MIN_NEEDED_INPUT FROM_LOOP_MIN_NEEDED_FROM
|
|
|
|
#define MAX_NEEDED_INPUT FROM_LOOP_MAX_NEEDED_FROM
|
|
|
|
#define MIN_NEEDED_OUTPUT FROM_LOOP_MIN_NEEDED_TO
|
|
|
|
#define MAX_NEEDED_OUTPUT FROM_LOOP_MAX_NEEDED_TO
|
2000-09-13 09:12:02 +00:00
|
|
|
#define LOOPFCT FROM_LOOP
|
|
|
|
#define BODY \
|
|
|
|
{ \
|
|
|
|
uint32_t ch = *inptr; \
|
|
|
|
\
|
|
|
|
/* This is a 7bit character set, disallow all 8bit characters. */ \
|
|
|
|
if (ch > 0x7f) \
|
2002-06-28 21:23:06 +00:00
|
|
|
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
|
2000-09-13 09:12:02 +00:00
|
|
|
\
|
|
|
|
/* Recognize escape sequences. */ \
|
|
|
|
if (ch == ESC) \
|
|
|
|
{ \
|
|
|
|
/* There are three kinds of escape sequences we have to handle: \
|
|
|
|
- those announcing the use of GB and CNS characters on the \
|
|
|
|
line; we can simply ignore them \
|
|
|
|
- the initial byte of the SS2 sequence. \
|
|
|
|
- the initial byte of the SS3 sequence. \
|
|
|
|
*/ \
|
2000-09-18 22:41:47 +00:00
|
|
|
if (inptr + 2 > inend \
|
2000-09-13 09:12:02 +00:00
|
|
|
|| (inptr[1] == '$' \
|
2000-09-18 22:41:47 +00:00
|
|
|
&& (inptr + 3 > inend \
|
|
|
|
|| (inptr[2] == ')' && inptr + 4 > inend) \
|
|
|
|
|| (inptr[2] == '*' && inptr + 4 > inend) \
|
|
|
|
|| (inptr[2] == '+' && inptr + 4 > inend))) \
|
|
|
|
|| (inptr[1] == SS2_1 && inptr + 4 > inend) \
|
|
|
|
|| (inptr[1] == SS3_1 && inptr + 4 > inend)) \
|
2000-09-13 09:12:02 +00:00
|
|
|
{ \
|
2000-09-18 22:41:47 +00:00
|
|
|
result = __GCONV_INCOMPLETE_INPUT; \
|
2000-09-13 09:12:02 +00:00
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
if (inptr[1] == '$' \
|
|
|
|
&& ((inptr[2] == ')' \
|
|
|
|
&& (inptr[3] == 'A' \
|
|
|
|
|| (X12345 != '\0' && inptr[3] == X12345) \
|
|
|
|
|| inptr[3] == 'E' || inptr[3] == 'G')) \
|
|
|
|
|| (inptr[2] == '*' \
|
|
|
|
&& ((X7589 != '\0' && inptr[3] == X7589) \
|
|
|
|
|| (X13131 != '\0' && inptr[3] == X13131) \
|
|
|
|
|| inptr[3] == 'H')) \
|
|
|
|
|| (inptr[2] == '+' \
|
|
|
|
&& ((X7590 != '\0' && inptr[3] == X7590) \
|
|
|
|
|| (X13132 != '\0' && inptr[3] == X13132) \
|
|
|
|
|| inptr[3] == 'I' || inptr[3] == 'J' \
|
|
|
|
|| inptr[3] == 'K' || inptr[3] == 'L' \
|
|
|
|
|| inptr[3] == 'M')))) \
|
|
|
|
{ \
|
|
|
|
/* OK, we accept those character sets. */ \
|
|
|
|
if (inptr[3] == 'A') \
|
|
|
|
ann = (ann & ~SO_ann) | GB2312_ann; \
|
|
|
|
else if (inptr[3] == 'G') \
|
|
|
|
ann = (ann & ~SO_ann) | CNS11643_1_ann; \
|
|
|
|
else if (inptr[3] == 'E') \
|
|
|
|
ann = (ann & ~SO_ann) | ISO_IR_165_ann; \
|
|
|
|
else if (X12345 != '\0' && inptr[3] == X12345) \
|
|
|
|
ann = (ann & ~SO_ann) | GB12345_ann; \
|
|
|
|
else if (inptr[3] == 'H') \
|
|
|
|
ann = (ann & ~SS2_ann) | CNS11643_2_ann; \
|
|
|
|
else if (X7589 != '\0' && inptr[3] == X7589) \
|
|
|
|
ann = (ann & ~SS2_ann) | GB7589_ann; \
|
|
|
|
else if (X13131 != '\0' && inptr[3] == X13131) \
|
|
|
|
ann = (ann & ~SS2_ann) | GB13131_ann; \
|
|
|
|
else if (inptr[3] == 'I') \
|
|
|
|
ann = (ann & ~SS3_ann) | CNS11643_3_ann; \
|
|
|
|
else if (inptr[3] == 'J') \
|
|
|
|
ann = (ann & ~SS3_ann) | CNS11643_4_ann; \
|
|
|
|
else if (inptr[3] == 'K') \
|
|
|
|
ann = (ann & ~SS3_ann) | CNS11643_5_ann; \
|
|
|
|
else if (inptr[3] == 'L') \
|
|
|
|
ann = (ann & ~SS3_ann) | CNS11643_6_ann; \
|
|
|
|
else if (inptr[3] == 'M') \
|
|
|
|
ann = (ann & ~SS3_ann) | CNS11643_7_ann; \
|
|
|
|
else if (X7590 != '\0' && inptr[3] == X7590) \
|
|
|
|
ann = (ann & ~SS3_ann) | GB7590_ann; \
|
|
|
|
else if (X13132 != '\0' && inptr[3] == X13132) \
|
|
|
|
ann = (ann & ~SS3_ann) | GB13132_ann; \
|
|
|
|
inptr += 4; \
|
|
|
|
continue; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
else if (ch == SO) \
|
|
|
|
{ \
|
|
|
|
/* Switch to use GB2312, GB12345, CNS 11643 plane 1, or ISO-IR-165, \
|
|
|
|
depending on which S0 designation came last. The only problem \
|
|
|
|
is what to do with faulty input files where no designator came. \
|
|
|
|
XXX For now I'll default to use GB2312. If this is not the \
|
|
|
|
best behavior (e.g., we should flag an error) let me know. */ \
|
|
|
|
++inptr; \
|
2001-05-17 07:11:00 +00:00
|
|
|
if ((ann & SO_ann) != 0) \
|
|
|
|
switch (ann & SO_ann) \
|
|
|
|
{ \
|
|
|
|
case GB2312_ann: \
|
|
|
|
set = GB2312_set; \
|
|
|
|
break; \
|
|
|
|
case GB12345_ann: \
|
|
|
|
set = GB12345_set; \
|
|
|
|
break; \
|
|
|
|
case CNS11643_1_ann: \
|
|
|
|
set = CNS11643_1_set; \
|
|
|
|
break; \
|
|
|
|
case ISO_IR_165_ann: \
|
|
|
|
set = ISO_IR_165_set; \
|
|
|
|
break; \
|
|
|
|
default: \
|
|
|
|
abort (); \
|
|
|
|
} \
|
|
|
|
else \
|
2000-09-13 09:12:02 +00:00
|
|
|
{ \
|
2002-06-28 21:23:06 +00:00
|
|
|
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
|
2000-09-13 09:12:02 +00:00
|
|
|
} \
|
|
|
|
continue; \
|
|
|
|
} \
|
|
|
|
else if (ch == SI) \
|
|
|
|
{ \
|
|
|
|
/* Switch to use ASCII. */ \
|
|
|
|
++inptr; \
|
|
|
|
set = ASCII_set; \
|
|
|
|
continue; \
|
|
|
|
} \
|
|
|
|
\
|
2000-09-18 22:41:47 +00:00
|
|
|
if (ch == ESC && inptr[1] == SS2_1) \
|
2000-09-13 09:12:02 +00:00
|
|
|
{ \
|
|
|
|
/* This is a character from CNS 11643 plane 2. \
|
|
|
|
XXX We could test here whether the use of this character \
|
|
|
|
set was announced. \
|
2001-06-06 14:01:54 +00:00
|
|
|
XXX Currently GB7589 and GB13131 are not supported. */ \
|
2000-09-13 09:12:02 +00:00
|
|
|
inptr += 2; \
|
|
|
|
ch = cns11643l2_to_ucs4 (&inptr, 2, 0); \
|
|
|
|
if (ch == __UNKNOWN_10646_CHAR) \
|
2002-06-28 21:23:06 +00:00
|
|
|
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
|
2000-09-13 09:12:02 +00:00
|
|
|
} \
|
2000-09-18 22:41:47 +00:00
|
|
|
/* Note that we can assume here that at least 4 bytes are available if \
|
2000-09-13 09:12:02 +00:00
|
|
|
the first byte is ESC since otherwise the first if would have been \
|
|
|
|
true. */ \
|
|
|
|
else if (ch == ESC && inptr[1] == SS3_1) \
|
|
|
|
{ \
|
|
|
|
/* This is a character from CNS 11643 plane 3 or higher. \
|
2000-09-18 22:41:47 +00:00
|
|
|
XXX Currently GB7590 and GB13132 are not supported. */ \
|
2007-07-28 20:16:07 +00:00
|
|
|
unsigned char buf[3]; \
|
|
|
|
const unsigned char *tmp = buf; \
|
2000-09-18 22:41:47 +00:00
|
|
|
\
|
|
|
|
buf[1] = inptr[2]; \
|
|
|
|
buf[2] = inptr[3]; \
|
|
|
|
switch (ann & SS3_ann) \
|
2000-09-13 09:12:02 +00:00
|
|
|
{ \
|
2000-09-18 22:41:47 +00:00
|
|
|
case CNS11643_3_ann: \
|
2001-06-06 14:01:54 +00:00
|
|
|
buf[0] = 0x23; \
|
|
|
|
ch = cns11643_to_ucs4 (&tmp, 3, 0); \
|
|
|
|
break; \
|
|
|
|
case CNS11643_4_ann: \
|
|
|
|
buf[0] = 0x24; \
|
|
|
|
ch = cns11643_to_ucs4 (&tmp, 3, 0); \
|
|
|
|
break; \
|
|
|
|
case CNS11643_5_ann: \
|
|
|
|
buf[0] = 0x25; \
|
|
|
|
ch = cns11643_to_ucs4 (&tmp, 3, 0); \
|
|
|
|
break; \
|
|
|
|
case CNS11643_6_ann: \
|
|
|
|
buf[0] = 0x26; \
|
|
|
|
ch = cns11643_to_ucs4 (&tmp, 3, 0); \
|
|
|
|
break; \
|
|
|
|
case CNS11643_7_ann: \
|
|
|
|
buf[0] = 0x27; \
|
|
|
|
ch = cns11643_to_ucs4 (&tmp, 3, 0); \
|
2000-09-18 22:41:47 +00:00
|
|
|
break; \
|
|
|
|
default: \
|
2001-06-06 14:01:54 +00:00
|
|
|
/* XXX Currently GB7590 and GB13132 are not supported. */ \
|
2000-09-18 22:41:47 +00:00
|
|
|
ch = __UNKNOWN_10646_CHAR; \
|
2000-09-13 09:12:02 +00:00
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
if (ch == __UNKNOWN_10646_CHAR) \
|
|
|
|
{ \
|
2002-06-28 21:23:06 +00:00
|
|
|
STANDARD_FROM_LOOP_ERR_HANDLER (4); \
|
2000-09-13 09:12:02 +00:00
|
|
|
} \
|
2000-09-18 22:41:47 +00:00
|
|
|
assert (tmp == buf + 3); \
|
|
|
|
inptr += 4; \
|
2000-09-13 09:12:02 +00:00
|
|
|
} \
|
|
|
|
else if (set == ASCII_set) \
|
|
|
|
{ \
|
|
|
|
/* Almost done, just advance the input pointer. */ \
|
|
|
|
++inptr; \
|
|
|
|
} \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
/* That's pretty easy, we have a dedicated functions for this. */ \
|
|
|
|
if (inend - inptr < 2) \
|
|
|
|
{ \
|
|
|
|
result = __GCONV_INCOMPLETE_INPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
if (set == GB2312_set) \
|
|
|
|
ch = gb2312_to_ucs4 (&inptr, inend - inptr, 0); \
|
|
|
|
else if (set == ISO_IR_165_set) \
|
|
|
|
ch = isoir165_to_ucs4 (&inptr, inend - inptr); \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
assert (set == CNS11643_1_set); \
|
|
|
|
ch = cns11643l1_to_ucs4 (&inptr, inend - inptr, 0); \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
if (ch == 0) \
|
|
|
|
{ \
|
2000-09-18 22:41:47 +00:00
|
|
|
result = __GCONV_INCOMPLETE_INPUT; \
|
2000-09-13 09:12:02 +00:00
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
else if (ch == __UNKNOWN_10646_CHAR) \
|
|
|
|
{ \
|
2002-06-28 21:23:06 +00:00
|
|
|
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
|
2000-09-13 09:12:02 +00:00
|
|
|
} \
|
|
|
|
} \
|
|
|
|
\
|
2004-03-07 09:33:54 +00:00
|
|
|
*((uint32_t *) outptr) = ch; \
|
|
|
|
outptr += sizeof (uint32_t); \
|
2000-09-13 09:12:02 +00:00
|
|
|
}
|
|
|
|
#define EXTRA_LOOP_DECLS , int *setp
|
2000-09-25 05:12:05 +00:00
|
|
|
#define INIT_PARAMS int set = (*setp >> 3) & CURRENT_MASK; \
|
|
|
|
int ann = (*setp >> 3) & ~CURRENT_MASK
|
|
|
|
#define UPDATE_PARAMS *setp = (set | ann) << 3
|
2000-09-13 09:12:02 +00:00
|
|
|
#define LOOP_NEED_FLAGS
|
|
|
|
#include <iconv/loop.c>
|
|
|
|
|
|
|
|
|
|
|
|
/* Next, define the other direction. */
|
Update.
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>.
2002-05-15 06:02:35 +00:00
|
|
|
#define MIN_NEEDED_INPUT TO_LOOP_MIN_NEEDED_FROM
|
|
|
|
#define MAX_NEEDED_INPUT TO_LOOP_MAX_NEEDED_FROM
|
|
|
|
#define MIN_NEEDED_OUTPUT TO_LOOP_MIN_NEEDED_TO
|
|
|
|
#define MAX_NEEDED_OUTPUT TO_LOOP_MAX_NEEDED_TO
|
2000-09-13 09:12:02 +00:00
|
|
|
#define LOOPFCT TO_LOOP
|
|
|
|
#define BODY \
|
|
|
|
{ \
|
|
|
|
uint32_t ch; \
|
|
|
|
size_t written = 0; \
|
|
|
|
\
|
2000-11-28 07:10:56 +00:00
|
|
|
ch = *((const uint32_t *) inptr); \
|
2000-09-13 09:12:02 +00:00
|
|
|
\
|
|
|
|
/* First see whether we can write the character using the currently \
|
|
|
|
selected character set. */ \
|
|
|
|
if (ch < 0x80) \
|
|
|
|
{ \
|
|
|
|
if (set != ASCII_set) \
|
|
|
|
{ \
|
|
|
|
*outptr++ = SI; \
|
|
|
|
set = ASCII_set; \
|
|
|
|
if (outptr == outend) \
|
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
*outptr++ = ch; \
|
|
|
|
written = 1; \
|
|
|
|
\
|
|
|
|
/* At the end of the line we have to clear the `ann' flags since \
|
|
|
|
every line must contain this information again. */ \
|
|
|
|
if (ch == L'\n') \
|
|
|
|
ann = 0; \
|
|
|
|
} \
|
|
|
|
else \
|
|
|
|
{ \
|
2007-07-28 20:16:07 +00:00
|
|
|
unsigned char buf[2]; \
|
2000-09-13 09:12:02 +00:00
|
|
|
int used; \
|
|
|
|
\
|
2000-09-18 22:41:47 +00:00
|
|
|
if (set == GB2312_set || ((ann & SO_ann) != CNS11643_1_ann \
|
|
|
|
&& (ann & SO_ann) != ISO_IR_165_ann)) \
|
2000-09-13 09:12:02 +00:00
|
|
|
{ \
|
|
|
|
written = ucs4_to_gb2312 (ch, buf, 2); \
|
|
|
|
used = GB2312_set; \
|
|
|
|
} \
|
2000-09-18 22:41:47 +00:00
|
|
|
else if (set == ISO_IR_165_set || (ann & SO_ann) == ISO_IR_165_set) \
|
2000-09-13 09:12:02 +00:00
|
|
|
{ \
|
2000-09-18 22:41:47 +00:00
|
|
|
written = ucs4_to_isoir165 (ch, buf, 2); \
|
|
|
|
used = ISO_IR_165_set; \
|
2000-09-13 09:12:02 +00:00
|
|
|
} \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
written = ucs4_to_cns11643l1 (ch, buf, 2); \
|
|
|
|
used = CNS11643_1_set; \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
if (written == __UNKNOWN_10646_CHAR) \
|
|
|
|
{ \
|
|
|
|
/* Cannot convert it using the currently selected SO set. \
|
|
|
|
Next try the SS2 set. */ \
|
|
|
|
written = ucs4_to_cns11643l2 (ch, buf, 2); \
|
|
|
|
if (written != __UNKNOWN_10646_CHAR) \
|
|
|
|
/* Yep, that worked. */ \
|
|
|
|
used = CNS11643_2_set; \
|
|
|
|
else \
|
|
|
|
{ \
|
2007-07-28 20:16:07 +00:00
|
|
|
unsigned char tmpbuf[3]; \
|
2000-09-13 09:12:02 +00:00
|
|
|
\
|
2000-09-18 22:41:47 +00:00
|
|
|
switch (0) \
|
2000-09-13 09:12:02 +00:00
|
|
|
{ \
|
2000-09-18 22:41:47 +00:00
|
|
|
default: \
|
|
|
|
/* Well, see whether we have to change the SO set. */ \
|
|
|
|
\
|
|
|
|
if (used != GB2312_set) \
|
|
|
|
{ \
|
|
|
|
written = ucs4_to_gb2312 (ch, buf, 2); \
|
|
|
|
if (written != __UNKNOWN_10646_CHAR) \
|
|
|
|
{ \
|
|
|
|
used = GB2312_set; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
if (used != ISO_IR_165_set) \
|
|
|
|
{ \
|
|
|
|
written = ucs4_to_isoir165 (ch, buf, 2); \
|
|
|
|
if (written != __UNKNOWN_10646_CHAR) \
|
|
|
|
{ \
|
|
|
|
used = ISO_IR_165_set; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
if (used != CNS11643_1_set) \
|
|
|
|
{ \
|
|
|
|
written = ucs4_to_cns11643l1 (ch, buf, 2); \
|
|
|
|
if (written != __UNKNOWN_10646_CHAR) \
|
|
|
|
{ \
|
|
|
|
used = CNS11643_1_set; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
written = ucs4_to_cns11643 (ch, tmpbuf, 3); \
|
2001-06-06 14:01:54 +00:00
|
|
|
if (written == 3 && tmpbuf[0] >= 3 && tmpbuf[0] <= 7) \
|
2000-09-18 22:41:47 +00:00
|
|
|
{ \
|
|
|
|
buf[0] = tmpbuf[1]; \
|
|
|
|
buf[1] = tmpbuf[2]; \
|
2001-06-06 14:01:54 +00:00
|
|
|
switch (tmpbuf[0]) \
|
2000-09-18 22:41:47 +00:00
|
|
|
{ \
|
2001-06-06 14:01:54 +00:00
|
|
|
case 3: \
|
2000-09-18 22:41:47 +00:00
|
|
|
used = CNS11643_3_set; \
|
|
|
|
break; \
|
2001-06-06 14:01:54 +00:00
|
|
|
case 4: \
|
|
|
|
used = CNS11643_4_set; \
|
|
|
|
break; \
|
|
|
|
case 5: \
|
|
|
|
used = CNS11643_5_set; \
|
|
|
|
break; \
|
|
|
|
case 6: \
|
|
|
|
used = CNS11643_6_set; \
|
|
|
|
break; \
|
|
|
|
case 7: \
|
|
|
|
used = CNS11643_7_set; \
|
|
|
|
break; \
|
|
|
|
default: \
|
|
|
|
abort (); \
|
2000-09-18 22:41:47 +00:00
|
|
|
} \
|
2001-06-06 14:01:54 +00:00
|
|
|
written = 2; \
|
|
|
|
break; \
|
2000-09-18 22:41:47 +00:00
|
|
|
} \
|
|
|
|
\
|
2001-06-06 14:01:54 +00:00
|
|
|
/* XXX Currently GB7590 and GB13132 are not supported. */\
|
|
|
|
\
|
2000-09-13 09:12:02 +00:00
|
|
|
/* Even this does not work. Error. */ \
|
2000-09-18 22:41:47 +00:00
|
|
|
used = ASCII_set; \
|
|
|
|
} \
|
|
|
|
if (used == ASCII_set) \
|
|
|
|
{ \
|
Update.
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.
2001-06-06 12:55:46 +00:00
|
|
|
UNICODE_TAG_HANDLER (ch, 4); \
|
2002-06-28 21:23:06 +00:00
|
|
|
STANDARD_TO_LOOP_ERR_HANDLER (4); \
|
2000-09-13 09:12:02 +00:00
|
|
|
} \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
assert (written == 2); \
|
|
|
|
\
|
|
|
|
/* See whether we have to emit an escape sequence. */ \
|
|
|
|
if (set != used) \
|
|
|
|
{ \
|
|
|
|
/* First see whether we announced that we use this \
|
|
|
|
character set. */ \
|
2000-09-18 22:41:47 +00:00
|
|
|
if ((used & SO_mask) != 0 && (ann & SO_ann) != (used << 8)) \
|
2000-09-13 09:12:02 +00:00
|
|
|
{ \
|
|
|
|
const char *escseq; \
|
|
|
|
\
|
|
|
|
if (outptr + 4 > outend) \
|
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
assert (used >= 1 && used <= 4); \
|
2000-09-18 22:41:47 +00:00
|
|
|
escseq = ")A\0\0)G)E" + (used - 1) * 2; \
|
|
|
|
*outptr++ = ESC; \
|
|
|
|
*outptr++ = '$'; \
|
|
|
|
*outptr++ = *escseq++; \
|
|
|
|
*outptr++ = *escseq++; \
|
|
|
|
\
|
|
|
|
ann = (ann & ~SO_ann) | (used << 8); \
|
|
|
|
} \
|
|
|
|
else if ((used & SS2_mask) != 0 && (ann & SS2_ann) != (used << 8))\
|
|
|
|
{ \
|
|
|
|
const char *escseq; \
|
|
|
|
\
|
|
|
|
assert (used == CNS11643_2_set); /* XXX */ \
|
|
|
|
escseq = "*H"; \
|
|
|
|
*outptr++ = ESC; \
|
|
|
|
*outptr++ = '$'; \
|
2000-09-13 09:12:02 +00:00
|
|
|
*outptr++ = *escseq++; \
|
|
|
|
*outptr++ = *escseq++; \
|
2000-09-18 22:41:47 +00:00
|
|
|
\
|
|
|
|
ann = (ann & ~SS2_ann) | (used << 8); \
|
|
|
|
} \
|
|
|
|
else if ((used & SS3_mask) != 0 && (ann & SS3_ann) != (used << 8))\
|
|
|
|
{ \
|
|
|
|
const char *escseq; \
|
|
|
|
\
|
|
|
|
assert ((used >> 5) >= 3 && (used >> 5) <= 7); \
|
|
|
|
escseq = "+I+J+K+L+M" + ((used >> 5) - 3) * 2; \
|
|
|
|
*outptr++ = ESC; \
|
|
|
|
*outptr++ = '$'; \
|
2000-09-13 09:12:02 +00:00
|
|
|
*outptr++ = *escseq++; \
|
|
|
|
*outptr++ = *escseq++; \
|
|
|
|
\
|
2000-09-18 22:41:47 +00:00
|
|
|
ann = (ann & ~SS3_ann) | (used << 8); \
|
2000-09-13 09:12:02 +00:00
|
|
|
} \
|
|
|
|
\
|
|
|
|
if (used == CNS11643_2_set) \
|
|
|
|
{ \
|
|
|
|
if (outptr + 2 > outend) \
|
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
*outptr++ = SS2_0; \
|
|
|
|
*outptr++ = SS2_1; \
|
|
|
|
} \
|
2000-09-18 22:41:47 +00:00
|
|
|
else if (used >= CNS11643_3_set && used <= CNS11643_7_set) \
|
|
|
|
{ \
|
|
|
|
if (outptr + 2 > outend) \
|
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
*outptr++ = SS3_0; \
|
|
|
|
*outptr++ = SS3_1; \
|
|
|
|
} \
|
2000-09-13 09:12:02 +00:00
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
/* We only have to emit something if currently ASCII is \
|
|
|
|
selected. Otherwise we are switching within the \
|
|
|
|
SO charset. */ \
|
|
|
|
if (set == ASCII_set) \
|
|
|
|
{ \
|
|
|
|
if (outptr + 1 > outend) \
|
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
*outptr++ = SO; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
/* Always test the length here since we have used up all the \
|
|
|
|
guaranteed output buffer slots. */ \
|
|
|
|
if (outptr + 2 > outend) \
|
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
else if (outptr + 2 > outend) \
|
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
*outptr++ = buf[0]; \
|
|
|
|
*outptr++ = buf[1]; \
|
2000-09-18 22:41:47 +00:00
|
|
|
set = used; \
|
2000-09-13 09:12:02 +00:00
|
|
|
} \
|
|
|
|
\
|
|
|
|
/* Now that we wrote the output increment the input pointer. */ \
|
|
|
|
inptr += 4; \
|
|
|
|
}
|
|
|
|
#define EXTRA_LOOP_DECLS , int *setp
|
2000-09-25 05:12:05 +00:00
|
|
|
#define INIT_PARAMS int set = (*setp >> 3) & CURRENT_MASK; \
|
|
|
|
int ann = (*setp >> 3) & ~CURRENT_MASK
|
2008-01-09 20:03:58 +00:00
|
|
|
#define REINIT_PARAMS do \
|
|
|
|
{ \
|
|
|
|
set = (*setp >> 3) & CURRENT_MASK; \
|
|
|
|
ann = (*setp >> 3) & ~CURRENT_MASK; \
|
|
|
|
} \
|
|
|
|
while (0)
|
2000-09-25 05:12:05 +00:00
|
|
|
#define UPDATE_PARAMS *setp = (set | ann) << 3
|
2000-09-13 09:12:02 +00:00
|
|
|
#define LOOP_NEED_FLAGS
|
|
|
|
#include <iconv/loop.c>
|
|
|
|
|
|
|
|
|
|
|
|
/* Now define the toplevel functions. */
|
|
|
|
#include <iconv/skeleton.c>
|