OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
glibc/iconvdata/iso_6937-2.c

558 lines
28 KiB
C
Raw Normal View History

Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
/* Generic conversion to and from ISO 6937-2.
Update copyright notices with scripts/update-copyrights
2014-01-01 12:03:15 +01:00
Copyright (C) 1998-2014 Free Software Foundation, Inc.
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
The GNU C Library is free software; you can redistribute it and/or
Update to LGPL v2.1. 2001-07-06 Paul Eggert <eggert@twinsun.com> * manual/argp.texi: Remove ignored LGPL copyright notice; it's not appropriate for documentation anyway. * manual/libc-texinfo.sh: "Library General Public License" -> "Lesser General Public License". 2001-07-06 Andreas Jaeger <aj@suse.de> * All files under GPL/LGPL version 2: Place under LGPL version 2.1.
2001-07-06 06:58:11 +02: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.
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02: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
Update to LGPL v2.1. 2001-07-06 Paul Eggert <eggert@twinsun.com> * manual/argp.texi: Remove ignored LGPL copyright notice; it's not appropriate for documentation anyway. * manual/libc-texinfo.sh: "Library General Public License" -> "Lesser General Public License". 2001-07-06 Andreas Jaeger <aj@suse.de> * All files under GPL/LGPL version 2: Place under LGPL version 2.1.
2001-07-06 06:58:11 +02:00
Lesser General Public License for more details.
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
Update to LGPL v2.1. 2001-07-06 Paul Eggert <eggert@twinsun.com> * manual/argp.texi: Remove ignored LGPL copyright notice; it's not appropriate for documentation anyway. * manual/libc-texinfo.sh: "Library General Public License" -> "Lesser General Public License". 2001-07-06 Andreas Jaeger <aj@suse.de> * All files under GPL/LGPL version 2: Place under LGPL version 2.1.
2001-07-06 06:58:11 +02:00
You should have received a copy of the GNU Lesser General Public
Replace FSF snail mail address with URLs.
2012-02-10 00:18:22 +01:00
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
Update. 2000-06-12 Ulrich Drepper <drepper@redhat.com> * Rules (%.out): Define GCONV_PATH in the environment. * assert/Depend: New file. * iconvdata/Depend: New file. * intl/Depend: New file. * timezone/Makefile (build-testdata): Add GCONV_PATH to environment. * intl/tst-gettext.sh: Likewise. * iconv/Makefile (routines): Add gconv_trans. * iconv/gconv_trans.c: New file. * iconv/gconv.h (struct __gconv_trans_data): New type. (__gconv_fct): New parameter with starting position in output buffer. (__gconv_trans_fct, __gconv_trans_context_fct, __gconv_trans_query_fct, __gconv_trans_init_fct, __gconv_trans_end_fct): New types. (struct __gconv_step): Add new member __trans. * iconv/gconv_int.h: Pretty print prototypes. (gconv_transliterate): New prototype. (__BUILTIN_TRANS): Update for new conversion function interface. * iconv/gconv.c (__gconv): Pass new parameter to conversion function. * iconv/gconv_open.c (__gconv_open): Recognize error handling suffix in names, find appropriate function, and install in the conversion steps it can be used. * iconv/skeleton.c: Add additional parameter for beginning of output buffer. Change calls of downstream functions. * iconv/loop.c: Change loop function interface completely. Pass in step and step_data structure. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * iconv/gconv_simple.c: Update interfaces of functions. Insert appropriate error handling code to use transliteration steps. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * 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: Adjust to new interface of gconv functions. Use DL_CALL_FCT. * 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.
2000-06-12 21:47:50 +02:00
#include <dlfcn.h>
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
#include <stdint.h>
/* Data taken from the WG15 tables. */
static const uint32_t to_ucs4[256] =
{
/* 0x00 */ 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
/* 0x08 */ 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
/* 0x10 */ 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
/* 0x18 */ 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
/* 0x20 */ 0x0020, 0x0021, 0x0022, 0x0023, 0x00a4, 0x0025, 0x0026, 0x0027,
/* 0x28 */ 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
/* 0x30 */ 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
/* 0x38 */ 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
/* 0x40 */ 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
/* 0x48 */ 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
/* 0x50 */ 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
/* 0x58 */ 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
/* 0x60 */ 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
/* 0x68 */ 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
/* 0x70 */ 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
Update. 2003-12-31 Bruno Haible <bruno@clisp.org> * iconvdata/iso_6937-2.c (to_ucs4): Map 0x7E to U+007E, not U+203E. Map 0xA6 to U+0023. Map 0xA8 to U+00A4. (to_ucs4_comb): Map 0xC5 0x20 to U+00AF. (from_ucs4): Map U+00ED to 0xC2 0x69, not 0xC2 0xE9. (BODY for TO_LOOP): Don't map U+02DC. Map U+02DD to 0xCD 0x20, not 0x00 0x20. Don't map U+2500..U+25E3.
2004-01-19 23:05:36 +01:00
/* 0x78 */ 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
/* 0x80 */ 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
/* 0x88 */ 0x0088, 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f,
/* 0x90 */ 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
/* 0x98 */ 0x0098, 0x0099, 0x009a, 0x009b, 0x009c, 0x009d, 0x009e, 0x009f,
Update. 2003-12-31 Bruno Haible <bruno@clisp.org> * iconvdata/iso_6937-2.c (to_ucs4): Map 0x7E to U+007E, not U+203E. Map 0xA6 to U+0023. Map 0xA8 to U+00A4. (to_ucs4_comb): Map 0xC5 0x20 to U+00AF. (from_ucs4): Map U+00ED to 0xC2 0x69, not 0xC2 0xE9. (BODY for TO_LOOP): Don't map U+02DC. Map U+02DD to 0xCD 0x20, not 0x00 0x20. Don't map U+2500..U+25E3.
2004-01-19 23:05:36 +01:00
/* 0xa0 */ 0x0000, 0x00a1, 0x00a2, 0x00a3, 0x0024, 0x00a5, 0x0023, 0x00a7,
/* 0xa8 */ 0x00a4, 0x2018, 0x201c, 0x00ab, 0x2190, 0x2191, 0x2192, 0x2193,
Update. 2000-09-03 Bruno Haible <haible@clisp.cons.org> * charmaps/EUC-TW: Add commented non-reversible mappings. 2000-09-03 Bruno Haible <haible@clisp.cons.org> * charmaps/CP949: New file. 2000-09-03 Bruno Haible <haible@clisp.cons.org> * charmaps/GB2312: Remove 0x80..0xA0, 0xAA..0xAF, 0xF8..FF. 2000-09-03 Bruno Haible <haible@clisp.cons.org> * charmaps/EUC-JP: Nonreversibly map 0xA1C0 to U+005C and 0x8FA2B7 to U+007E.
2000-09-05 04:41:25 +02:00
/* 0xb0 */ 0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00d7, 0x00b5, 0x00b6, 0x00b7,
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
/* 0xb8 */ 0x00f7, 0x2019, 0x201d, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
/* 0xc0 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0xc8 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0xd0 */ 0x2014, 0x00b9, 0x00ae, 0x00a9, 0x2122, 0x266a, 0x0000, 0x0000,
/* 0xd8 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x215b, 0x215c, 0x215d, 0x215e,
/* 0xe0 */ 0x2126, 0x00c6, 0x00d0, 0x00aa, 0x0126, 0x0000, 0x0132, 0x013f,
/* 0xe8 */ 0x0141, 0x00d8, 0x0152, 0x00ba, 0x00de, 0x0166, 0x014a, 0x0149,
/* 0xf0 */ 0x0138, 0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131, 0x0133, 0x0140,
/* 0xf8 */ 0x0142, 0x00f8, 0x0153, 0x00df, 0x00fe, 0x0167, 0x014b, 0x0000
};
/* The outer array range runs from 0xc1 to 0xcf, the inner range from 0x20
to 0x7f. */
static const uint32_t to_ucs4_comb[15][96] =
{
/* 0xc1 */
{
/* 0x20 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x00c0, 0x0000, 0x0000, 0x0000, 0x00c8, 0x0000, 0x0000,
/* 0x48 */ 0x0000, 0x00cc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d2,
/* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d9, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x00e0, 0x0000, 0x0000, 0x0000, 0x00e8, 0x0000, 0x0000,
/* 0x68 */ 0x0000, 0x00ec, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f2,
/* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f9, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xc2 */
{
/* 0x20 */ 0x00b4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x00c1, 0x0000, 0x0106, 0x0000, 0x00c9, 0x0000, 0x0000,
/* 0x48 */ 0x0000, 0x00cd, 0x0000, 0x0000, 0x0139, 0x0000, 0x0143, 0x00d3,
/* 0x50 */ 0x0000, 0x0000, 0x0154, 0x015a, 0x0000, 0x00da, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x00dd, 0x0179, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x00e1, 0x0000, 0x0107, 0x0000, 0x00e9, 0x0000, 0x0000,
/* 0x68 */ 0x0000, 0x00ed, 0x0000, 0x0000, 0x013a, 0x0000, 0x0144, 0x00f3,
/* 0x70 */ 0x0000, 0x0000, 0x0155, 0x015b, 0x0000, 0x00fa, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x00fd, 0x017a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xc3 */
{
/* 0x20 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x00c2, 0x0000, 0x0108, 0x0000, 0x00ca, 0x0000, 0x011c,
/* 0x48 */ 0x0124, 0x00ce, 0x0134, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d4,
/* 0x50 */ 0x0000, 0x0000, 0x0000, 0x015c, 0x0000, 0x00db, 0x0000, 0x0174,
/* 0x58 */ 0x0000, 0x0176, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x00e2, 0x0000, 0x0109, 0x0000, 0x00ea, 0x0000, 0x011d,
/* 0x68 */ 0x0125, 0x00ee, 0x0135, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f4,
/* 0x70 */ 0x0000, 0x0000, 0x0000, 0x015d, 0x0000, 0x00fb, 0x0000, 0x0175,
/* 0x78 */ 0x0000, 0x0177, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xc4 */
{
/* 0x20 */ 0x007e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x00c3, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x48 */ 0x0000, 0x0128, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d1, 0x00d5,
/* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0168, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x00e3, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x68 */ 0x0000, 0x0129, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f1, 0x00f5,
/* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0169, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xc5 */
{
Update. 2003-12-31 Bruno Haible <bruno@clisp.org> * iconvdata/iso_6937-2.c (to_ucs4): Map 0x7E to U+007E, not U+203E. Map 0xA6 to U+0023. Map 0xA8 to U+00A4. (to_ucs4_comb): Map 0xC5 0x20 to U+00AF. (from_ucs4): Map U+00ED to 0xC2 0x69, not 0xC2 0xE9. (BODY for TO_LOOP): Don't map U+02DC. Map U+02DD to 0xCD 0x20, not 0x00 0x20. Don't map U+2500..U+25E3.
2004-01-19 23:05:36 +01:00
/* 0x20 */ 0x00af, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x0100, 0x0000, 0x0000, 0x0000, 0x0112, 0x0000, 0x0000,
/* 0x48 */ 0x0000, 0x012a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x014c,
/* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016a, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x0101, 0x0000, 0x0000, 0x0000, 0x0113, 0x0000, 0x0000,
/* 0x68 */ 0x0000, 0x012b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x014d,
/* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016b, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xc6 */
{
/* 0x20 */ 0x02d8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x0102, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x011e,
/* 0x48 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x0103, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x011f,
/* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016d, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xc7 */
{
/* 0x20 */ 0x02d9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x0000, 0x0000, 0x010a, 0x0000, 0x0116, 0x0000, 0x0120,
/* 0x48 */ 0x0000, 0x0130, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0000, 0x017b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x0000, 0x0000, 0x010b, 0x0000, 0x0117, 0x0000, 0x0121,
/* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x0000, 0x017c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xc8 */
{
/* 0x20 */ 0x00a8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x00c4, 0x0000, 0x0000, 0x0000, 0x00cb, 0x0000, 0x0000,
/* 0x48 */ 0x0000, 0x00cf, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d6,
/* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00dc, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0178, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x00e4, 0x0000, 0x0000, 0x0000, 0x00eb, 0x0000, 0x0000,
/* 0x68 */ 0x0000, 0x00ef, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f6,
/* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00fc, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x00ff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xc9 */
{
0x0000,
},
/* 0xca */
{
/* 0x20 */ 0x02da, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x00c5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x48 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016e, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x00e5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x016f, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xcb */
{
/* 0x20 */ 0x00b8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x0000, 0x0000, 0x00c7, 0x0000, 0x0000, 0x0000, 0x0122,
/* 0x48 */ 0x0000, 0x0000, 0x0000, 0x0136, 0x013b, 0x0000, 0x0145, 0x0000,
/* 0x50 */ 0x0000, 0x0000, 0x0156, 0x015e, 0x0162, 0x0000, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x0000, 0x0000, 0x00e7, 0x0000, 0x0000, 0x0000, 0x0123,
/* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0137, 0x013c, 0x0000, 0x0146, 0x0000,
/* 0x70 */ 0x0000, 0x0000, 0x0157, 0x015f, 0x0163, 0x0000, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xcc */
{
0x0000,
},
/* 0xcd */
{
/* 0x20 */ 0x02dd, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x48 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150,
/* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0170, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0151,
/* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0171, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xce */
{
/* 0x20 */ 0x02db, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x0104, 0x0000, 0x0000, 0x0000, 0x0118, 0x0000, 0x0000,
/* 0x48 */ 0x0000, 0x012e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x50 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0172, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x0105, 0x0000, 0x0000, 0x0000, 0x0119, 0x0000, 0x0000,
/* 0x68 */ 0x0000, 0x012f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x70 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0173, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
},
/* 0xcf */
{
/* 0x20 */ 0x02c7, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x28 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x30 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x38 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x40 */ 0x0000, 0x0000, 0x0000, 0x010c, 0x010e, 0x011a, 0x0000, 0x0000,
/* 0x48 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x013d, 0x0000, 0x0147, 0x0000,
/* 0x50 */ 0x0000, 0x0000, 0x0158, 0x0160, 0x0164, 0x0000, 0x0000, 0x0000,
/* 0x58 */ 0x0000, 0x0000, 0x017d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
/* 0x60 */ 0x0000, 0x0000, 0x0000, 0x010d, 0x010f, 0x011b, 0x0000, 0x0000,
/* 0x68 */ 0x0000, 0x0000, 0x0000, 0x0000, 0x013e, 0x0000, 0x0148, 0x0000,
/* 0x70 */ 0x0000, 0x0000, 0x0159, 0x0161, 0x0165, 0x0000, 0x0000, 0x0000,
/* 0x78 */ 0x0000, 0x0000, 0x017e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
}
};
static const char from_ucs4[][2] =
{
/* 0x0000 */ "\x00\x00", "\x01\x00", "\x02\x00", "\x03\x00", "\x04\x00",
/* 0x0005 */ "\x05\x00", "\x06\x00", "\x07\x00", "\x08\x00", "\x09\x00",
/* 0x000a */ "\x0a\x00", "\x0b\x00", "\x0c\x00", "\x0d\x00", "\x0e\x00",
/* 0x000f */ "\x0f\x00", "\x10\x00", "\x11\x00", "\x12\x00", "\x13\x00",
/* 0x0014 */ "\x14\x00", "\x15\x00", "\x16\x00", "\x17\x00", "\x18\x00",
/* 0x0019 */ "\x19\x00", "\x1a\x00", "\x1b\x00", "\x1c\x00", "\x1d\x00",
/* 0x001e */ "\x1e\x00", "\x1f\x00", "\x20\x00", "\x21\x00", "\x22\x00",
/* 0x0023 */ "\xa6\x00", "\xa4\x00", "\x25\x00", "\x26\x00", "\x27\x00",
/* 0x0028 */ "\x28\x00", "\x29\x00", "\x2a\x00", "\x2b\x00", "\x2c\x00",
/* 0x002d */ "\x2d\x00", "\x2e\x00", "\x2f\x00", "\x30\x00", "\x31\x00",
/* 0x0032 */ "\x32\x00", "\x33\x00", "\x34\x00", "\x35\x00", "\x36\x00",
/* 0x0037 */ "\x37\x00", "\x38\x00", "\x39\x00", "\x3a\x00", "\x3b\x00",
/* 0x003c */ "\x3c\x00", "\x3d\x00", "\x3e\x00", "\x3f\x00", "\x40\x00",
/* 0x0041 */ "\x41\x00", "\x42\x00", "\x43\x00", "\x44\x00", "\x45\x00",
/* 0x0046 */ "\x46\x00", "\x47\x00", "\x48\x00", "\x49\x00", "\x4a\x00",
/* 0x004b */ "\x4b\x00", "\x4c\x00", "\x4d\x00", "\x4e\x00", "\x4f\x00",
/* 0x0050 */ "\x50\x00", "\x51\x00", "\x52\x00", "\x53\x00", "\x54\x00",
/* 0x0055 */ "\x55\x00", "\x56\x00", "\x57\x00", "\x58\x00", "\x59\x00",
/* 0x005a */ "\x5a\x00", "\x5b\x00", "\x5c\x00", "\x5d\x00", "\x5e\x00",
/* 0x005f */ "\x5f\x00", "\x60\x00", "\x61\x00", "\x62\x00", "\x63\x00",
/* 0x0064 */ "\x64\x00", "\x65\x00", "\x66\x00", "\x67\x00", "\x68\x00",
/* 0x0069 */ "\x69\x00", "\x6a\x00", "\x6b\x00", "\x6c\x00", "\x6d\x00",
/* 0x006e */ "\x6e\x00", "\x6f\x00", "\x70\x00", "\x71\x00", "\x72\x00",
/* 0x0073 */ "\x73\x00", "\x74\x00", "\x75\x00", "\x76\x00", "\x77\x00",
/* 0x0078 */ "\x78\x00", "\x79\x00", "\x7a\x00", "\x7b\x00", "\x7c\x00",
/* 0x007d */ "\x7d\x00", "\x7e\x00", "\x7f\x00", "\x80\x00", "\x81\x00",
/* 0x0082 */ "\x82\x00", "\x83\x00", "\x84\x00", "\x85\x00", "\x86\x00",
/* 0x0087 */ "\x87\x00", "\x88\x00", "\x89\x00", "\x8a\x00", "\x8b\x00",
/* 0x008c */ "\x8c\x00", "\x8d\x00", "\x8e\x00", "\x8f\x00", "\x90\x00",
/* 0x0091 */ "\x91\x00", "\x92\x00", "\x93\x00", "\x94\x00", "\x95\x00",
/* 0x0096 */ "\x96\x00", "\x97\x00", "\x98\x00", "\x99\x00", "\x9a\x00",
/* 0x009b */ "\x9b\x00", "\x9c\x00", "\x9d\x00", "\x9e\x00", "\x9f\x00",
/* 0x00a0 */ "\x00\x00", "\xa1\x00", "\xa2\x00", "\xa3\x00", "\xa8\x00",
/* 0x00a5 */ "\xa5\x00", "\x00\x00", "\xa7\x00", "\xc8\x20", "\xd3\x00",
/* 0x00aa */ "\xe3\x00", "\xab\x00", "\x00\x00", "\x00\x00", "\xd2\x00",
/* 0x00af */ "\xc5\x20", "\xb0\x00", "\xb1\x00", "\xb2\x00", "\xb3\x00",
/* 0x00b4 */ "\xc2\x20", "\xb5\x00", "\xb6\x00", "\xb7\x00", "\xcb\x20",
/* 0x00b9 */ "\xd1\x00", "\xeb\x00", "\xbb\x00", "\xbc\x00", "\xbd\x00",
/* 0x00be */ "\xbe\x00", "\xbf\x00", "\xc1\x41", "\xc2\x41", "\xc3\x41",
/* 0x00c3 */ "\xc4\x41", "\xc8\x41", "\xca\x41", "\xe1\x00", "\xcb\x43",
/* 0x00c8 */ "\xc1\x45", "\xc2\x45", "\xc3\x45", "\xc8\x45", "\xc1\x49",
/* 0x00cd */ "\xc2\x49", "\xc3\x49", "\xc8\x49", "\xe2\x00", "\xc4\x4e",
/* 0x00d2 */ "\xc1\x4f", "\xc2\x4f", "\xc3\x4f", "\xc4\x4f", "\xc8\x4f",
/* 0x00d7 */ "\xb4\x00", "\xe9\x00", "\xc1\x55", "\xc2\x55", "\xc3\x55",
/* 0x00dc */ "\xc8\x55", "\xc2\x59", "\xec\x00", "\xfb\x00", "\xc1\x61",
/* 0x00e1 */ "\xc2\x61", "\xc3\x61", "\xc4\x61", "\xc8\x61", "\xca\x61",
/* 0x00e6 */ "\xf1\x00", "\xcb\x63", "\xc1\x65", "\xc2\x65", "\xc3\x65",
Update. 2003-12-31 Bruno Haible <bruno@clisp.org> * iconvdata/iso_6937-2.c (to_ucs4): Map 0x7E to U+007E, not U+203E. Map 0xA6 to U+0023. Map 0xA8 to U+00A4. (to_ucs4_comb): Map 0xC5 0x20 to U+00AF. (from_ucs4): Map U+00ED to 0xC2 0x69, not 0xC2 0xE9. (BODY for TO_LOOP): Don't map U+02DC. Map U+02DD to 0xCD 0x20, not 0x00 0x20. Don't map U+2500..U+25E3.
2004-01-19 23:05:36 +01:00
/* 0x00eb */ "\xc8\x65", "\xc1\x69", "\xc2\x69", "\xc3\x69", "\xc8\x69",
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
/* 0x00f0 */ "\xf3\x00", "\xc4\x6e", "\xc1\x6f", "\xc2\x6f", "\xc3\x6f",
/* 0x00f5 */ "\xc4\x6f", "\xc8\x6f", "\xb8\x00", "\xf9\x00", "\xc1\x75",
/* 0x00fa */ "\xc2\x75", "\xc3\x75", "\xc8\x75", "\xc2\x79", "\xfc\x00",
/* 0x00ff */ "\xc8\x79", "\xc5\x41", "\xc5\x61", "\xc6\x41", "\xc6\x61",
/* 0x0104 */ "\xce\x41", "\xce\x61", "\xc2\x43", "\xc2\x63", "\xc3\x43",
/* 0x0109 */ "\xc3\x63", "\xc7\x43", "\xc7\x63", "\xcf\x43", "\xcf\x63",
/* 0x010e */ "\xcf\x44", "\xcf\x64", "\x00\x00", "\xf2\x00", "\xc5\x45",
/* 0x0113 */ "\xc5\x65", "\x00\x00", "\x00\x00", "\xc7\x45", "\xc7\x65",
/* 0x0118 */ "\xce\x45", "\xce\x65", "\xcf\x45", "\xcf\x65", "\xc3\x47",
/* 0x011d */ "\xc3\x67", "\xc6\x47", "\xc6\x67", "\xc7\x47", "\xc7\x67",
/* 0x0122 */ "\xcb\x47", "\xcb\x67", "\xc3\x48", "\xc3\x68", "\xe4\x00",
/* 0x0127 */ "\xf4\x00", "\xc4\x49", "\xc4\x69", "\xc5\x49", "\xc5\x69",
/* 0x012c */ "\x00\x00", "\x00\x00", "\xce\x49", "\xce\x69", "\xc7\x49",
/* 0x0131 */ "\xf5\x00", "\xe6\x00", "\xf6\x00", "\xc3\x4a", "\xc3\x6a",
/* 0x0136 */ "\xcb\x4b", "\xcb\x6b", "\xf0\x00", "\xc2\x4c", "\xc2\x6c",
/* 0x013b */ "\xcb\x4c", "\xcb\x6c", "\xcf\x4c", "\xcf\x6c", "\xe7\x00",
/* 0x0140 */ "\xf7\x00", "\xe8\x00", "\xf8\x00", "\xc2\x4e", "\xc2\x6e",
/* 0x0145 */ "\xcb\x4e", "\xcb\x6e", "\xcf\x4e", "\xcf\x6e", "\xef\x00",
/* 0x014a */ "\xee\x00", "\xfe\x00", "\xc5\x4f", "\xc5\x6f", "\x00\x00",
/* 0x014f */ "\x00\x00", "\xcd\x4f", "\xcd\x6f", "\xea\x00", "\xfa\x00",
/* 0x0154 */ "\xc2\x52", "\xc2\x72", "\xcb\x52", "\xcb\x72", "\xcf\x52",
/* 0x0159 */ "\xcf\x72", "\xc2\x53", "\xc2\x73", "\xc3\x53", "\xc3\x73",
/* 0x015e */ "\xcb\x53", "\xcb\x73", "\xcf\x53", "\xcf\x73", "\xcb\x54",
/* 0x0163 */ "\xcb\x74", "\xcf\x54", "\xcf\x74", "\xed\x00", "\xfd\x00",
/* 0x0168 */ "\xc4\x55", "\xc4\x75", "\xc5\x55", "\xc5\x75", "\xc6\x55",
/* 0x016d */ "\xc6\x75", "\xca\x55", "\xca\x75", "\xcd\x55", "\xcd\x75",
/* 0x0172 */ "\xce\x55", "\xce\x75", "\xc3\x57", "\xc3\x77", "\xc3\x59",
/* 0x0177 */ "\xc3\x79", "\xc8\x59", "\xc2\x5a", "\xc2\x7a", "\xc7\x5a",
/* 0x017c */ "\xc7\x7a", "\xcf\x5a", "\xcf\x7a"
/*
This table does not cover the following positions:
0x02c7 "\xcf\x20",
...
0x02d8 "\xc6\x20", "\xc7\x20", "\xca\x20", "\xce\x20", "\x00\x00",
0x02dd "\xcd\x20",
...
0x2014 "\xd0\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\xa9\x00",
0x2019 "\xb9\x00", "\x00\x00", "\x00\x00", "\xaa\x00", "\xba\x00",
0x201e "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\xd4\x00",
0x2123 "\x00\x00", "\x00\x00", "\x00\x00", "\xe0\x00",
...
0x215b "\xdc\x00", "\xdd\x00", "\xde\x00"
...
0x2190 "\xac\x00", "\xad\x00", "\xae\x00", "\xaf\x00",
...
0x266a "\xd5\x00"
These would blow up the table and are therefore handled specially in
the code.
*/
};
/* Definitions used in the body of the `gconv' function. */
#define CHARSET_NAME "ISO_6937-2//"
#define FROM_LOOP from_iso6937_2
#define TO_LOOP to_iso6937_2
#define DEFINE_INIT 1
#define DEFINE_FINI 1
Add __builtin_expect in many places.
2000-06-06 23:35:37 +02:00
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
#define MIN_NEEDED_TO 4
2014-05-01 Steve Ellcey <sellcey@mips.com> * iconvdata/ansi_x3.110.c (ONE_DIRECTION): Define. * iconvdata/armscii-8.c (ONE_DIRECTION): Define. * iconvdata/big5.c (ONE_DIRECTION): Define. * iconvdata/big5hkscs.c (ONE_DIRECTION): Define. * iconvdata/cp1255.c (ONE_DIRECTION): Define. * iconvdata/cp1258.c (ONE_DIRECTION): Define. * iconvdata/cp932.c (ONE_DIRECTION): Define. * iconvdata/euc-cn.c (ONE_DIRECTION): Define. * iconvdata/euc-jisx0213.c (ONE_DIRECTION): Define. * iconvdata/euc-jp-ms.c (ONE_DIRECTION): Define. * iconvdata/euc-jp.c (ONE_DIRECTION): Define. * iconvdata/euc-kr.c (ONE_DIRECTION): Define. * iconvdata/euc-tw.c (ONE_DIRECTION): Define. * iconvdata/gb18030.c (ONE_DIRECTION): Define. * iconvdata/gbbig5.c (ONE_DIRECTION): Define. * iconvdata/gbgbk.c (ONE_DIRECTION): Define. * iconvdata/gbk.c (ONE_DIRECTION): Define. * iconvdata/ibm1364.c (ONE_DIRECTION): Define. * iconvdata/ibm930.c (ONE_DIRECTION): Define. * iconvdata/ibm932.c (ONE_DIRECTION): Define. * iconvdata/ibm933.c (ONE_DIRECTION): Define. * iconvdata/ibm935.c (ONE_DIRECTION): Define. * iconvdata/ibm937.c (ONE_DIRECTION): Define. * iconvdata/ibm939.c (ONE_DIRECTION): Define. * iconvdata/ibm943.c (ONE_DIRECTION): Define. * iconvdata/iso-2022-cn-ext.c (ONE_DIRECTION): Define. * iconvdata/iso-2022-cn.c (ONE_DIRECTION): Define. * iconvdata/iso-2022-jp-3.c (ONE_DIRECTION): Define. * iconvdata/iso-2022-jp.c (ONE_DIRECTION): Define. * iconvdata/iso-2022-kr.c (ONE_DIRECTION): Define. * iconvdata/iso646.c (ONE_DIRECTION): Define. * iconvdata/iso8859-1.c (ONE_DIRECTION): Define. * iconvdata/iso_11548-1.c (ONE_DIRECTION): Define. * iconvdata/iso_6937-2.c (ONE_DIRECTION): Define. * iconvdata/iso_6937.c (ONE_DIRECTION): Define. * iconvdata/johab.c (ONE_DIRECTION): Define. * iconvdata/shift_jisx0213.c (ONE_DIRECTION): Define. * iconvdata/sjis.c (ONE_DIRECTION): Define. * iconvdata/t.61.c (ONE_DIRECTION): Define. * iconvdata/tcvn5712-1.c (ONE_DIRECTION): Define. * iconvdata/tscii.c (ONE_DIRECTION): Define. * iconvdata/uhc.c (ONE_DIRECTION): Define. * iconvdata/unicode.c (ONE_DIRECTION): Define. * iconvdata/utf-16.c (ONE_DIRECTION): Define. * iconvdata/utf-32.c (ONE_DIRECTION): Define. * iconvdata/utf-7.c (ONE_DIRECTION): Define.
2014-05-01 22:42:40 +02:00
#define ONE_DIRECTION 0
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
/* First define the conversion function from ISO 6937-2 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; \
\
Update. * iconvdata/8bit-gap.c: Correctly use __builtin_expect. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/gb18030.c: Likewise. * iconvdata/gbbig5.c: Likewise. * iconvdata/gbgbk.c: Likewise. * iconvdata/gbk.c: Likewise. * iconvdata/ibm930.c: Likewise. * iconvdata/ibm932.c: Likewise. * iconvdata/ibm933.c: Likewise. * iconvdata/ibm935.c: Likewise. * iconvdata/ibm939.c: Likewise. * iconvdata/ibm943.c: Likewise. * iconvdata/iso-2022-cn.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. * iconv/gconv_simple.c: Likewise. Convert assert() in real error handling.
2001-08-04 00:09:42 +02:00
if (__builtin_expect (ch >= 0xc1, 0) && ch <= 0xcf) \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
{ \
Update. 2002-11-30 Bruno Haible <bruno@clisp.org> * iconv/gconv.h (__gconv_btowc_fct): New typedef. (struct __gconv_step): New field __btowc_fct. * wcsmbs/btowc.c (__btowc): Use the __btowc_fct shortcut if possible. * iconv/gconv_int.h (__BUILTIN_TRANSFORM): Renamed from __BUILTIN_TRANS. (__gconv_btwoc_ascii): New declaration. * iconv/gconv_simple.c (BUILTIN_TRANSFORMATION): Add BtowcFct argument. (__gconv_btwoc_ascii): New function. * iconv/gconv_builtin.h: Add BtowcFct argument to all BUILTIN_TRANSFORMATION invocations. * iconv/gconv_conf.c (BUILTIN_TRANSFORMATION): Add BtowcFct argument. * iconv/iconvconfig.c (BUILTIN_TRANSFORMATION): Likewise. * iconv/gconv_builtin.c (map): New field btowc_fct. (BUILTIN_TRANSFORMATION): Add BtowcFct argument. Use it to initialize btowc_fct field. (__gconv_get_builtin_trans): Initialize __btowc_fct field. * iconv/gconv_cache.c (find_module): Initialize __btowc_fct field. * iconv/gconv_db.c (gen_steps, increment_counter): Likewise. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Likewise. * iconv/skeleton.c: Document STORE_REST and FROM_ONEBYTE. (gconv_init): Initialize __btowc_fct field. Undefine EXTRA_LOOP_ARGS and FROM_ONEBYTE at the end. * iconv/loop.c: Document ONEBYTE_BODY. (gconv_btowc, FROM_ONEBYTE): Define if ONEBYTE_BODY is defined. Undefine ONEBYTE_BODY at the end. * iconvdata/8bit-generic.c (ONEBYTE_BODY): New macro. * iconvdata/8bit-gap.c (NONNUL): New macro. (BODY for FROM_LOOP): Use it. (ONEBYTE_BODY): New macro. * iconvdata/isiri-3342.c (HAS_HOLES): Set to 1. (NONNUL): New macro. * iconvdata/ansi_x3.110.c (ONEBYTE_BODY): New macro. * iconvdata/armscii-8.c (ONEBYTE_BODY): New macro. * iconvdata/cp1255.c (ONEBYTE_BODY): New macro. * iconvdata/cp1258.c (ONEBYTE_BODY): New macro. * iconvdata/tcvn5712-1.c (ONEBYTE_BODY): New macro. * iconvdata/big5.c (ONEBYTE_BODY): New macro. * iconvdata/big5hkscs.c (ONEBYTE_BODY): New macro. * iconvdata/euc-cn.c (ONEBYTE_BODY): New macro. * iconvdata/euc-jp.c (ONEBYTE_BODY): New macro. * iconvdata/euc-jisx0213.c (ONEBYTE_BODY): New macro. * iconvdata/euc-kr.c (ONEBYTE_BODY): New macro. * iconvdata/euc-tw.c (ONEBYTE_BODY): New macro. * iconvdata/gbk.c (ONEBYTE_BODY): New macro. * iconvdata/gb18030.c (ONEBYTE_BODY): New macro. * iconvdata/ibm932.c: Include <stdbool.h>. (TRUE, FALSE): Remove macros. (BODY for FROM_LOOP): Remove unused variable rp1. (ONEBYTE_BODY): New macro. (BODY for TO_LOOP): Use bool. * iconvdata/ibm932.h (__ibm932sb_to_ucs4_idx): Remove array. * iconvdata/ibm943.c: Include <stdbool.h>. (TRUE, FALSE): Remove macros. (BODY for FROM_LOOP): Remove unused variable rp1. (ONEBYTE_BODY): New macro. (BODY for TO_LOOP): Use bool. * iconvdata/ibm943.h (__ibm943sb_to_ucs4_idx): Remove array. * iconvdata/iso8859-1.c (ONEBYTE_BODY): New macro. * iconvdata/iso_6937-2.c (ONEBYTE_BODY): New macro. * iconvdata/iso_6937.c (ONEBYTE_BODY): New macro. * iconvdata/johab.c (ONEBYTE_BODY): New macro. * iconvdata/sjis.c (ONEBYTE_BODY): New macro. * iconvdata/shift_jisx0213.c (ONEBYTE_BODY): New macro. * iconvdata/t.61.c (ONEBYTE_BODY): New macro. * iconvdata/uhc.c (ONEBYTE_BODY): New macro. * iconvdata/gbbig5.c: Tweak comment.
2002-12-02 23:39:58 +01:00
/* Composed character. First test whether the next byte \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
is also available. */ \
int ch2; \
\
Use glibc_likely instead __builtin_expect.
2014-02-10 14:45:42 +01:00
if (__glibc_unlikely (inptr + 1 >= inend)) \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
{ \
/* The second character is not available. Store the \
intermediate result. */ \
Update. * Versions.def: Add GLIBC_2.2 for libc. * iconv/gconv.h: Make header suitable for inclusion in public header by protecting all names with __. * iconv/gconv.c: Adapt for symbol name changes. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.c: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/iconv_close.c: Likewise. * iconv/iconv_open.c: Likewise. * iconv/loop.c: Likewise. * iconv/skeleton.c: Likewise. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/cns11643.h: Likewise. * iconvdata/cns11643l1.h: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gb2312.h: 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/jis0201.h: Likewise. * iconvdata/jis0208.h: Likewise. * iconvdata/jis0212.h: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/ksc5601.h: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * stdlib/mblen.c: Likewise. * stdlib/mbtowc.c: Likewise. * stdlib/wctomb.c: Likewise. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wchar.h: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * wcsmbs/wcsmbsload.h: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * include/limits.h (MB_LEN_MAX): Increase to 16. * sysdeps/generic/_G_config.h: Define _G_fpos_t as struct. Define _G_iconv_t. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * include/wchar.h: Change mbstate_t to __mbstate_t. * libio/Makefile (routines): Add wfiledoalloc, oldiofgetpos, oldiofgetpos64, oldiofsetpos, oldiofsetpos64, fputwc, fputwc_u, getwc, getwc_u, getwchar, getwchar_u, iofgetws, iofgetws_u, iofputws, iofputws_u, iogetwline, iowpadn, ioungetwc, putwc, putwc_u, putchar, putchar_u, swprintf, vwprintf, wprintf, wscanf, fwscanf, vwscanf, vswprintf, iovswscanf, swscanf, wgenops, wstrops, wfileops, and iofwide. (tests): Add tst_swprintf, tst_wprintf, tst_swscanf, and tst_wscanf. * libio/Versions: Add _IO_fgetpos, _IO_fgetpos64, _IO_fsetpos, _IO_fsetpos64, fgetpos, fgetpos64, fgetwc, fgetwc_unlocked, fgetws, fgetws_unlocked, fputwc, fputwc_unlocked, fputws, fputws_unlocked, fsetpos, fsetpos64, fwide, fwprintf, fwscanf, getwc, getwc_unlocked, getwchar, getwchar_unlocked, putwc, putwc_unlocked, putwchar, putwchar_unlocked, swprintf, swscanf, ungetwc, vfwprintf, vswprintf, vwprintf, vfwscanf, vswscanf, vwscanf, wprintf, and wscanf to GLIBC_2.2 for libc. * libio/libio.h: Define codecvt struct. Define _IO_wide_data. Extend _IO_file contain pointer to codecvt, widedata and mode. (_IO_getwc_unlocked): New macro. (_IO_putwc_unlocked): New macro. (_IO_fwide): New macro. * libio/libioP.h: Add new prototypes and adjust existing declarations. * libio/fileops.c (_IO_new_file_close_it): Reset normal or widedata buffers based on mode. (new_do_write): Set _IO_write_end to _IO_buf_end if stream is wide oriented. (_IO_new_file_overflow): Don't depend only on _IO_CURRENTLY_PUTTING flag to be enough to signal unallocated buffer. For wide oriented stream don't make it linebuffered. Don't use _IO_do_flush, use _IO_new_do_write directly. (_IO_new_file_seekoff): Change return value type to _IO_off64_t. (_IO_file_seek): Likewise. * libio/genops.c (_IO_least_marker): Make global. (__underflow): Orient stream if not already done. (__uflow): Likewise. (_IO_default_seekpos): Change to type _IO_off64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_no_init): New function. Similar to _IO_init but allows to orient in initialization. * libio/iolibio.h: Add prototype for _IO_vswprintf. Change _IO_pos_BAD to use _IO_off64_t. * libio/ftello.c: Use _IO_off_t. For now abort when use with wide char stream. * libio/ftello64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofopncook.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/oldfileops.c: Likewise. * libio/iofgetpos.c: Store state of conversion if necessary. * libio/iofgetpos64.c: Likewise. * libio/iofsetpos.c: Restore conversion state if necessary. * libio/iofsetpos64.c: Likewise. * libio/iofdopen.c: Initialize so that stream can be wide oriented. * libio/iofopen.c: Likewise. * libio/iofopen64.c: Likewise. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/iofputs.c: Orient stream if not already happened. * libio/iofputs_u.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iofwrite_u.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Handle not yet oriented stream. * libio/iosetvbuf.c: Likewise. * libio/oldstdfiles.c: Adjust FILEBUF_LITERAL call. * libio/stdfiles.c: Likewise. * libio/strops.c (_IO_str_overflow): Correctly free buffer after failed allocation. (_IO_str_seekoff): Use _IO_off64_t. * libio/vasprintf.c: Pre-orient stream. * libio/vsnprintf.c: Likewise. * libio/fputwc.c: New file. * libio/fputwc_u.c: New file. * libio/fwprintf.c: New file. * libio/fwscanf.c: New file. * libio/getwc.c: New file. * libio/getwc_u.c: New file. * libio/getwchar.c: New file. * libio/getwchar_u.c: New file. * libio/iofgetws.c: New file. * libio/iofgetws_u.c: New file. * libio/iofputws.c: New file. * libio/iofputws_u.c: New file. * libio/iofwide.c: New file. * libio/iogetwline.c: New file. * libio/ioungetwc.c: New file. * libio/iovswscanf.c: New file. * libio/iowpadn.c: New file. * libio/oldiofgetpos.c: New file. * libio/oldiofgetpos64.c: New file. * libio/oldiofsetpos.c: New file. * libio/oldiofsetpos64.c: New file. * libio/putwc.c: New file. * libio/putwc_u.c: New file. * libio/putwchar.c: New file. * libio/putwchar_u.c: New file. * libio/swprintf.c: New file. * libio/swscanf.c: New file. * libio/tst_swprintf.c: New file. * libio/tst_swscanf.c: New file. * libio/tst_wprintf.c: New file. * libio/tst_wscanf.c: New file. * libio/tst_wscanf.input: New file. * libio/vswprintf.c: New file. * libio/vwprintf.c: New file. * libio/vwscanf.c: New file. * libio/wfiledoalloc.c: New file. * libio/wfileops.c: New file. * libio/wgenops.c: New file. * libio/wprintf.c: New file. * libio/wscanf.c: New file. * libio/wstrops.c: New file. * stdio-common/Makefile (routines): Add _itowa, itowa-digits, vfwprintf, and vfwscanf. * stdio-common/_itoa.c (base_table): Rename to _IO_base_table and make global. * stdio-common/_itowa.c: New file. * stdio-common/_itowa.h: New file. * stdio-common/itoa-digits.c: Minimal optimization. * stdio-common/itowa-digits.c: New file. * stdio-common/printf-parse.h: Allow use in wide character context. * stdio-common/printf-prs.c: Define ISASCII and MBRLEN. * stdio-common/printf.h (printf_info): Add wide bit. * stdio-common/printf_fp.c: Determine from wide bit whether stream is wide oriented or not. * stdio-common/printf_size.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * stdlib/strfmon.c: Call __printf_fp with wide bit cleared. * stdio-common/vfprintf.c: Rewrite to allow use in wide character context. * stdio-common/vfscand.c: Likewise. * stdio-common/vfwprintf.c: New file. * stdio-common/vfwscanf.c: New file. * time/Makefile (routines): Add wcsftime. (tests): Add tst_wcsftime. * time/Versions: Add wcsftime to GLIBC_2.2 for libc. * time/strftime.c: Make usable as wcsftime. * time/wcsftime.c: New file. * time/tst_wcsftime.c: New file. * wcsmbs/Makefile (routines): Add wmempcpy and wcschrnul. * wcsmbs/Versions: Add wmempcpy and wcschrnul to GLIBC_2.2 for libc. * wcsmbs/wcschrnul.c: New file. * wcsmbs/wmemcpy.c: New file. * wcsmbs/wmemcpy.c: Rename to __wmemcpy and make wmemcpy weak alias. * wcsmbs/wmemmove.c: Likewise for wmemmove. * manual/stdio.texi: Document is_char and wide element if printf_info. * manual/time.texi: Document wcsftime. * include/wchar.h: Add prototypes for __wmemcpy, __wmempcpy, __wmemmove, __wcschrnul, and __vfwscanf. * locale/langinfo.h: Add new LC_TIME entries for wchar_t data. * locale/C-time.c: Adapt for above change. * locale/categories.def: Likewise. * locale/localeinfo.h: Likewise. * localedata/Makefile: Don't run tests for now.
1999-06-17 00:55:47 +02:00
result = __GCONV_INCOMPLETE_INPUT; \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
break; \
} \
\
ch2 = inptr[1]; \
\
Update. * iconvdata/8bit-gap.c: Correctly use __builtin_expect. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/gb18030.c: Likewise. * iconvdata/gbbig5.c: Likewise. * iconvdata/gbgbk.c: Likewise. * iconvdata/gbk.c: Likewise. * iconvdata/ibm930.c: Likewise. * iconvdata/ibm932.c: Likewise. * iconvdata/ibm933.c: Likewise. * iconvdata/ibm935.c: Likewise. * iconvdata/ibm939.c: Likewise. * iconvdata/ibm943.c: Likewise. * iconvdata/iso-2022-cn.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. * iconv/gconv_simple.c: Likewise. Convert assert() in real error handling.
2001-08-04 00:09:42 +02:00
if (__builtin_expect (ch2 < 0x20, 0) \
|| __builtin_expect (ch2 >= 0x80, 0)) \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
{ \
/* This is illegal. */ \
Update. 2002-05-26 Bruno Haible <bruno@clisp.org> * iconv/loop.c (STANDARD_FROM_LOOP_ERR_HANDLER): New macro. (STANDARD_TO_LOOP_ERR_HANDLER): Renamed from STANDARD_ERR_HANDLER. All callers changed. * iconv/gconv_simple.c (ascii_internal_loop): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (utf8_internal_loop): Likewise. (ucs2_internal_loop): Likewise. (internal_ucs2_loop): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/unicode.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-16.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-32.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/big5.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/iso-2022-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-gap.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-generic.c (BODY for FROM_LOOP): Likewise. * iconvdata/ansi_x3.110.c (BODY for FROM_LOOP): Likewise. * iconvdata/armscii-8.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1255.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1258.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-tw.c (BODY for FROM_LOOP): Likewise. * iconvdata/big5hkscs.c (BODY for FROM_LOOP): Likewise. * iconvdata/gb18030.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbk.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-jp-3.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso646.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937-2.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937.c (BODY for FROM_LOOP): Likewise. * iconvdata/johab.c (BODY for FROM_LOOP): Likewise. * iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/sjis.c (BODY for FROM_LOOP): Likewise. * iconvdata/t.61.c (BODY for FROM_LOOP): Likewise. * iconvdata/uhc.c (BODY for FROM_LOOP): Likewise. * iconvdata/utf-7.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbbig5.c (BODY for FROM_LOOP): Likewise. When ignoring an error, still set result = __GCONV_ILLEGAL_INPUT. (BODY for TO_LOOP): Likewise. * iconvdata/ibm930.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm932.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm933.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm935.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm937.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm939.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm943.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/gbgbk.c (BODY for FROM_LOOP): Update. * iconvdata/iso8859-1.c (BODY for TO_LOOP): Update. * iconvdata/tcvn5712-1.c (BODY for TO_LOOP): Update. 2002-06-28 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/dl-machine.h (elf_machine_load_address): Use local labels in assembler instructions.
2002-06-28 23:23:06 +02:00
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
} \
\
ch = to_ucs4_comb[ch - 0xc1][ch2 - 0x20]; \
\
Use glibc_likely instead __builtin_expect.
2014-02-10 14:45:42 +01:00
if (__glibc_unlikely (ch == 0)) \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
{ \
/* Illegal character. */ \
Update. 2002-05-26 Bruno Haible <bruno@clisp.org> * iconv/loop.c (STANDARD_FROM_LOOP_ERR_HANDLER): New macro. (STANDARD_TO_LOOP_ERR_HANDLER): Renamed from STANDARD_ERR_HANDLER. All callers changed. * iconv/gconv_simple.c (ascii_internal_loop): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (utf8_internal_loop): Likewise. (ucs2_internal_loop): Likewise. (internal_ucs2_loop): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/unicode.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-16.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-32.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/big5.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/iso-2022-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-gap.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-generic.c (BODY for FROM_LOOP): Likewise. * iconvdata/ansi_x3.110.c (BODY for FROM_LOOP): Likewise. * iconvdata/armscii-8.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1255.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1258.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-tw.c (BODY for FROM_LOOP): Likewise. * iconvdata/big5hkscs.c (BODY for FROM_LOOP): Likewise. * iconvdata/gb18030.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbk.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-jp-3.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso646.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937-2.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937.c (BODY for FROM_LOOP): Likewise. * iconvdata/johab.c (BODY for FROM_LOOP): Likewise. * iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/sjis.c (BODY for FROM_LOOP): Likewise. * iconvdata/t.61.c (BODY for FROM_LOOP): Likewise. * iconvdata/uhc.c (BODY for FROM_LOOP): Likewise. * iconvdata/utf-7.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbbig5.c (BODY for FROM_LOOP): Likewise. When ignoring an error, still set result = __GCONV_ILLEGAL_INPUT. (BODY for TO_LOOP): Likewise. * iconvdata/ibm930.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm932.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm933.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm935.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm937.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm939.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm943.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/gbgbk.c (BODY for FROM_LOOP): Update. * iconvdata/iso8859-1.c (BODY for TO_LOOP): Update. * iconvdata/tcvn5712-1.c (BODY for TO_LOOP): Update. 2002-06-28 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/dl-machine.h (elf_machine_load_address): Use local labels in assembler instructions.
2002-06-28 23:23:06 +02:00
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
} \
\
inptr += 2; \
} \
else \
{ \
ch = to_ucs4[ch]; \
\
Update. 2002-05-26 Bruno Haible <bruno@clisp.org> * iconv/loop.c (STANDARD_FROM_LOOP_ERR_HANDLER): New macro. (STANDARD_TO_LOOP_ERR_HANDLER): Renamed from STANDARD_ERR_HANDLER. All callers changed. * iconv/gconv_simple.c (ascii_internal_loop): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (utf8_internal_loop): Likewise. (ucs2_internal_loop): Likewise. (internal_ucs2_loop): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/unicode.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-16.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-32.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/big5.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/iso-2022-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-gap.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-generic.c (BODY for FROM_LOOP): Likewise. * iconvdata/ansi_x3.110.c (BODY for FROM_LOOP): Likewise. * iconvdata/armscii-8.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1255.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1258.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-tw.c (BODY for FROM_LOOP): Likewise. * iconvdata/big5hkscs.c (BODY for FROM_LOOP): Likewise. * iconvdata/gb18030.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbk.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-jp-3.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso646.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937-2.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937.c (BODY for FROM_LOOP): Likewise. * iconvdata/johab.c (BODY for FROM_LOOP): Likewise. * iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/sjis.c (BODY for FROM_LOOP): Likewise. * iconvdata/t.61.c (BODY for FROM_LOOP): Likewise. * iconvdata/uhc.c (BODY for FROM_LOOP): Likewise. * iconvdata/utf-7.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbbig5.c (BODY for FROM_LOOP): Likewise. When ignoring an error, still set result = __GCONV_ILLEGAL_INPUT. (BODY for TO_LOOP): Likewise. * iconvdata/ibm930.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm932.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm933.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm935.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm937.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm939.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm943.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/gbgbk.c (BODY for FROM_LOOP): Update. * iconvdata/iso8859-1.c (BODY for TO_LOOP): Update. * iconvdata/tcvn5712-1.c (BODY for TO_LOOP): Update. 2002-06-28 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/dl-machine.h (elf_machine_load_address): Use local labels in assembler instructions.
2002-06-28 23:23:06 +02:00
if (__builtin_expect (ch == 0, 0) && *inptr != '\0') \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
{ \
/* This is an illegal character. */ \
Update. 2002-05-26 Bruno Haible <bruno@clisp.org> * iconv/loop.c (STANDARD_FROM_LOOP_ERR_HANDLER): New macro. (STANDARD_TO_LOOP_ERR_HANDLER): Renamed from STANDARD_ERR_HANDLER. All callers changed. * iconv/gconv_simple.c (ascii_internal_loop): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (utf8_internal_loop): Likewise. (ucs2_internal_loop): Likewise. (internal_ucs2_loop): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/unicode.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-16.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-32.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/big5.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/iso-2022-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-gap.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-generic.c (BODY for FROM_LOOP): Likewise. * iconvdata/ansi_x3.110.c (BODY for FROM_LOOP): Likewise. * iconvdata/armscii-8.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1255.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1258.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-tw.c (BODY for FROM_LOOP): Likewise. * iconvdata/big5hkscs.c (BODY for FROM_LOOP): Likewise. * iconvdata/gb18030.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbk.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-jp-3.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso646.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937-2.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937.c (BODY for FROM_LOOP): Likewise. * iconvdata/johab.c (BODY for FROM_LOOP): Likewise. * iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/sjis.c (BODY for FROM_LOOP): Likewise. * iconvdata/t.61.c (BODY for FROM_LOOP): Likewise. * iconvdata/uhc.c (BODY for FROM_LOOP): Likewise. * iconvdata/utf-7.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbbig5.c (BODY for FROM_LOOP): Likewise. When ignoring an error, still set result = __GCONV_ILLEGAL_INPUT. (BODY for TO_LOOP): Likewise. * iconvdata/ibm930.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm932.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm933.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm935.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm937.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm939.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm943.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/gbgbk.c (BODY for FROM_LOOP): Update. * iconvdata/iso8859-1.c (BODY for TO_LOOP): Update. * iconvdata/tcvn5712-1.c (BODY for TO_LOOP): Update. 2002-06-28 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/dl-machine.h (elf_machine_load_address): Use local labels in assembler instructions.
2002-06-28 23:23:06 +02:00
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
} \
++inptr; \
} \
\
Update. 2000-03-28 Ulrich Drepper <drepper@redhat.com> * iconvdata/TESTS: Use UCS-2BE instead of UCS2. * iconv/loop.c: Define get16, get32, put16, and put32 macros to allow as well reading from/writing to unaligned addresses on machines which don't support this in hardware. Use FCTNAME macro to define function name. Include the file a second time for platforms which need special unaligned handling. * iconv/skeleton.c: Define get16u, get32u, put16u, and put32u macros to access potentially unaligned addresses. These macros are intended to be used only outside the loops. (unaligned): New definition. In case the machine can handle unaligned access define as zero. Otherwise as a variable which is initialized as nonzero in case the buffer passed in at runtime is unaligned with respect to the character set encoding involved. Call aligned or unaligned looop functions according to unaligned variable. * iconvdata/8bit-gap.c: Use get16, get32, put16, and put32 instead of direct casting pointer to potentially handle unaligned memory accesses. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.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/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. * locale/programs/simple-hash.c: Little optimizations. Remove K&R prototypes. * malloc/Versions [libc] (GLIBC_2.2): Add mcheck_check_all. * malloc/mcheck.c (mcheck_check_all): Renamed from check_all and made public. * malloc/mcheck.h (mcheck_check_all): Declare. * stdio-common/Makefile (tests): Add tst-obprintf.
2000-03-28 19:33:37 +02:00
put32 (outptr, ch); \
outptr += 4; \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
}
Update. 2000-06-12 Ulrich Drepper <drepper@redhat.com> * Rules (%.out): Define GCONV_PATH in the environment. * assert/Depend: New file. * iconvdata/Depend: New file. * intl/Depend: New file. * timezone/Makefile (build-testdata): Add GCONV_PATH to environment. * intl/tst-gettext.sh: Likewise. * iconv/Makefile (routines): Add gconv_trans. * iconv/gconv_trans.c: New file. * iconv/gconv.h (struct __gconv_trans_data): New type. (__gconv_fct): New parameter with starting position in output buffer. (__gconv_trans_fct, __gconv_trans_context_fct, __gconv_trans_query_fct, __gconv_trans_init_fct, __gconv_trans_end_fct): New types. (struct __gconv_step): Add new member __trans. * iconv/gconv_int.h: Pretty print prototypes. (gconv_transliterate): New prototype. (__BUILTIN_TRANS): Update for new conversion function interface. * iconv/gconv.c (__gconv): Pass new parameter to conversion function. * iconv/gconv_open.c (__gconv_open): Recognize error handling suffix in names, find appropriate function, and install in the conversion steps it can be used. * iconv/skeleton.c: Add additional parameter for beginning of output buffer. Change calls of downstream functions. * iconv/loop.c: Change loop function interface completely. Pass in step and step_data structure. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * iconv/gconv_simple.c: Update interfaces of functions. Insert appropriate error handling code to use transliteration steps. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * 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: Adjust to new interface of gconv functions. Use DL_CALL_FCT. * 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.
2000-06-12 21:47:50 +02:00
#define LOOP_NEED_FLAGS
Update. 2002-11-30 Bruno Haible <bruno@clisp.org> * iconv/gconv.h (__gconv_btowc_fct): New typedef. (struct __gconv_step): New field __btowc_fct. * wcsmbs/btowc.c (__btowc): Use the __btowc_fct shortcut if possible. * iconv/gconv_int.h (__BUILTIN_TRANSFORM): Renamed from __BUILTIN_TRANS. (__gconv_btwoc_ascii): New declaration. * iconv/gconv_simple.c (BUILTIN_TRANSFORMATION): Add BtowcFct argument. (__gconv_btwoc_ascii): New function. * iconv/gconv_builtin.h: Add BtowcFct argument to all BUILTIN_TRANSFORMATION invocations. * iconv/gconv_conf.c (BUILTIN_TRANSFORMATION): Add BtowcFct argument. * iconv/iconvconfig.c (BUILTIN_TRANSFORMATION): Likewise. * iconv/gconv_builtin.c (map): New field btowc_fct. (BUILTIN_TRANSFORMATION): Add BtowcFct argument. Use it to initialize btowc_fct field. (__gconv_get_builtin_trans): Initialize __btowc_fct field. * iconv/gconv_cache.c (find_module): Initialize __btowc_fct field. * iconv/gconv_db.c (gen_steps, increment_counter): Likewise. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Likewise. * iconv/skeleton.c: Document STORE_REST and FROM_ONEBYTE. (gconv_init): Initialize __btowc_fct field. Undefine EXTRA_LOOP_ARGS and FROM_ONEBYTE at the end. * iconv/loop.c: Document ONEBYTE_BODY. (gconv_btowc, FROM_ONEBYTE): Define if ONEBYTE_BODY is defined. Undefine ONEBYTE_BODY at the end. * iconvdata/8bit-generic.c (ONEBYTE_BODY): New macro. * iconvdata/8bit-gap.c (NONNUL): New macro. (BODY for FROM_LOOP): Use it. (ONEBYTE_BODY): New macro. * iconvdata/isiri-3342.c (HAS_HOLES): Set to 1. (NONNUL): New macro. * iconvdata/ansi_x3.110.c (ONEBYTE_BODY): New macro. * iconvdata/armscii-8.c (ONEBYTE_BODY): New macro. * iconvdata/cp1255.c (ONEBYTE_BODY): New macro. * iconvdata/cp1258.c (ONEBYTE_BODY): New macro. * iconvdata/tcvn5712-1.c (ONEBYTE_BODY): New macro. * iconvdata/big5.c (ONEBYTE_BODY): New macro. * iconvdata/big5hkscs.c (ONEBYTE_BODY): New macro. * iconvdata/euc-cn.c (ONEBYTE_BODY): New macro. * iconvdata/euc-jp.c (ONEBYTE_BODY): New macro. * iconvdata/euc-jisx0213.c (ONEBYTE_BODY): New macro. * iconvdata/euc-kr.c (ONEBYTE_BODY): New macro. * iconvdata/euc-tw.c (ONEBYTE_BODY): New macro. * iconvdata/gbk.c (ONEBYTE_BODY): New macro. * iconvdata/gb18030.c (ONEBYTE_BODY): New macro. * iconvdata/ibm932.c: Include <stdbool.h>. (TRUE, FALSE): Remove macros. (BODY for FROM_LOOP): Remove unused variable rp1. (ONEBYTE_BODY): New macro. (BODY for TO_LOOP): Use bool. * iconvdata/ibm932.h (__ibm932sb_to_ucs4_idx): Remove array. * iconvdata/ibm943.c: Include <stdbool.h>. (TRUE, FALSE): Remove macros. (BODY for FROM_LOOP): Remove unused variable rp1. (ONEBYTE_BODY): New macro. (BODY for TO_LOOP): Use bool. * iconvdata/ibm943.h (__ibm943sb_to_ucs4_idx): Remove array. * iconvdata/iso8859-1.c (ONEBYTE_BODY): New macro. * iconvdata/iso_6937-2.c (ONEBYTE_BODY): New macro. * iconvdata/iso_6937.c (ONEBYTE_BODY): New macro. * iconvdata/johab.c (ONEBYTE_BODY): New macro. * iconvdata/sjis.c (ONEBYTE_BODY): New macro. * iconvdata/shift_jisx0213.c (ONEBYTE_BODY): New macro. * iconvdata/t.61.c (ONEBYTE_BODY): New macro. * iconvdata/uhc.c (ONEBYTE_BODY): New macro. * iconvdata/gbbig5.c: Tweak comment.
2002-12-02 23:39:58 +01:00
#define ONEBYTE_BODY \
{ \
uint32_t ch = to_ucs4[c]; \
if (ch == 0 && c != '\0') \
return WEOF; \
return ch; \
}
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
#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 \
{ \
char tmp[2]; \
Update. 2000-03-28 Ulrich Drepper <drepper@redhat.com> * iconvdata/TESTS: Use UCS-2BE instead of UCS2. * iconv/loop.c: Define get16, get32, put16, and put32 macros to allow as well reading from/writing to unaligned addresses on machines which don't support this in hardware. Use FCTNAME macro to define function name. Include the file a second time for platforms which need special unaligned handling. * iconv/skeleton.c: Define get16u, get32u, put16u, and put32u macros to access potentially unaligned addresses. These macros are intended to be used only outside the loops. (unaligned): New definition. In case the machine can handle unaligned access define as zero. Otherwise as a variable which is initialized as nonzero in case the buffer passed in at runtime is unaligned with respect to the character set encoding involved. Call aligned or unaligned looop functions according to unaligned variable. * iconvdata/8bit-gap.c: Use get16, get32, put16, and put32 instead of direct casting pointer to potentially handle unaligned memory accesses. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.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/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. * locale/programs/simple-hash.c: Little optimizations. Remove K&R prototypes. * malloc/Versions [libc] (GLIBC_2.2): Add mcheck_check_all. * malloc/mcheck.c (mcheck_check_all): Renamed from check_all and made public. * malloc/mcheck.h (mcheck_check_all): Declare. * stdio-common/Makefile (tests): Add tst-obprintf.
2000-03-28 19:33:37 +02:00
uint32_t ch = get32 (inptr); \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
const char *cp; \
\
Update. * iconvdata/8bit-gap.c: Correctly use __builtin_expect. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/gb18030.c: Likewise. * iconvdata/gbbig5.c: Likewise. * iconvdata/gbgbk.c: Likewise. * iconvdata/gbk.c: Likewise. * iconvdata/ibm930.c: Likewise. * iconvdata/ibm932.c: Likewise. * iconvdata/ibm933.c: Likewise. * iconvdata/ibm935.c: Likewise. * iconvdata/ibm939.c: Likewise. * iconvdata/ibm943.c: Likewise. * iconvdata/iso-2022-cn.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. * iconv/gconv_simple.c: Likewise. Convert assert() in real error handling.
2001-08-04 00:09:42 +02:00
if (__builtin_expect (ch >= sizeof (from_ucs4) / sizeof (from_ucs4[0]), \
0)) \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
{ \
switch (ch) \
{ \
case 0x2c7: \
cp = "\xcf\x20"; \
break; \
Update. 2003-12-31 Bruno Haible <bruno@clisp.org> * iconvdata/iso_6937-2.c (to_ucs4): Map 0x7E to U+007E, not U+203E. Map 0xA6 to U+0023. Map 0xA8 to U+00A4. (to_ucs4_comb): Map 0xC5 0x20 to U+00AF. (from_ucs4): Map U+00ED to 0xC2 0x69, not 0xC2 0xE9. (BODY for TO_LOOP): Don't map U+02DC. Map U+02DD to 0xCD 0x20, not 0x00 0x20. Don't map U+2500..U+25E3.
2004-01-19 23:05:36 +01:00
case 0x2d8 ... 0x2db: \
case 0x2dd: \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
{ \
Update. 2003-12-31 Bruno Haible <bruno@clisp.org> * iconvdata/iso_6937-2.c (to_ucs4): Map 0x7E to U+007E, not U+203E. Map 0xA6 to U+0023. Map 0xA8 to U+00A4. (to_ucs4_comb): Map 0xC5 0x20 to U+00AF. (from_ucs4): Map U+00ED to 0xC2 0x69, not 0xC2 0xE9. (BODY for TO_LOOP): Don't map U+02DC. Map U+02DD to 0xCD 0x20, not 0x00 0x20. Don't map U+2500..U+25E3.
2004-01-19 23:05:36 +01:00
static const char map[6] = "\xc6\xc7\xca\xce\x00\xcd"; \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
\
tmp[0] = map[ch - 0x2d8]; \
tmp[1] = ' '; \
cp = tmp; \
} \
break; \
case 0x2014: \
cp = "\xd0"; \
break; \
case 0x2018: \
cp = "\xa9"; \
break; \
case 0x2019: \
cp = "\xb9"; \
break; \
case 0x201c: \
cp = "\xaa"; \
break; \
case 0x201d: \
cp = "\xba"; \
break; \
case 0x2122: \
cp = "\xd4"; \
break; \
case 0x2126: \
cp = "\xe0"; \
break; \
case 0x215b ... 0x215e: \
tmp[0] = 0xdc + (ch - 0x215b); \
tmp[1] = '\0'; \
cp = tmp; \
break; \
case 0x2190 ... 0x2193: \
tmp[0] = 0xac + (ch - 0x2190); \
tmp[1] = '\0'; \
cp = tmp; \
break; \
case 0x266a: \
cp = "\xd5"; \
break; \
default: \
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 14:55:46 +02:00
UNICODE_TAG_HANDLER (ch, 4); \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
/* Illegal characters. */ \
Update. 2000-06-12 Ulrich Drepper <drepper@redhat.com> * Rules (%.out): Define GCONV_PATH in the environment. * assert/Depend: New file. * iconvdata/Depend: New file. * intl/Depend: New file. * timezone/Makefile (build-testdata): Add GCONV_PATH to environment. * intl/tst-gettext.sh: Likewise. * iconv/Makefile (routines): Add gconv_trans. * iconv/gconv_trans.c: New file. * iconv/gconv.h (struct __gconv_trans_data): New type. (__gconv_fct): New parameter with starting position in output buffer. (__gconv_trans_fct, __gconv_trans_context_fct, __gconv_trans_query_fct, __gconv_trans_init_fct, __gconv_trans_end_fct): New types. (struct __gconv_step): Add new member __trans. * iconv/gconv_int.h: Pretty print prototypes. (gconv_transliterate): New prototype. (__BUILTIN_TRANS): Update for new conversion function interface. * iconv/gconv.c (__gconv): Pass new parameter to conversion function. * iconv/gconv_open.c (__gconv_open): Recognize error handling suffix in names, find appropriate function, and install in the conversion steps it can be used. * iconv/skeleton.c: Add additional parameter for beginning of output buffer. Change calls of downstream functions. * iconv/loop.c: Change loop function interface completely. Pass in step and step_data structure. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * iconv/gconv_simple.c: Update interfaces of functions. Insert appropriate error handling code to use transliteration steps. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * 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: Adjust to new interface of gconv functions. Use DL_CALL_FCT. * 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.
2000-06-12 21:47:50 +02:00
cp = NULL; \
Update. 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.
2000-06-19 23:12:06 +02:00
break; \
} \
if (cp == NULL) \
{ \
Update. 2002-05-26 Bruno Haible <bruno@clisp.org> * iconv/loop.c (STANDARD_FROM_LOOP_ERR_HANDLER): New macro. (STANDARD_TO_LOOP_ERR_HANDLER): Renamed from STANDARD_ERR_HANDLER. All callers changed. * iconv/gconv_simple.c (ascii_internal_loop): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (utf8_internal_loop): Likewise. (ucs2_internal_loop): Likewise. (internal_ucs2_loop): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/unicode.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-16.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-32.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/big5.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/iso-2022-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-gap.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-generic.c (BODY for FROM_LOOP): Likewise. * iconvdata/ansi_x3.110.c (BODY for FROM_LOOP): Likewise. * iconvdata/armscii-8.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1255.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1258.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-tw.c (BODY for FROM_LOOP): Likewise. * iconvdata/big5hkscs.c (BODY for FROM_LOOP): Likewise. * iconvdata/gb18030.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbk.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-jp-3.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso646.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937-2.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937.c (BODY for FROM_LOOP): Likewise. * iconvdata/johab.c (BODY for FROM_LOOP): Likewise. * iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/sjis.c (BODY for FROM_LOOP): Likewise. * iconvdata/t.61.c (BODY for FROM_LOOP): Likewise. * iconvdata/uhc.c (BODY for FROM_LOOP): Likewise. * iconvdata/utf-7.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbbig5.c (BODY for FROM_LOOP): Likewise. When ignoring an error, still set result = __GCONV_ILLEGAL_INPUT. (BODY for TO_LOOP): Likewise. * iconvdata/ibm930.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm932.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm933.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm935.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm937.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm939.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm943.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/gbgbk.c (BODY for FROM_LOOP): Update. * iconvdata/iso8859-1.c (BODY for TO_LOOP): Update. * iconvdata/tcvn5712-1.c (BODY for TO_LOOP): Update. 2002-06-28 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/dl-machine.h (elf_machine_load_address): Use local labels in assembler instructions.
2002-06-28 23:23:06 +02:00
STANDARD_TO_LOOP_ERR_HANDLER (4); \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
} \
} \
Update. 2002-05-26 Bruno Haible <bruno@clisp.org> * iconv/loop.c (STANDARD_FROM_LOOP_ERR_HANDLER): New macro. (STANDARD_TO_LOOP_ERR_HANDLER): Renamed from STANDARD_ERR_HANDLER. All callers changed. * iconv/gconv_simple.c (ascii_internal_loop): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (utf8_internal_loop): Likewise. (ucs2_internal_loop): Likewise. (internal_ucs2_loop): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/unicode.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-16.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-32.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/big5.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/iso-2022-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-gap.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-generic.c (BODY for FROM_LOOP): Likewise. * iconvdata/ansi_x3.110.c (BODY for FROM_LOOP): Likewise. * iconvdata/armscii-8.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1255.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1258.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-tw.c (BODY for FROM_LOOP): Likewise. * iconvdata/big5hkscs.c (BODY for FROM_LOOP): Likewise. * iconvdata/gb18030.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbk.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-jp-3.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso646.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937-2.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937.c (BODY for FROM_LOOP): Likewise. * iconvdata/johab.c (BODY for FROM_LOOP): Likewise. * iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/sjis.c (BODY for FROM_LOOP): Likewise. * iconvdata/t.61.c (BODY for FROM_LOOP): Likewise. * iconvdata/uhc.c (BODY for FROM_LOOP): Likewise. * iconvdata/utf-7.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbbig5.c (BODY for FROM_LOOP): Likewise. When ignoring an error, still set result = __GCONV_ILLEGAL_INPUT. (BODY for TO_LOOP): Likewise. * iconvdata/ibm930.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm932.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm933.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm935.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm937.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm939.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm943.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/gbgbk.c (BODY for FROM_LOOP): Update. * iconvdata/iso8859-1.c (BODY for TO_LOOP): Update. * iconvdata/tcvn5712-1.c (BODY for TO_LOOP): Update. 2002-06-28 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/dl-machine.h (elf_machine_load_address): Use local labels in assembler instructions.
2002-06-28 23:23:06 +02:00
else if (__builtin_expect (from_ucs4[ch][0] == '\0', 0) && ch != 0) \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
{ \
/* Illegal characters. */ \
Update. 2002-05-26 Bruno Haible <bruno@clisp.org> * iconv/loop.c (STANDARD_FROM_LOOP_ERR_HANDLER): New macro. (STANDARD_TO_LOOP_ERR_HANDLER): Renamed from STANDARD_ERR_HANDLER. All callers changed. * iconv/gconv_simple.c (ascii_internal_loop): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (utf8_internal_loop): Likewise. (ucs2_internal_loop): Likewise. (internal_ucs2_loop): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/unicode.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-16.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/utf-32.c (BODY for TO_LOOP): Perform error handling like in STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. * iconvdata/big5.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. * iconvdata/iso-2022-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-gap.c (BODY for FROM_LOOP): Likewise. * iconvdata/8bit-generic.c (BODY for FROM_LOOP): Likewise. * iconvdata/ansi_x3.110.c (BODY for FROM_LOOP): Likewise. * iconvdata/armscii-8.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1255.c (BODY for FROM_LOOP): Likewise. * iconvdata/cp1258.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-jp.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/euc-tw.c (BODY for FROM_LOOP): Likewise. * iconvdata/big5hkscs.c (BODY for FROM_LOOP): Likewise. * iconvdata/gb18030.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbk.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-cn.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-jp-3.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso-2022-kr.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso646.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937-2.c (BODY for FROM_LOOP): Likewise. * iconvdata/iso_6937.c (BODY for FROM_LOOP): Likewise. * iconvdata/johab.c (BODY for FROM_LOOP): Likewise. * iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise. * iconvdata/sjis.c (BODY for FROM_LOOP): Likewise. * iconvdata/t.61.c (BODY for FROM_LOOP): Likewise. * iconvdata/uhc.c (BODY for FROM_LOOP): Likewise. * iconvdata/utf-7.c (BODY for FROM_LOOP): Likewise. * iconvdata/gbbig5.c (BODY for FROM_LOOP): Likewise. When ignoring an error, still set result = __GCONV_ILLEGAL_INPUT. (BODY for TO_LOOP): Likewise. * iconvdata/ibm930.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm932.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm933.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm935.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm937.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm939.c (BODY for FROM_LOOP): For error handling use STANDARD_FROM_LOOP_ERR_HANDLER. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/ibm943.c: Include <dlfcn.h> and <stdint.h>. (BODY for FROM_LOOP): Use STANDARD_FROM_LOOP_ERR_HANDLER for error handling. (BODY for TO_LOOP): Here use STANDARD_TO_LOOP_ERR_HANDLER. * iconvdata/gbgbk.c (BODY for FROM_LOOP): Update. * iconvdata/iso8859-1.c (BODY for TO_LOOP): Update. * iconvdata/tcvn5712-1.c (BODY for TO_LOOP): Update. 2002-06-28 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/dl-machine.h (elf_machine_load_address): Use local labels in assembler instructions.
2002-06-28 23:23:06 +02:00
STANDARD_TO_LOOP_ERR_HANDLER (4); \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
} \
else \
cp = from_ucs4[ch]; \
\
*outptr++ = cp[0]; \
/* Now test for a possible second byte and write this if possible. */ \
if (cp[1] != '\0') \
{ \
Use glibc_likely instead __builtin_expect.
2014-02-10 14:45:42 +01:00
if (__glibc_unlikely (outptr >= outend)) \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
{ \
/* The result does not fit into the buffer. */ \
Update. * iconv/gconv.h (__GCONV_IS_LAST, __GCONV_IGNORE_ERRORS): Define. (struct __gconv_step_data): Rename __is_last to __flags. * iconv/gconv_close.c: Change all uses of __is_last. * iconv/skeleton.c: Likewise. * iconvdata/iso-2022-cn.c: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconv/gconv_open.c: Likewise. Avoid unneeded initializations. Recognize IGNORE error handling, set flag, and remove from name. * iconv/loop.c (ignore_errors_p): Define. Add flags parameter to both functions. * iconv/skeleton.c: Pass flags to all conversion functions. * iconv/gconv_simple.c: Add flags parameter to all functions. Don't return error for invald error if ignore flag is set. (ucs4_internal_loop_single): Add missing pointer increment. (internal_ucs4le_loop_single): Likewise. * iconv/iconv_prog.c: Implement handling of -c parameter. * iconvdata/8bit-gap.c: Don't return error for invald error if ignore flag is set. * 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/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/fileops.c: Likewise. * libio/iofwide.c: Likewise. * 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. * iconvdata/ksc5601.h (ksc5601_to_ucs4): Undo *s change in all cases of
2000-06-06 05:16:30 +02:00
--outptr; \
Update. * Versions.def: Add GLIBC_2.2 for libc. * iconv/gconv.h: Make header suitable for inclusion in public header by protecting all names with __. * iconv/gconv.c: Adapt for symbol name changes. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.c: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/iconv_close.c: Likewise. * iconv/iconv_open.c: Likewise. * iconv/loop.c: Likewise. * iconv/skeleton.c: Likewise. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/cns11643.h: Likewise. * iconvdata/cns11643l1.h: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gb2312.h: 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/jis0201.h: Likewise. * iconvdata/jis0208.h: Likewise. * iconvdata/jis0212.h: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/ksc5601.h: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * stdlib/mblen.c: Likewise. * stdlib/mbtowc.c: Likewise. * stdlib/wctomb.c: Likewise. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wchar.h: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * wcsmbs/wcsmbsload.h: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * include/limits.h (MB_LEN_MAX): Increase to 16. * sysdeps/generic/_G_config.h: Define _G_fpos_t as struct. Define _G_iconv_t. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * include/wchar.h: Change mbstate_t to __mbstate_t. * libio/Makefile (routines): Add wfiledoalloc, oldiofgetpos, oldiofgetpos64, oldiofsetpos, oldiofsetpos64, fputwc, fputwc_u, getwc, getwc_u, getwchar, getwchar_u, iofgetws, iofgetws_u, iofputws, iofputws_u, iogetwline, iowpadn, ioungetwc, putwc, putwc_u, putchar, putchar_u, swprintf, vwprintf, wprintf, wscanf, fwscanf, vwscanf, vswprintf, iovswscanf, swscanf, wgenops, wstrops, wfileops, and iofwide. (tests): Add tst_swprintf, tst_wprintf, tst_swscanf, and tst_wscanf. * libio/Versions: Add _IO_fgetpos, _IO_fgetpos64, _IO_fsetpos, _IO_fsetpos64, fgetpos, fgetpos64, fgetwc, fgetwc_unlocked, fgetws, fgetws_unlocked, fputwc, fputwc_unlocked, fputws, fputws_unlocked, fsetpos, fsetpos64, fwide, fwprintf, fwscanf, getwc, getwc_unlocked, getwchar, getwchar_unlocked, putwc, putwc_unlocked, putwchar, putwchar_unlocked, swprintf, swscanf, ungetwc, vfwprintf, vswprintf, vwprintf, vfwscanf, vswscanf, vwscanf, wprintf, and wscanf to GLIBC_2.2 for libc. * libio/libio.h: Define codecvt struct. Define _IO_wide_data. Extend _IO_file contain pointer to codecvt, widedata and mode. (_IO_getwc_unlocked): New macro. (_IO_putwc_unlocked): New macro. (_IO_fwide): New macro. * libio/libioP.h: Add new prototypes and adjust existing declarations. * libio/fileops.c (_IO_new_file_close_it): Reset normal or widedata buffers based on mode. (new_do_write): Set _IO_write_end to _IO_buf_end if stream is wide oriented. (_IO_new_file_overflow): Don't depend only on _IO_CURRENTLY_PUTTING flag to be enough to signal unallocated buffer. For wide oriented stream don't make it linebuffered. Don't use _IO_do_flush, use _IO_new_do_write directly. (_IO_new_file_seekoff): Change return value type to _IO_off64_t. (_IO_file_seek): Likewise. * libio/genops.c (_IO_least_marker): Make global. (__underflow): Orient stream if not already done. (__uflow): Likewise. (_IO_default_seekpos): Change to type _IO_off64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_no_init): New function. Similar to _IO_init but allows to orient in initialization. * libio/iolibio.h: Add prototype for _IO_vswprintf. Change _IO_pos_BAD to use _IO_off64_t. * libio/ftello.c: Use _IO_off_t. For now abort when use with wide char stream. * libio/ftello64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofopncook.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/oldfileops.c: Likewise. * libio/iofgetpos.c: Store state of conversion if necessary. * libio/iofgetpos64.c: Likewise. * libio/iofsetpos.c: Restore conversion state if necessary. * libio/iofsetpos64.c: Likewise. * libio/iofdopen.c: Initialize so that stream can be wide oriented. * libio/iofopen.c: Likewise. * libio/iofopen64.c: Likewise. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/iofputs.c: Orient stream if not already happened. * libio/iofputs_u.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iofwrite_u.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Handle not yet oriented stream. * libio/iosetvbuf.c: Likewise. * libio/oldstdfiles.c: Adjust FILEBUF_LITERAL call. * libio/stdfiles.c: Likewise. * libio/strops.c (_IO_str_overflow): Correctly free buffer after failed allocation. (_IO_str_seekoff): Use _IO_off64_t. * libio/vasprintf.c: Pre-orient stream. * libio/vsnprintf.c: Likewise. * libio/fputwc.c: New file. * libio/fputwc_u.c: New file. * libio/fwprintf.c: New file. * libio/fwscanf.c: New file. * libio/getwc.c: New file. * libio/getwc_u.c: New file. * libio/getwchar.c: New file. * libio/getwchar_u.c: New file. * libio/iofgetws.c: New file. * libio/iofgetws_u.c: New file. * libio/iofputws.c: New file. * libio/iofputws_u.c: New file. * libio/iofwide.c: New file. * libio/iogetwline.c: New file. * libio/ioungetwc.c: New file. * libio/iovswscanf.c: New file. * libio/iowpadn.c: New file. * libio/oldiofgetpos.c: New file. * libio/oldiofgetpos64.c: New file. * libio/oldiofsetpos.c: New file. * libio/oldiofsetpos64.c: New file. * libio/putwc.c: New file. * libio/putwc_u.c: New file. * libio/putwchar.c: New file. * libio/putwchar_u.c: New file. * libio/swprintf.c: New file. * libio/swscanf.c: New file. * libio/tst_swprintf.c: New file. * libio/tst_swscanf.c: New file. * libio/tst_wprintf.c: New file. * libio/tst_wscanf.c: New file. * libio/tst_wscanf.input: New file. * libio/vswprintf.c: New file. * libio/vwprintf.c: New file. * libio/vwscanf.c: New file. * libio/wfiledoalloc.c: New file. * libio/wfileops.c: New file. * libio/wgenops.c: New file. * libio/wprintf.c: New file. * libio/wscanf.c: New file. * libio/wstrops.c: New file. * stdio-common/Makefile (routines): Add _itowa, itowa-digits, vfwprintf, and vfwscanf. * stdio-common/_itoa.c (base_table): Rename to _IO_base_table and make global. * stdio-common/_itowa.c: New file. * stdio-common/_itowa.h: New file. * stdio-common/itoa-digits.c: Minimal optimization. * stdio-common/itowa-digits.c: New file. * stdio-common/printf-parse.h: Allow use in wide character context. * stdio-common/printf-prs.c: Define ISASCII and MBRLEN. * stdio-common/printf.h (printf_info): Add wide bit. * stdio-common/printf_fp.c: Determine from wide bit whether stream is wide oriented or not. * stdio-common/printf_size.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * stdlib/strfmon.c: Call __printf_fp with wide bit cleared. * stdio-common/vfprintf.c: Rewrite to allow use in wide character context. * stdio-common/vfscand.c: Likewise. * stdio-common/vfwprintf.c: New file. * stdio-common/vfwscanf.c: New file. * time/Makefile (routines): Add wcsftime. (tests): Add tst_wcsftime. * time/Versions: Add wcsftime to GLIBC_2.2 for libc. * time/strftime.c: Make usable as wcsftime. * time/wcsftime.c: New file. * time/tst_wcsftime.c: New file. * wcsmbs/Makefile (routines): Add wmempcpy and wcschrnul. * wcsmbs/Versions: Add wmempcpy and wcschrnul to GLIBC_2.2 for libc. * wcsmbs/wcschrnul.c: New file. * wcsmbs/wmemcpy.c: New file. * wcsmbs/wmemcpy.c: Rename to __wmemcpy and make wmemcpy weak alias. * wcsmbs/wmemmove.c: Likewise for wmemmove. * manual/stdio.texi: Document is_char and wide element if printf_info. * manual/time.texi: Document wcsftime. * include/wchar.h: Add prototypes for __wmemcpy, __wmempcpy, __wmemmove, __wcschrnul, and __vfwscanf. * locale/langinfo.h: Add new LC_TIME entries for wchar_t data. * locale/C-time.c: Adapt for above change. * locale/categories.def: Likewise. * locale/localeinfo.h: Likewise. * localedata/Makefile: Don't run tests for now.
1999-06-17 00:55:47 +02:00
result = __GCONV_FULL_OUTPUT; \
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
break; \
} \
*outptr++ = cp[1]; \
} \
\
inptr += 4; \
}
Update. 2000-06-12 Ulrich Drepper <drepper@redhat.com> * Rules (%.out): Define GCONV_PATH in the environment. * assert/Depend: New file. * iconvdata/Depend: New file. * intl/Depend: New file. * timezone/Makefile (build-testdata): Add GCONV_PATH to environment. * intl/tst-gettext.sh: Likewise. * iconv/Makefile (routines): Add gconv_trans. * iconv/gconv_trans.c: New file. * iconv/gconv.h (struct __gconv_trans_data): New type. (__gconv_fct): New parameter with starting position in output buffer. (__gconv_trans_fct, __gconv_trans_context_fct, __gconv_trans_query_fct, __gconv_trans_init_fct, __gconv_trans_end_fct): New types. (struct __gconv_step): Add new member __trans. * iconv/gconv_int.h: Pretty print prototypes. (gconv_transliterate): New prototype. (__BUILTIN_TRANS): Update for new conversion function interface. * iconv/gconv.c (__gconv): Pass new parameter to conversion function. * iconv/gconv_open.c (__gconv_open): Recognize error handling suffix in names, find appropriate function, and install in the conversion steps it can be used. * iconv/skeleton.c: Add additional parameter for beginning of output buffer. Change calls of downstream functions. * iconv/loop.c: Change loop function interface completely. Pass in step and step_data structure. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * iconv/gconv_simple.c: Update interfaces of functions. Insert appropriate error handling code to use transliteration steps. Remove optimization for BODY with NEED_LENGTH_TEST == 0. * 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: Adjust to new interface of gconv functions. Use DL_CALL_FCT. * 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.
2000-06-12 21:47:50 +02:00
#define LOOP_NEED_FLAGS
Update. 1998-09-11 Ulrich Drepper <drepper@cygnus.com> * iconvdata/Makefile (modules): Add CSN_369103, CWI, DEC-MCS, ECMA-CYRILLIC, GOST_19768-74, GREEK-CCITT, GREEK7, GREEK7-OLD, INIS, INIS-8, INIS-CYRILLIC, ISO_6937-2, ISO_2033, ISO_5427, ISO_5427-EXT, and ISO_5428. Define *-routines variables for new modules. (distribute): Add .c files for new modules. (awk-generated-headers): Add csn_369103.h, cwi.h, dec-mcs.h, ecma-cyrillic.h, gost_19768-74.h, greek-ccitt.h, greek7.h, greek7-old.h, inis.h, inis-8.h, inis-cyrillic.h, iso_2033.h, iso_5427.h, iso_5427-ext.h, and iso_5428.h. Add rules for hedaer generation. * iconvdata/gconv-modules: Add entries for new modules. * iconvdata/csn_369103.c: New file. * iconvdata/cwi.c: New file. * iconvdata/dec-mcs.c: New file. * iconvdata/ecma-cyrillic.c: New file. * iconvdata/gost_19768-74.c: New file. * iconvdata/greek-ccitt.c: New file. * iconvdata/greek7-old.c: New file. * iconvdata/greek7.c: New file. * iconvdata/inis-8.c: New file. * iconvdata/inis-cyrillic.c: New file. * iconvdata/inis.c: New file. * iconvdata/iso6937-2.c: New file. * iconvdata/iso_2033.c: New file. * iconvdata/iso_5427-ext.c: New file. * iconvdata/iso_5427.c: New file. * iconvdata/iso_5428.c: New file. * iconvdata/iso6937.c (from_ucs4): Correct 0x80, 0x81, and 0xb9 entries. Convert U02dd correctly. * sysdeps/unix/sysv/linux/Makefile [subdir==misc] (sysdep_headers): Remove sys/debugreg.h. * sysdeps/unix/sysv/linux/i386/Makefile [subdir==misc] (sysdep_headers): Add sys/debugreg.h.
1998-09-11 17:55:01 +02:00
#include <iconv/loop.c>
/* Now define the toplevel functions. */
#include <iconv/skeleton.c>