update third party lib : libiconv-1.10

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14422 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2005-10-19 08:42:03 +00:00
parent 42f724a7f3
commit 94fa227876
206 changed files with 23877 additions and 17803 deletions

View File

@ -2,7 +2,7 @@
Version 2, June 1991 Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc. Copyright (C) 1991 Free Software Foundation, Inc.
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
@ -464,8 +464,8 @@ convey the exclusion of warranty; and each file should have at least the
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02111-1307, USA MA 02110-1301, USA
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.

View File

@ -1,3 +1,710 @@
2005-07-08 Bruno Haible <bruno@clisp.org>
* Version 1.10 released.
2005-07-08 Bruno Haible <bruno@clisp.org>
* m4/libtool.m4 (postinstall_cmds) [cygwin,mingw,pw32]: Make DLL
executable after installing it.
2005-07-08 Bruno Haible <bruno@clisp.org>
* configure.in: Bump version number.
* include/iconv.h.in (_LIBICONV_VERSION): Likewise.
* windows/iconv.rc: Likewise.
* lib/Makefile.in (LIBICONV_VERSION_INFO): Bump to 5:0:3.
2005-07-05 Bruno Haible <bruno@clisp.org>
* Makefile.devel (ACLOCAL): New variable.
(aclocal.m4): Use it.
2005-07-05 Bruno Haible <bruno@clisp.org>
* m4/relocatable.m4 (AC_RELOCATABLE): On mingw, simply set
SET_RELOCATABLE to a trivial value.
2004-08-08 Bruno Haible <bruno@clisp.org>
* srclib/progreloc.c (xstrdup): Define as strdup if no xmalloc should
be used.
2004-04-28 Bruno Haible <bruno@clisp.org>
* srclib/progreloc.c (ISSLASH, IS_PATH_WITH_DIR, FILESYSTEM_PREFIX_LEN):
Treat Cygwin like Windows, since it now accepts Windows pathnames.
2005-06-09 Bruno Haible <bruno@clisp.org>
* Makefile.in (mkinstalldirs): Use build-aux/ instead of autoconf/.
* lib/Makefile.in (mkinstalldirs): Likewise.
* src/Makefile.in (mkinstalldirs): Likewise.
* man/Makefile.in (mkinstalldirs): Likewise.
2005-06-08 Bruno Haible <bruno@clisp.org>
* srclib/canonicalize.c (__realpath): Avoid gcc warnings on platforms
that don't support symbolic links.
2005-06-08 Bruno Haible <bruno@clisp.org>
* srclib/binary-io.h (fileno): Undefine before defining it. Avoids a
gcc warning on mingw.
2005-05-22 Bruno Haible <bruno@clisp.org>
Implement and document BIG5-2003.
* lib/big5_2003.h: New file.
* lib/converters.h: Include it.
* lib/encodings_extra.def (BIG5-2003): New encoding.
* README, man/iconv_open.3: Add BIG5-2003.
* tests/Makefile.in (check-extra-yes): Check BIG5-2003.
* tests/BIG5-2003.TXT: New file.
2005-05-21 Bruno Haible <bruno@clisp.org>
Add EURO SIGN to EUC-TW converter.
* lib/cns11643_1.h (cns11643_1_2uni_page42): Add entry for 0x14242.
(cns11643_1_mbtowc): Update.
* lib/cns11643_inv.h (cns11643_inv_2charset): Add entry for 0x20AC.
(cns11643_inv_uni2indx_page*): Update.
* lib/dec_hanyu.h (dec_hanyu_mbtowc, dec_hanyu_wctomb): Consider only
part of row 42.
* tests/EUC-TW.TXT: Add entry for 0x20AC.
* tests/EUC-TW.IRREVERSIBLE.TXT: Likewise.
2005-05-03 Bruno Haible <bruno@clisp.org>
* tools/Makefile (ALL): Add pt154.h.
(pt154.h): New rule.
* lib/encodings.def: Add PT154.
* lib/pt154.h: New file.
* lib/converters.h: Include it.
* README, man/iconv_open.3: Add PT154.
* NOTES: Mention PT154.
* tests/PT154.TXT: New file.
* tests/Makefile.in (check): Also test PT154.
* tests/Makefile.msvc (check): Likewise.
* tests/Makefile.os2 (check): Likewise.
2005-03-29 Bruno Haible <bruno@clisp.org>
Rename libiconv_plug.so to preloadable_libiconv.so.
* configure.in (PLUGLIB): Set to preloadable_libiconv.so instead of
libiconv_plug.so.
* lib/Makefile.in (preloadable_libiconv.so): Renamed from
libiconv_plug.so.
(preloadable_libiconv_linux.so): Renamed from libiconv_plug_linux.so.
(preloadable_libiconv_solaris.so): Renamed from
libiconv_plug_solaris.so.
(preloadable_libiconv_osf.so): Renamed from libiconv_plug_osf.so.
(clean): Update.
* README: Update.
2005-03-29 Bruno Haible <bruno@clisp.org>
Implement and document ATARIST.
* tools/Makefile (ALL): Add atarist.h.
(atarist.h): New rule.
* lib/atarist.h: New file.
* lib/converters.h: Include it.
* lib/encodings_extra.def (ATARIST): New encoding.
* README, man/iconv_open.3: Add ATARIST.
* tests/Makefile.in (check-extra-yes): Check ATARIST.
* tests/ATARIST.TXT: New file.
2005-03-22 Bruno Haible <bruno@clisp.org>
* build-aux: New directory, renamed from autoconf.
* configure.in (AC_CONFIG_AUX_DIR): Use build-aux.
2005-03-16 Bruno Haible <bruno@clisp.org>
* m4/stdint.m4 (gl_STDINT_H): Define HAVE_LONG_LONG_64BIT instead of
HAVE_LONGLONG_64BIT.
* srclib/stdint_.h: Use HAVE_LONG_LONG_64BIT instead of
HAVE_LONGLONG_64BIT.
* srclib/Makefile.am (stdint.h): Likewise.
2005-03-14 Bruno Haible <bruno@clisp.org>
* Makefile.devel (aclocal.m4): Depend also on allocsa.m4, eealloc.m4,
extensions.m4, intmax.m4, inttypes.m4, longdouble.m4, longlong.m4,
printf-posix.m4, readlink.m4, signed.m4, ssize_t.m4, stdint.m4,
wchar_t.m4, wint_t.m4.
2005-03-13 Bruno Haible <bruno@clisp.org>
Make stdout error checking reliable, also when writing to a NFS file.
* src/iconv.c (main): Check the return value of fclose(stdout).
* lib/genaliases.c (main): Likewise.
* lib/genaliases2.c (main): Likewise.
* lib/genflags.c (main): Likewise.
* lib/gentranslit.c (main): Likewise.
* tests/genutf8.c (main): Likewise.
* tests/table-from.c (main): Likewise.
* tests/table-to.c (main): Likewise.
2005-03-13 Bruno Haible <bruno@clisp.org>
* src/iconv.c (convert): Before outputting an error message, flush
stdout and output a newline if suitable.
2005-03-13 Bruno Haible <bruno@clisp.org>
Improved error messages.
* srclib/width.c: New file, from GNU clisp.
* srclib/uniwidth.h: New file, from GNU clisp with modifications.
* srclib/unitypes.h: New file, from GNU clisp with modifications.
* srclib/cjk.h: New file, from GNU clisp.
* srclib/streq.h: New file, from GNU clisp.
* srclib/stdint_.h: New file, from gnulib.
* m4/stdint.m4: New file, from gnulib.
* m4/inttypes.m4: New file, from gnulib.
* srclib/Makefile.am: Add gnulib module 'stdint' snippet.
(BUILT_SOURCES): New variable.
(libicrt_a_SOURCES): Add width.c, uniwidth.h, unitypes.h, cjk.h,
streq.h.
* configure.in: Invoke gl_STDINT_H.
* src/iconv.c: Include cjk.h, uniwidth.h.
(line, column, cjkcode): New variables.
(update_line_column): New function.
(convert): Initialize line and column. In all error message, show also
the line and column number.
(main): Initialize cjkcode. Set up hooks to call update_line_column.
2005-03-13 Bruno Haible <bruno@clisp.org>
* include/iconv.h.in (iconv_canonicalize): New declaration.
* lib/genaliases.c (emit_encoding): Take two output streams as
arguments. To the second stream, emit a shell command for extracting
offsets into the gperf generated string pool.
(main): Write the shell commands into file descriptors 3 and 4.
* lib/genaliases2.c (emit_encoding): Take two output streams as
arguments. To the second stream, emit an expression for the offset
into the string pool.
(main): Write the offsets into file descriptor 3.
* Makefile.devel (lib/aliases.gperf): Remove target.
(lib/aliases.h): Generate lib/aliases.gperf temporarily. Generate also
lib/canonical.h and lib/canonical_local.h.
(lib/aliases_aix.h): Generate also lib/canonical_aix.h.
(lib/aliases_osf1.h): Generate also lib/canonical_osf1.h.
(lib/aliases_dos.h): Generate also lib/canonical_dos.h.
(lib/aliases_extra.h): Generate also lib/canonical_extra.h.
* lib/iconv.c (stringpool2): Provide default definition when it doesn't
exist.
(all_canonical): New array.
(iconv_canonicalize): New function.
2005-03-13 Bruno Haible <bruno@clisp.org>
* include/iconv.h.in (iconv_unicode_char_hook, iconv_wide_char_hook,
iconv_hooks): New types.
(ICONV_SET_HOOKS): New macro.
* lib/converters.h (struct conv_struct): Add field 'hooks'.
* lib/iconv.c (iconv_open): Initialize hooks to NULL.
(iconvctl): Handle ICONV_SET_HOOKS.
* lib/loop_unicode.h (unicode_loop_convert, unicode_loop_reset): After
conversion of a character, call the uc_hook.
* lib/loop_wchar.h (wchar_id_loop_convert): After every character, call
the wc_hook.
* lib/genflags.c (iconv_hooks): Provide a dummy definition.
2005-02-05 Bruno Haible <bruno@clisp.org>
* src/iconv.c (main): In case of unsupported encodings, show a hint
towards "iconv -l".
2005-01-06 Bruno Haible <bruno@clisp.org>
* lib/Makefile.msvc (CFLAGS): Define also INSTALLPREFIX.
* lib/Makefile.vms (DEFS): Likewise.
Reported by Troels Walsted Hansen <Troels.W.Hansen@fast.no>.
2005-01-05 Bruno Haible <bruno@clisp.org>
* autoconf/config.rpath: Update from GNU gettext.
2005-01-05 Bruno Haible <bruno@clisp.org>
Assume automake-1.9.
* Makefile.devel (AUTOMAKE): Assume automake-1.9.
2005-01-05 Bruno Haible <bruno@clisp.org>
* m4/libtool.m4: Update from GNU gettext, based on libtool-1.5.10.
* autoconf/ltmain.sh: Update from GNU gettext, based on libtool-1.5.10.
2004-11-11 Bruno Haible <bruno@clisp.org>
* lib/iconv.c (iconv_open): Accept the suffixes //TRANSLIT and //IGNORE
in arbitrary order.
Reported by Lukas Gebauer <gebauerl@mlp.cz>.
2004-09-21 Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>
* djgpp/config.bat: Update.
* djgpp/config.sed: Update.
* djgpp/config.site: Update.
* djgpp/edtest.bat: Update.
* djgpp/fnchange.in: Update.
* djgpp/Makefile.maint: Update.
* djgpp/makefile.sed: Update.
* djgpp/README.in: Update.
* djgpp/sources.sed: Update.
* djgpp/translit-check.sed: Update.
2004-08-25 Bruno Haible <bruno@clisp.org>
* m4/libtool.m4: Update from GNU gettext, based on libtool-1.5.6.
* autoconf/ltmain.sh: Update from GNU gettext, based on libtool-1.5.6.
2004-07-31 Bruno Haible <bruno@clisp.org>
Update to JISX 0213 plane 1 to 2004 version (ISO-IR-233).
* tools/Makefile (jisx0213.h): Bump version number.
* tools/JISX0213.TXT: Change mappings U+2015 -> U+2014,
U+2299 -> U+29BF, and add 10 new characters.
* tools/cjk_tab_to_h.c (output_title): Bump year.
(do_jisx0213): Update comments. Emit a conditional 'inline'.
* lib/jisx0213.h: Regenerated.
* lib/iso2022_jp3.h (iso2022_jp3_mbtowc): Accept escape sequence
ESC $ ( Q as a synonym of ESC $ ( O.
(iso2022_jp3_wctomb): Emit ESC $ ( Q instead of ESC $ ( O.
* tests/EUC-JISX0213.TXT: Change mappings U+2015 -> U+2014,
U+2299 -> U+29BF, and add 10 new characters.
* tests/SHIFT_JISX0213.TXT: Likewise.
* tests/ISO-2022-JP-3-snippet: Update.
* tests/ISO-2022-JP-3-snippet.UTF-8: Update.
2004-07-22 Bruno Haible <bruno@clisp.org>
* lib/encodings.def (ISO-8859-7): Add alias ISO_8859-7:2003.
* tools/Makefile (iso8859_7.h): Use conversion table from 2003.
* lib/iso8859_7.h: Add mappings for 0xa4, 0xa5, 0xaa.
* tests/ISO-8859-7.TXT: Update to ISO_8859-7:2003.
2004-07-22 Bruno Haible <bruno@clisp.org>
* tools/Makefile (ALL): Add iso8859_11.h.
(iso8859_11.h): New rule.
* lib/encodings.def: Add ISO-8859-11.
* lib/iso8859_11.h: New file.
* lib/converters.h: Include it.
* tests/ISO-8859-11.TXT: New file.
* tests/Makefile.in (check): Also test ISO-8859-11.
* tests/Makefile.msvc (check): Likewise.
* tests/Makefile.os2 (check): Likewise.
2004-07-17 Bruno Haible <bruno@clisp.org>
* src/iconv.c (main): Terminate option parsing when option -- is seen.
Reported by Len Lattanzi <zardoz@users.sourceforge.net>.
2004-03-05 Bruno Haible <bruno@clisp.org>
* src/Makefile.in (install): Make DESTDIR work on HP-UX.
Reported by Bob Proulx <box@proulx.com>.
2004-02-19 Bruno Haible <bruno@clisp.org>
* lib/vietcomb.h (viet_comp_table_data): Un-uncomment 0x00D5, 0x00F5,
0x0168, 0x0169. Needed for TCVN-5712 but not for CP1258.
(viet_comp_table0301_len): Increment by 4.
* lib/cp1255.h (cp1255_mbtowc): Don't delay the handling of characters
which are not entries in cp1255_comp_table_data.
* lib/cp1258.h (cp1258_comp_bases): New array.
(cp1258_mbtowc): Don't delay the handling of characters which are not
relevant entries in viet_comp_table_data.
* lib/tcvn.h (tcvn_comp_bases): New array.
(tcvn_mbtowc): Don't delay the handling of characters which are not
relevant entries in viet_comp_table_data.
Reported by Alain Bench <veronatif@free.fr>.
2004-02-02 Perry Rapp <lifelines_3_0_18@hotmail.com>
Bruno Haible <bruno@clisp.org>
* man/iconvctl.3: New file.
* man/iconv.3: Refer to it in "See also".
* man/iconv_open.3: Likewise.
2004-01-24 Bruno Haible <bruno@clisp.org>
* srclib/progreloc.c (xstrdup): Define as strdup if no xmalloc should
be used.
2004-01-20 Bruno Haible <bruno@clisp.org>
Upgrade from gettext-0.14.
* configure.in: Call gl_USE_SYSTEM_EXTENSIONS. Call AM_STDBOOL_H
instead of gt_STDBOOL_H. Provide a definition for DLL_VARIABLE.
* srclib/Makefile.am (libicrt_a_SOURCES): Add allocsa.h, allocsa.c,
xalloc.h. Remove xmalloc.h.
(libicrt_a_LIBADD): Remove @ALLOCA@.
* srclib/Makefile.msvc (OBJECTS): Add allocsa.obj.
(allocsa.obj): New rule.
* srclib/Makefile.vms (OBJECTS): Add allocsa.obj.
(allocsa.obj): New rule.
* Makefile.devel (config.h_vms): Set MALLOC_0_IS_NONNULL to 0.
(config.h.msvc): Set MALLOC_0_IS_NONNULL to 1.
lib/:
2003-10-09 Bruno Haible <bruno@clisp.org>
* lib/relocatable.c: Include xalloc.h instead of xmalloc.h.
2003-08-01 Bruno Haible <bruno@clisp.org>
* lib/relocatable.c (find_shared_library_fullname): Disable the code on
Linux/libc5. Reported by Alain Guibert <derogaton+bgli@oreka.com>.
2003-06-22 Bruno Haible <bruno@clisp.org>
* lib/relocatable.c (compute_curr_prefix): Comment out this function in
the case when it is not used.
Reported by Pavel Roskin <proski@gnu.org>.
m4/:
* m4/gettext.m4: Upgrade from GNU gettext. Many changes.
* m4/po.m4: Likewise.
* m4/readlink.m4: New file, from GNU gettext.
2003-11-30 Bruno Haible <bruno@clisp.org>
* m4/allocsa.m4: New file.
* m4/eealloc.m4: New file.
* m4/setenv.m4 (gl_PREREQ_SETENV): Require gl_ALLOCSA instead of
AC_FUNC_ALLOCA.
2003-10-21 Bruno Haible <bruno@clisp.org>
* m4/canonicalize.m4 (gl_PREREQ_CANONICALIZE): Also test for
readlink().
2003-08-24 Bruno Haible <bruno@clisp.org>
* m4/relocatable.m4 (AC_RELOCATABLE): Use $(host) instead of @host@,
since the substitution of @host@ may occur before the substitution of
@SET_RELOCATABLE@.
2003-08-23 Bruno Haible <bruno@clisp.org>
* stdbool.m4: Replace with the version from gnulib, without
AC_HEADER_STDBOOL.
2003-08-08 Paul Eggert <eggert@twinsun.com>
* m4/extensions.m4: New file.
* m4/unlocked-io.m4 (jm_FUNC_GLIBC_UNLOCKED_IO):
Require gl_USE_SYSTEM_EXTENSIONS rather than AC_GNU_SOURCE.
2003-07-01 Bruno Haible <bruno@clisp.org>
* m4/ssize_t.m4 (gt_TYPE_SSIZE_T): Don't include <unistd.h>.
<sys/types.h> should be sufficient.
Reported by Paul Eggert.
2003-07-01 Bruno Haible <bruno@clisp.org>
* m4/lib-prefix.m4 (AC_LIB_ARG_WITH): Avoid "duplicated macro" error
from aclocal-1.4-p4.
Reported by Luke Schierer <lschiere@rackspace.com> and
Michael C. Toren <mct@toren.net>.
2003-07-01 Paul Eggert <eggert@twinsun.com>
* m4/xreadlink.m4 (gl_XREADLINK): Don't check for sys/types.h, since
xreadlink.c now includes it unconditionally.
2003-06-17 Paul Eggert <eggert@twinsun.com>
* m4/lib-ld.m4 (AC_LIB_PROG_LD_GNU, AC_LIB_PROG_LD): Don't use egrep,
for portability to POSIX 1003.1-2001. Backported from libtool-1.5.
2003-05-28 Paul Eggert <eggert@twinsun.com>
* m4/pathmax.m4 (gl_PATHMAX): Don't check for limits.h.
* m4/xreadlink.m4 (gl_XREADLINK): Likewise.
2002-12-24 Bruno Haible <bruno@clisp.org>
* m4/setenv.m4 (gt_FUNC_SETENV): New macro.
(gt_CHECK_VAR_DECL): Fix quoting error that led to infinite loop in m4
when invoked twice.
(gt_PREREQ_SETENV, gt_PREREQ_UNSETENV): New macros, replacing old
gt_FUNC_SETENV.
srclib/:
2003-11-30 Bruno Haible <bruno@clisp.org>
* srclib/alloca.c: Remove file.
2003-11-30 Bruno Haible <bruno@clisp.org>
Safer stack allocation.
* srclib/allocsa.h: New file.
* srclib/allocsa.c: New file.
* canonicalize.c: Include allocsa.h.
(__realpath): Use allocsa instead of alloca. Don't clobber errno right
before returning NULL.
* srclib/relocwrapper.c: Indirectly depends on allocsa.
* srclib/setenv.c: Include allocsa.h.
(alloca): Remove fallback definition.
(freea): Remove macro.
(__add_to_environ) [!_LIBC]: Use allocsa instead of alloca. Use freesa
instead of freea.
2003-11-17 Bruno Haible <bruno@clisp.org>
* srclib/canonicalize.c: #undef realpath after <config.h> but before
the system includes, so as to avoid a prototype clash on Solaris 2.5.1.
Reported by Warren L. Dodge <warrend@mdhost.cse.tek.com>.
2003-10-21 Bruno Haible <bruno@clisp.org>
* srclib/canonicalize.c (lstat): Define as an alias to 'stat' on
systems without symbolic links.
2003-10-17 Bruno Haible <bruno@clisp.org>
* srclib/binary-io.h: Avoid warnings on Cygwin.
2003-10-09 Bruno Haible <bruno@clisp.org>
* srclib/xalloc.h: Renamed from xmalloc.h.
* srclib/progreloc.c: Include xalloc.h instead of xmalloc.h.
* srclib/relocatable.c: Likewise.
* srclib/xmalloc.c: Likewise.
* srclib/xreadlink.c: Likewise.
* srclib/xstrdup.c: Likewise.
2003-09-12 Paul Eggert <eggert@twinsun.com>
* srclib/progreloc.c (get_full_program_name): Define via prototype.
2003-09-12 Paul Eggert <eggert@twinsun.com>
* srclib/setenv.c (clearenv): Define via prototype.
2003-09-10 Bruno Haible <bruno@clisp.org>
* srclib/setenv.c: Include <stdlib.h> and <string.h> unconditionally.
* srclib/unsetenv.c: Likewise.
2003-08-28 Bruno Haible <bruno@clisp.org>
* srclib/binary-io.h: Undefine O_BINARY before defining it. This avoids
a warning on QNX, which defines O_BINARY to 000000.
2003-08-24 Bruno Haible <bruno@clisp.org>
* srclib/binary-io.h: Include <stdio.h>, to avoid a compilation error
when MSVC7 <stdio.h> is included later.
2003-08-24 Bruno Haible <bruno@clisp.org>
* srclib/error.h: Use ANSI C "..." declarations when compiling with
MSVC, even though it doesn't define __STDC__ by default.
* srclib/error.c: Use <stdarg.h> when compiling with MSVC, even though
it doesn't define __STDC__ by default.
2003-08-24 Bruno Haible <bruno@clisp.org>
Support for building DLLs on Windows.
* srclib/error.h (error_print_progname, error_message_count,
error_one_per_line): Add DLL_VARIABLE attribute.
* srclib/progname.h (program_name): Likewise.
2003-08-24 Bruno Haible <bruno@clisp.org>
* srclib/progname.h: Make this file includable in C++ mode: add extern
"C".
* srclib/relocatable.h: Likewise.
* srclib/xmalloc.h: Likewise.
2003-08-22 Bruno Haible <bruno@clisp.org>
* srclib/progname.h (error_with_progname, maybe_print_progname): Remove
declarations.
* srclib/progname.c (error_with_progname): Remove variable.
(maybe_print_progname): Remove function.
2003-08-01 Bruno Haible <bruno@clisp.org>
* srclib/relocatable.c (find_shared_library_fullname): Disable the code
on Linux/libc5. Reported by Alain Guibert <derogaton+bgli@oreka.com>.
2003-07-01 Paul Eggert <eggert@twinsun.com>
* srclib/xreadlink.c: Include <sys/types.h> unconditionally, instead of
having it depend on HAVE_SYS_TYPES_H.
2003-06-23 Bruno Haible <bruno@clisp.org>
Avoid compilation units that are empty after preprocessing.
* srclib/canonicalize.c: Add dummy declaration.
* srclib/strerror.c: Likewise.
* srclib/error.c: Include <stdio.h> even if there's nothing to be
compiled.
2003-06-22 Bruno Haible <bruno@clisp.org>
* srclib/relocatable.c (compute_curr_prefix): Comment out this function
in the case when it is not used.
Reported by Pavel Roskin <proski@gnu.org>.
2003-05-28 Paul Eggert <eggert@twinsun.com>
* srclib/pathmax.h: Include <limits.h> without checking for
HAVE_LIMITS_H.
* srclib/xreadlink.c: Likewise.
2004-01-20 Bruno Haible <bruno@clisp.org>
Assume automake-1.8.
* Makefile.devel (AUTOCONF, AUTOHEADER): Assume autoconf-2.59.
(AUTOMAKE): Assume automake-1.8.
* Makefile.in (am--refresh): New target.
2004-01-23 Bruno Haible <bruno@clisp.org>
* Version 1.9.2 released.
2004-01-23 Bruno Haible <bruno@clisp.org>
* tests/table-from.c: Include binary-io.h.
(main): Switch stdout to binary mode.
* tests/table-to.c: Include binary-io.h.
(main): Switch stdout to binary mode.
* tests/genutf8.c: Include binary-io.h.
(main): Switch stdout to binary mode.
* tests/Makefile.in (INCLUDES): Also look in srclib.
(check): Pass INCLUDES when compiling genutf8.c.
* tests/Makefile.os2 (INCLUDES): Also look in srclib.
(genutf8.exe): Pass INCLUDES when compiling genutf8.c.
* tests/Makefile.msvc (INCLUDES): Also look in srclib.
(check): Pass INCLUDES when compiling genutf8.c.
2004-01-21 Bruno Haible <bruno@clisp.org>
* src/iconv.c (force_binary): Remove variable.
(usage): Don't document --binary any more.
(convert, main): Always switch to binary mode.
* tests/check-stateful.bat: Remove --binary option.
* tests/check-translit.bat: Likewise.
* tests/check-stateful.cmd: Likewise.
* tests/check-translit.cmd: Likewise.
* djgpp/stateful-check.sed: Remove MODE variable.
* djgpp/translit-check.sed: Likewise.
2004-01-21 Bruno Haible <bruno@clisp.org>
* man/iconv.3: Fix description of return value in case of error.
Reported by Jonathan Wakely <redi@users.sf.net>.
2003-09-12 Paul Eggert <eggert@twinsun.com>
* srclib/progreloc.c (get_full_program_name): Define via prototype.
2003-08-15 Bruno Haible <bruno@clisp.org>
* Makefile.devel (lib/translit.h): Add ulimit command so that the
gentranslit program gets the stack it needs. Many Linux distributions
allow only 8 MB of stack by default.
2003-08-01 Bruno Haible <bruno@clisp.org>
* lib/relocatable.c (find_shared_library_fullname): Disable the code on
Linux/libc5.
* srclib/relocatable.c (find_shared_library_fullname): Likewise.
Reported by Alain Guibert <derogaton+bgli@oreka.com>.
2003-07-02 Bruno Haible <bruno@clisp.org>
* m4/lib-ld.m4: Update from GNU gettext.
* m4/lib-prefix.m4: Update from GNU gettext.
* m4/gettext.m4: Update from GNU gettext.
* m4/intmax.m4: New file, from GNU gettext.
* m4/longdouble.m4: New file, from GNU gettext.
* m4/longlong.m4: New file, from GNU gettext.
* m4/printf-posix.m4: New file, from GNU gettext.
* m4/signed.m4: New file, from GNU gettext.
* m4/wchar_t.m4: New file, from GNU gettext.
* m4/wint_t.m4: New file, from GNU gettext.
* m4/pathmax.m4: Update from GNU gettext and gnulib.
* m4/ssize_t.m4: Update from GNU gettext and gnulib.
* m4/xreadlink.m4: Update from GNU gettext and gnulib.
* m4/readlink.m4: New file, from gnulib.
* autoconf/install-reloc: Update from GNU gettext.
* srclib/stdbool_.h: Renamed from srclib/stdbool.h.in.
* srclib/readlink.c: New file, from GNU gettext and gnulib.
* srclib/Makefile.am (LIBADD_SOURCE): Add readlink.c.
(EXTRA_DIST, stdbool.h): Use stdbool_.h instead of stdbool.h.in.
* configure.in: Invoke gl_FUNC_READLINK.
2003-06-22 Bruno Haible <bruno@clisp.org>
* src/Makefile.in (install): Link with the already installed library.
This fixes a link error on Solaris.
Reported by Paul Eggert.
2003-06-08 Bruno Haible <bruno@clisp.org>
* srclib/canonicalize.c (__getcwd) [VMS]: Pass 3 arguments to getcwd.
2003-05-02 Bruno Haible <bruno@clisp.org>
Support for libtool-1.5.
* srclib/progname.c (set_program_name): Remove a leading
"<dirname>/.libs/lt-" or "<dirname>/.libs/", not only "lt-".
2003-06-23 Bruno Haible <bruno@clisp.org>
Avoid compilation units that are empty after preprocessing.
* srclib/canonicalize.c: Add dummy declaration.
* srclib/strerror.c: Likewise.
* srclib/error.c: Include <stdio.h> even if there's nothing to be
compiled.
2003-06-22 Bruno Haible <bruno@clisp.org>
Portability to mingw32.
* m4/ssize_t.m4: New file, from GNU gettext.
* m4/xreadlink.m4 (gl_XREADLINK): Require gt_TYPE_SSIZE_T.
Reported by Jeff Bonggren <jbon@cfl.rr.com>.
2003-06-22 Bruno Haible <bruno@clisp.org>
Portability to mingw32.
* lib/relocatable.c [WIN32]: Include <windows.h>.
* srclib/relocatable.c: Likewise.
Reported by Jeff Bonggren <jbon@cfl.rr.com>.
2003-06-22 Bruno Haible <bruno@clisp.org>
* lib/relocatable.c (compute_curr_prefix): Comment out this function in
the case when it is not used.
* srclib/relocatable.c (compute_curr_prefix): Likewise.
Reported by Pavel Roskin <proski@gnu.org>.
2003-06-18 Bruno Haible <bruno@clisp.org>
* config/install-sh: Update from automake-1.7.5.
2003-06-16 Bruno Haible <bruno@clisp.org>
* lib/encodings.def (ISO-8859-15): Add alias LATIN-9.
(ISO-8859-16): Add aliases ISO_8859-16:2001, LATIN10, L10. Remove alias
ISO_8859-16:2000.
(GBK): Add aliases MS936, WINDOWS-936.
Reported by Guido Flohr <guido@imperia.net>.
2003-05-09 Bruno Haible <bruno@clisp.org>
* srclib/canonicalize.c: Add #ifdef around versioned_symbol. Avoids an
"extraneous semicolon" warning from Tru64 cc.
2003-06-07 Bruno Haible <bruno@clisp.org>
* Makefile.devel (config.h_vms): Don't define HAVE_ENVIRON_DECL.
* Makefile.vms (config.h): New rule.
(all, install): Depend on it.
(all, install, installdirs, uninstall, check): Fix typo.
(mostlyclean, clean, distclean, maintainer-clean): Likewise. Remove
config.h.
* lib/Makefile.vms (DEFS): Fix value of INSTALLDIR.
(OBJECTS): Use libiconv.obj instead of iconv.obj.
(libiconv.obj): Renamed from iconv.obj.
* srclib/Makefile.vms (INCLUDES): Add parent directory.
(OBJECTS): Remove strtoul.obj, setenv.obj, unsetenv.obj.
(strtoul.obj, setenv.obj, unsetenv.obj): Remove rules.
(alloca.h): New rule.
(canonicalize.obj): Depend on it.
(clean): Remove alloca.h.
* src/Makefile.vms (datadir, localedir): New variables.
(DEFS): Also define LOCALEDIR.
(iconv.obj): Add flags for relocatability,
(iconv.exe): Link with libicrt. Use link_options.
* vms/link_options.opt: New file.
Reported by Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
2003-06-07 Bruno Haible <bruno@clisp.org>
Support for relocatable data files even on Woe32.
* lib/Makefile.msvc (PICFLAGS): Also define PIC.
2003-05-22 Bruno Haible <bruno@clisp.org> 2003-05-22 Bruno Haible <bruno@clisp.org>
* Version 1.9.1 released. * Version 1.9.1 released.

View File

@ -1,3 +1,14 @@
New in 1.10:
* Added ISO-8859-11 converter.
* Updated the ISO-8859-7 converter.
* Added ATARIST converter, available through --enable-extra-encodings.
* Added BIG5-2003 converter (experimental), available through
--enable-extra-encodings.
* Updated EUC-TW converter to include the Euro sign.
* The preloadable library has been renamed from libiconv_plug.so to
preloadable_libiconv.so.
* Portability to mingw.
New in 1.9: New in 1.9:
* Many more transliterations. * Many more transliterations.
* New configuration option --enable-relocatable. See the INSTALL.generic file * New configuration option --enable-relocatable. See the INSTALL.generic file

View File

@ -161,6 +161,9 @@ A: libiconv, as an internationalization library, supports those character
* KOI8-T * KOI8-T
We implement this because it is the locale encoding in glibc's Tajik We implement this because it is the locale encoding in glibc's Tajik
locale. locale.
* PT154
We implement this because it is the locale encoding in glibc's Kazakh
locale.
* CP{1250,1251,1252,1253,1254,1255,1256,1257} * CP{1250,1251,1252,1253,1254,1255,1256,1257}
We implement these because they are the predominant Windows encodings We implement these because they are the predominant Windows encodings
in Europe. in Europe.
@ -256,8 +259,8 @@ A: libiconv, as an internationalization library, supports those character
We implement these because they appear to be both used for Georgian; We implement these because they appear to be both used for Georgian;
Xfree86 supports them. Xfree86 supports them.
Thai Thai
* TIS-620 * ISO-8859-11, TIS-620
We implement this because it seems to be standard for Thai. We implement these because it seems to be standard for Thai.
* CP874 * CP874
We implement this because MSIE4 supports it. We implement this because MSIE4 supports it.
* MacThai * MacThai

View File

@ -27,8 +27,10 @@ It provides support for the encodings:
Georgian-Academy, Georgian-PS Georgian-Academy, Georgian-PS
Tajik Tajik
KOI8-T KOI8-T
Kazakh
PT154
Thai Thai
TIS-620, CP874, MacThai ISO-8859-11, TIS-620, CP874, MacThai
Laotian Laotian
MuleLao-1, CP1133 MuleLao-1, CP1133
Vietnamese Vietnamese
@ -62,10 +64,12 @@ support for a few extra encodings:
CP864 CP864
Japanese Japanese
EUC-JISX0213, Shift_JISX0213, ISO-2022-JP-3 EUC-JISX0213, Shift_JISX0213, ISO-2022-JP-3
Chinese
BIG5-2003 (experimental)
Turkmen Turkmen
TDS565 TDS565
Platform specifics Platform specifics
RISCOS-LATIN1 ATARIST, RISCOS-LATIN1
It can convert from any of these encodings to any other, through Unicode It can convert from any of these encodings to any other, through Unicode
conversion. conversion.
@ -123,21 +127,21 @@ This library can be built and installed in two variants:
- The libc plug/override mode. This works on GNU/Linux, Solaris and OSF/1 - The libc plug/override mode. This works on GNU/Linux, Solaris and OSF/1
systems only. It is a way to get good iconv support without having systems only. It is a way to get good iconv support without having
glibc-2.1. glibc-2.1.
It installs a library `libiconv_plug.so'. This library can be used with It installs a library `preloadable_libiconv.so'. This library can be used
LD_PRELOAD, to override the iconv* functions present in the C library. with LD_PRELOAD, to override the iconv* functions present in the C library.
On GNU/Linux and Solaris: On GNU/Linux and Solaris:
$ export LD_PRELOAD=/usr/local/lib/libiconv_plug.so $ export LD_PRELOAD=/usr/local/lib/preloadable_libiconv.so
On OSF/1: On OSF/1:
$ export _RLD_LIST=/usr/local/lib/libiconv_plug.so:DEFAULT $ export _RLD_LIST=/usr/local/lib/preloadable_libiconv.so:DEFAULT
A program's source need not be modified, the program need not even be A program's source need not be modified, the program need not even be
recompiled. Just set the LD_PRELOAD environment variable, that's it! recompiled. Just set the LD_PRELOAD environment variable, that's it!
Distribution: Download:
ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.8.tar.gz ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.10.tar.gz
Homepage: Homepage:
http://www.gnu.org/software/libiconv/ http://www.gnu.org/software/libiconv/

File diff suppressed because it is too large Load Diff

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifdef USE_AIX #ifdef USE_AIX

View File

@ -1,6 +1,9 @@
S(extra_0, "EUC-JISX0213", ei_euc_jisx0213 ) S(extra_0, "EUC-JISX0213", ei_euc_jisx0213 )
S(extra_1, "SHIFT_JISX0213", ei_shift_jisx0213 ) S(extra_1, "SHIFT_JISX0213", ei_shift_jisx0213 )
S(extra_2, "ISO-2022-JP-3", ei_iso2022_jp3 ) S(extra_2, "ISO-2022-JP-3", ei_iso2022_jp3 )
S(extra_3, "TDS565", ei_tds565 ) S(extra_3, "BIG5-2003", ei_big5_2003 )
S(extra_4, "ISO-IR-230", ei_tds565 ) S(extra_4, "TDS565", ei_tds565 )
S(extra_5, "RISCOS-LATIN1", ei_riscos1 ) S(extra_5, "ISO-IR-230", ei_tds565 )
S(extra_6, "ATARIST", ei_atarist )
S(extra_7, "ATARI", ei_atarist )
S(extra_8, "RISCOS-LATIN1", ei_riscos1 )

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -0,0 +1,158 @@
/*
* Copyright (C) 1999-2005 Free Software Foundation, Inc.
* This file is part of the GNU LIBICONV Library.
*
* The GNU LIBICONV Library is free software; you can redistribute it
* and/or modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* The GNU LIBICONV Library is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*
* Atari ST
*/
static const unsigned short atarist_2uni[128] = {
/* 0x80 */
0x00c7, 0x00fc, 0x00e9, 0x00e2, 0x00e4, 0x00e0, 0x00e5, 0x00e7,
0x00ea, 0x00eb, 0x00e8, 0x00ef, 0x00ee, 0x00ec, 0x00c4, 0x00c5,
/* 0x90 */
0x00c9, 0x00e6, 0x00c6, 0x00f4, 0x00f6, 0x00f2, 0x00fb, 0x00f9,
0x00ff, 0x00d6, 0x00dc, 0x00a2, 0x00a3, 0x00a5, 0x00df, 0x0192,
/* 0xa0 */
0x00e1, 0x00ed, 0x00f3, 0x00fa, 0x00f1, 0x00d1, 0x00aa, 0x00ba,
0x00bf, 0x2310, 0x00ac, 0x00bd, 0x00bc, 0x00a1, 0x00ab, 0x00bb,
/* 0xb0 */
0x00e3, 0x00f5, 0x00d8, 0x00f8, 0x0153, 0x0152, 0x00c0, 0x00c3,
0x00d5, 0x00a8, 0x00b4, 0x2020, 0x00b6, 0x00a9, 0x00ae, 0x2122,
/* 0xc0 */
0x0133, 0x0132, 0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5,
0x05d6, 0x05d7, 0x05d8, 0x05d9, 0x05db, 0x05dc, 0x05de, 0x05e0,
/* 0xd0 */
0x05e1, 0x05e2, 0x05e4, 0x05e6, 0x05e7, 0x05e8, 0x05e9, 0x05ea,
0x05df, 0x05da, 0x05dd, 0x05e3, 0x05e5, 0x00a7, 0x2227, 0x221e,
/* 0xe0 */
0x03b1, 0x03b2, 0x0393, 0x03c0, 0x03a3, 0x03c3, 0x00b5, 0x03c4,
0x03a6, 0x0398, 0x03a9, 0x03b4, 0x222e, 0x03c6, 0x2208, 0x2229,
/* 0xf0 */
0x2261, 0x00b1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00f7, 0x2248,
0x00b0, 0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x00b3, 0x00af,
};
static int
atarist_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
{
unsigned char c = *s;
if (c < 0x80)
*pwc = (ucs4_t) c;
else
*pwc = (ucs4_t) atarist_2uni[c-0x80];
return 1;
}
static const unsigned char atarist_page00[96] = {
0x00, 0xad, 0x9b, 0x9c, 0x00, 0x9d, 0x00, 0xdd, /* 0xa0-0xa7 */
0xb9, 0xbd, 0xa6, 0xae, 0xaa, 0x00, 0xbe, 0xff, /* 0xa8-0xaf */
0xf8, 0xf1, 0xfd, 0xfe, 0xba, 0xe6, 0xbc, 0xfa, /* 0xb0-0xb7 */
0x00, 0x00, 0xa7, 0xaf, 0xac, 0xab, 0x00, 0xa8, /* 0xb8-0xbf */
0xb6, 0x00, 0x00, 0xb7, 0x8e, 0x8f, 0x92, 0x80, /* 0xc0-0xc7 */
0x00, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xc8-0xcf */
0x00, 0xa5, 0x00, 0x00, 0x00, 0xb8, 0x99, 0x00, /* 0xd0-0xd7 */
0xb2, 0x00, 0x00, 0x00, 0x9a, 0x00, 0x00, 0x9e, /* 0xd8-0xdf */
0x85, 0xa0, 0x83, 0xb0, 0x84, 0x86, 0x91, 0x87, /* 0xe0-0xe7 */
0x8a, 0x82, 0x88, 0x89, 0x8d, 0xa1, 0x8c, 0x8b, /* 0xe8-0xef */
0x00, 0xa4, 0x95, 0xa2, 0x93, 0xb1, 0x94, 0xf6, /* 0xf0-0xf7 */
0xb3, 0x97, 0xa3, 0x96, 0x81, 0x00, 0x00, 0x98, /* 0xf8-0xff */
};
static const unsigned char atarist_page01[104] = {
0x00, 0x00, 0xc1, 0xc0, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
0x00, 0x00, 0xb5, 0xb4, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x60-0x67 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x68-0x6f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x70-0x77 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x78-0x7f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80-0x87 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x88-0x8f */
0x00, 0x00, 0x9f, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
};
static const unsigned char atarist_page03[56] = {
0x00, 0x00, 0x00, 0xe2, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */
0xe9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x98-0x9f */
0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0xe8, 0x00, /* 0xa0-0xa7 */
0x00, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8-0xaf */
0x00, 0xe0, 0xe1, 0x00, 0xeb, 0x00, 0x00, 0x00, /* 0xb0-0xb7 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
0xe3, 0x00, 0x00, 0xe5, 0xe7, 0x00, 0xed, 0x00, /* 0xc0-0xc7 */
};
static const unsigned char atarist_page05[32] = {
0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, /* 0xd0-0xd7 */
0xca, 0xcb, 0xd9, 0xcc, 0xcd, 0xda, 0xce, 0xd8, /* 0xd8-0xdf */
0xcf, 0xd0, 0xd1, 0xdb, 0xd2, 0xdc, 0xd3, 0xd4, /* 0xe0-0xe7 */
0xd5, 0xd6, 0xd7, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xe8-0xef */
};
static const unsigned char atarist_page22[96] = {
0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
0x00, 0xf9, 0xfb, 0x00, 0x00, 0x00, 0xdf, 0x00, /* 0x18-0x1f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, /* 0x20-0x27 */
0x00, 0xef, 0x00, 0x00, 0x00, 0x00, 0xec, 0x00, /* 0x28-0x2f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30-0x37 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40-0x47 */
0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x48-0x4f */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x50-0x57 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
0x00, 0xf0, 0x00, 0x00, 0xf3, 0xf2, 0x00, 0x00, /* 0x60-0x67 */
};
static const unsigned char atarist_page23[24] = {
0xa9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18-0x1f */
0xf4, 0xf5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */
};
static int
atarist_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
{
unsigned char c = 0;
if (wc < 0x0080) {
*r = wc;
return 1;
}
else if (wc >= 0x00a0 && wc < 0x0100)
c = atarist_page00[wc-0x00a0];
else if (wc >= 0x0130 && wc < 0x0198)
c = atarist_page01[wc-0x0130];
else if (wc >= 0x0390 && wc < 0x03c8)
c = atarist_page03[wc-0x0390];
else if (wc >= 0x05d0 && wc < 0x05f0)
c = atarist_page05[wc-0x05d0];
else if (wc == 0x2020)
c = 0xbb;
else if (wc == 0x207f)
c = 0xfc;
else if (wc == 0x2122)
c = 0xbf;
else if (wc >= 0x2208 && wc < 0x2268)
c = atarist_page22[wc-0x2208];
else if (wc >= 0x2310 && wc < 0x2328)
c = atarist_page23[wc-0x2310];
if (c != 0) {
*r = c;
return 1;
}
return RET_ILUNI;
}

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -0,0 +1,468 @@
/*
* Copyright (C) 1999-2001, 2005 Free Software Foundation, Inc.
* This file is part of the GNU LIBICONV Library.
*
* The GNU LIBICONV Library is free software; you can redistribute it
* and/or modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* The GNU LIBICONV Library is distributed in the hope that it will be
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Fifth Floor, Boston, MA 02110-1301, USA.
*/
/*
* BIG5-2003
*/
/*
* BIG5-2003 is a slightly extended and slightly modified version of BIG5.
* It is actually nearer to Microsoft CP950 than to BIG5. The differences
* between EASTASIA/OTHER/BIG5.TXT found on ftp.unicode.org and BIG5-2003.TXT
* are as follows:
*
* 1. Some characters in the symbols area (0xA140..0xA2CE) are defined
* differently:
*
* code BIG5.TXT BIG5-2003.TXT
* 0xA145 0x2022 # BULLET 0x2027 # HYPHENATION POINT
* 0xA14E 0xFF64 # HALFWIDTH IDEOGRAPHIC COMMA
* 0xFE51 # SMALL IDEOGRAPHIC COMMA
* 0xA156 0x2013 # EN DASH 0x2015 # HORIZONTAL BAR
* 0xA15A --- 0x2574 # BOX DRAWINGS LIGHT LEFT
* 0xA1C3 --- 0xFFE3 # FULLWIDTH MACRON
* 0xA1C5 --- 0x02CD # MODIFIER LETTER LOW MACRON
* 0xA1E3 0x223C # TILDE OPERATOR 0xFF5E # FULLWIDTH TILDE
* 0xA1F2 0x2641 # EARTH 0x2295 # CIRCLED PLUS
* 0xA1F3 0x2609 # SUN 0x2299 # CIRCLED DOT OPERATOR
* 0xA1FE --- 0xFF0F # FULLWIDTH SOLIDUS
* 0xA240 --- 0xFF3C # FULLWIDTH REVERSE SOLIDUS
* 0xA241 0xFF0F # FULLWIDTH SOLIDUS 0x2215 # DIVISION SLASH
* 0xA242 0xFF3C # FULLWIDTH REVERSE SOLIDUS
* 0xFE68 # SMALL REVERSE SOLIDUS
* 0xA244 0x00A5 # YEN SIGN 0xFFE5 # FULLWIDTH YEN SIGN
* 0xA246 0x00A2 # CENT SIGN 0xFFE0 # FULLWIDTH CENT SIGN
* 0xA247 0x00A3 # POUND SIGN 0xFFE1 # FULLWIDTH POUND SIGN
* 0xA2A4 0x2550 # BOX DRAWINGS DOUBLE HORIZONTAL
* 0x2501 # BOX DRAWINGS HEAVY HORIZONTAL
* 0xA2A5 0x255E # BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
* 0x251D # BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY
* 0xA2A6 0x256A # BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
* 0x253F # BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY
* 0xA2A7 0x2561 # BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
* 0x2525 # BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY
* 0xA2CC --- 0x3038 # HANGZHOU NUMERAL TEN
* 0xA2CD 0x5344 0x3039 # HANGZHOU NUMERAL TWENTY
* 0xA2CE --- 0x303A # HANGZHOU NUMERAL THIRTY
*
* 2. A control symbols area is added:
*
* code
* 0xA3C0..0xA3E0 U+2400..U+2421
*
* 3. The Euro sign is added:
*
* code
* 0xA3E1 0x20AC # EURO SIGN
*
* 4. Some characters in the main area are defined differently:
*
* code BIG5.TXT BIG5-2003.TXT
* 0xC255 0x5F5D 0x5F5E
*
* 5. The area 0xC6A1..0xC7FE is organized differently:
*
* code
* 0xC6A1..0xC6BE numerals (was in BIG5.TXT at 0xC7E9..0xC7FC)
* 0xC6BF..0xC6D7 radicals
* 0xC6D8..0xC6E6 rarely used symbols
* 0xC6E7..0xC77A hiragana (U+3041..U+3093, was in BIG5.TXT at 0xC6A5..0xC6F7)
* 0xC77B..0xC7F2 katakana (U+30A1..U+30F6, was in BIG5.TXT at 0xC6F8..0xC7B0)
*
* 6. Some characters are added at 0xF9D6..0xF9DC.
*
* 7. Box drawing characters are added at 0xF9DD..0xF9FE.
*
* 8. Private area mappings are added:
*
* code Unicode
* 0x{81..8D}{40..7E,A1..FE} U+EEB8..U+F6B0
* 0x{8E..A0}{40..7E,A1..FE} U+E311..U+EEB7
* 0x{FA..FE}{40..7E,A1..FE} U+E000..U+E310
*/
static const unsigned short big5_2003_2uni_pagea1[314] = {
/* 0xa1 */
0x3000, 0xff0c, 0x3001, 0x3002, 0xff0e, 0x2027, 0xff1b, 0xff1a,
0xff1f, 0xff01, 0xfe30, 0x2026, 0x2025, 0xfe50, 0xfe51, 0xfe52,
0x00b7, 0xfe54, 0xfe55, 0xfe56, 0xfe57, 0xff5c, 0x2015, 0xfe31,
0x2014, 0xfe33, 0x2574, 0xfe34, 0xfe4f, 0xff08, 0xff09, 0xfe35,
0xfe36, 0xff5b, 0xff5d, 0xfe37, 0xfe38, 0x3014, 0x3015, 0xfe39,
0xfe3a, 0x3010, 0x3011, 0xfe3b, 0xfe3c, 0x300a, 0x300b, 0xfe3d,
0xfe3e, 0x3008, 0x3009, 0xfe3f, 0xfe40, 0x300c, 0x300d, 0xfe41,
0xfe42, 0x300e, 0x300f, 0xfe43, 0xfe44, 0xfe59, 0xfe5a, 0xfe5b,
0xfe5c, 0xfe5d, 0xfe5e, 0x2018, 0x2019, 0x201c, 0x201d, 0x301d,
0x301e, 0x2035, 0x2032, 0xff03, 0xff06, 0xff0a, 0x203b, 0x00a7,
0x3003, 0x25cb, 0x25cf, 0x25b3, 0x25b2, 0x25ce, 0x2606, 0x2605,
0x25c7, 0x25c6, 0x25a1, 0x25a0, 0x25bd, 0x25bc, 0x32a3, 0x2105,
0x203e, 0xffe3, 0xff3f, 0x02cd, 0xfe49, 0xfe4a, 0xfe4d, 0xfe4e,
0xfe4b, 0xfe4c, 0xfe5f, 0xfe60, 0xfe61, 0xff0b, 0xff0d, 0x00d7,
0x00f7, 0x00b1, 0x221a, 0xff1c, 0xff1e, 0xff1d, 0x2266, 0x2267,
0x2260, 0x221e, 0x2252, 0x2261, 0xfe62, 0xfe63, 0xfe64, 0xfe65,
0xfe66, 0xff5e, 0x2229, 0x222a, 0x22a5, 0x2220, 0x221f, 0x22bf,
0x33d2, 0x33d1, 0x222b, 0x222e, 0x2235, 0x2234, 0x2640, 0x2642,
0x2295, 0x2299, 0x2191, 0x2193, 0x2190, 0x2192, 0x2196, 0x2197,
0x2199, 0x2198, 0x2225, 0x2223, 0xff0f,
/* 0xa2 */
0xff3c, 0x2215, 0xfe68, 0xff04, 0xffe5, 0x3012, 0xffe0, 0xffe1,
0xff05, 0xff20, 0x2103, 0x2109, 0xfe69, 0xfe6a, 0xfe6b, 0x33d5,
0x339c, 0x339d, 0x339e, 0x33ce, 0x33a1, 0x338e, 0x338f, 0x33c4,
0x00b0, 0x5159, 0x515b, 0x515e, 0x515d, 0x5161, 0x5163, 0x55e7,
0x74e9, 0x7cce, 0x2581, 0x2582, 0x2583, 0x2584, 0x2585, 0x2586,
0x2587, 0x2588, 0x258f, 0x258e, 0x258d, 0x258c, 0x258b, 0x258a,
0x2589, 0x253c, 0x2534, 0x252c, 0x2524, 0x251c, 0x2594, 0x2500,
0x2502, 0x2595, 0x250c, 0x2510, 0x2514, 0x2518, 0x256d, 0x256e,
0x2570, 0x256f, 0x2501, 0x251d, 0x253f, 0x2525, 0x25e2, 0x25e3,
0x25e5, 0x25e4, 0x2571, 0x2572, 0x2573, 0xff10, 0xff11, 0xff12,
0xff13, 0xff14, 0xff15, 0xff16, 0xff17, 0xff18, 0xff19, 0x2160,
0x2161, 0x2162, 0x2163, 0x2164, 0x2165, 0x2166, 0x2167, 0x2168,
0x2169, 0x3021, 0x3022, 0x3023, 0x3024, 0x3025, 0x3026, 0x3027,
0x3028, 0x3029, 0x3038, 0x3039, 0x303a, 0xff21, 0xff22, 0xff23,
0xff24, 0xff25, 0xff26, 0xff27, 0xff28, 0xff29, 0xff2a, 0xff2b,
0xff2c, 0xff2d, 0xff2e, 0xff2f, 0xff30, 0xff31, 0xff32, 0xff33,
0xff34, 0xff35, 0xff36, 0xff37, 0xff38, 0xff39, 0xff3a, 0xff41,
0xff42, 0xff43, 0xff44, 0xff45, 0xff46, 0xff47, 0xff48, 0xff49,
0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 0xff50, 0xff51,
0xff52, 0xff53, 0xff54, 0xff55, 0xff56,
};
static const unsigned short big5_2003_2uni_pagec6[70] = {
/* 0xc6a1 */
0x2460, 0x2461, 0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467,
0x2468, 0x2469, 0x2474, 0x2475, 0x2476, 0x2477, 0x2478, 0x2479,
0x247a, 0x247b, 0x247c, 0x247d, 0x2170, 0x2171, 0x2172, 0x2173,
0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x2f02, 0x2f03,
0x2f05, 0x2f07, 0x2f0c, 0x2f0d, 0x2f0e, 0x2f13, 0x2f16, 0x2f19,
0x2f1b, 0x2f22, 0x2f27, 0x2f2e, 0x2f33, 0x2f34, 0x2f35, 0x2f39,
0x2f3a, 0x2f41, 0x2f46, 0x2f67, 0x2f68, 0x2fa1, 0x2faa, 0x00a8,
0xff3e, 0x30fd, 0x30fe, 0x309d, 0x309e, 0xfffd, 0xfffd, 0x3005,
0x3006, 0x3007, 0x30fc, 0xff3b, 0xff3d, 0x273d,
};
static const unsigned short big5_2003_2uni_pagef9[41] = {
/* 0xf9d6 */
0x7881, 0x92b9, 0x88cf, 0x58bb, 0x6052, 0x7ca7, 0x5afa,
/* 0xf9dd */
0x2554, 0x2566, 0x2557, 0x2560, 0x256c, 0x2563, 0x255a, 0x2569,
0x255d, 0x2552, 0x2564, 0x2555, 0x255e, 0x256a, 0x2561, 0x2558,
0x2567, 0x255b, 0x2553, 0x2565, 0x2556, 0x255f, 0x256b, 0x2562,
0x2559, 0x2568, 0x255c, 0x2551, 0x2550,
0x25dc, 0x25dd, 0x25df, 0x25de, /* not 0x2554, 0x2557, 0x255a, 0x255d, */
0x2593,
};
static int
big5_2003_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
{
unsigned char c = *s;
/* Code set 0 (ASCII) */
if (c < 0x80)
return ascii_mbtowc(conv,pwc,s,n);
/* Code set 1 (BIG5 extended) */
if (c >= 0x81 && c < 0xff) {
if (n < 2)
return RET_TOOFEW(0);
{
unsigned char c2 = s[1];
if ((c2 >= 0x40 && c2 < 0x7f) || (c2 >= 0xa1 && c2 < 0xff)) {
if (c >= 0xa1) {
if (c < 0xa3) {
unsigned int i = 157 * (c - 0xa1) + (c2 - (c2 >= 0xa1 ? 0x62 : 0x40));
unsigned short wc = big5_2003_2uni_pagea1[i];
if (wc != 0xfffd) {
*pwc = (ucs4_t) wc;
return 2;
}
}
if (!((c == 0xc6 && c2 >= 0xa1) || c == 0xc7)) {
if (!(c == 0xc2 && c2 == 0x55)) {
int ret = big5_mbtowc(conv,pwc,s,2);
if (ret != RET_ILSEQ)
return ret;
if (c == 0xa3) {
if (c2 >= 0xc0 && c2 <= 0xe1) {
*pwc = (c2 == 0xe1 ? 0x20ac : c2 == 0xe0 ? 0x2421 : 0x2340 + c2);
return 2;
}
} else if (c == 0xf9) {
if (c2 >= 0xd6) {
*pwc = big5_2003_2uni_pagef9[c2-0xd6];
return 2;
}
} else if (c >= 0xfa) {
*pwc = 0xe000 + 157 * (c - 0xfa) + (c2 - (c2 >= 0xa1 ? 0x62 : 0x40));
return 2;
}
} else {
/* c == 0xc2 && c2 == 0x55. */
*pwc = 0x5f5e;
return 2;
}
} else {
/* (c == 0xc6 && c2 >= 0xa1) || c == 0xc7. */
unsigned int i = 157 * (c - 0xc6) + (c2 - (c2 >= 0xa1 ? 0x62 : 0x40));
if (i < 133) {
/* 63 <= i < 133. */
unsigned short wc = big5_2003_2uni_pagec6[i-63];
if (wc != 0xfffd) {
*pwc = (ucs4_t) wc;
return 2;
}
} else if (i < 216) {
/* 133 <= i < 216. Hiragana. */
*pwc = 0x3041 - 133 + i;
return 2;
} else if (i < 302) {
/* 216 <= i < 302. Katakana. */
*pwc = 0x30a1 - 216 + i;
return 2;
}
}
} else {
/* 0x81 <= c < 0xa1. */
*pwc = (c >= 0x8e ? 0xdb18 : 0xeeb8) + 157 * (c - 0x81)
+ (c2 - (c2 >= 0xa1 ? 0x62 : 0x40));
return 2;
}
}
}
}
return RET_ILSEQ;
}
static const unsigned char big5_2003_2charset_page25[29] = {
/* 0x2550 */
0xf9, 0xf8, 0xe6, 0xef, 0xdd, 0xe8, 0xf1, 0xdf,
0xec, 0xf5, 0xe3, 0xee, 0xf7, 0xe5, 0xe9, 0xf2,
0xe0, 0xeb, 0xf4, 0xe2, 0xe7, 0xf0, 0xde, 0xed,
0xf6, 0xe4, 0xea, 0xf3, 0xe1,
};
static int
big5_2003_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
{
unsigned char buf[2];
int ret;
/* Code set 0 (ASCII) */
ret = ascii_wctomb(conv,r,wc,n);
if (ret != RET_ILUNI)
return ret;
/* Code set 1 (BIG5 extended) */
switch (wc >> 8) {
case 0x00:
if (wc == 0x00a8) { buf[0] = 0xc6; buf[1] = 0xd8; ret = 2; break; }
if (wc == 0x00a2 || wc == 0x00a3 || wc == 0x00a5)
return RET_ILUNI;
break;
case 0x02:
if (wc == 0x02cd) { buf[0] = 0xa1; buf[1] = 0xc5; ret = 2; break; }
break;
case 0x04:
return RET_ILUNI;
case 0x20:
if (wc == 0x2015) { buf[0] = 0xa1; buf[1] = 0x56; ret = 2; break; }
if (wc == 0x2027) { buf[0] = 0xa1; buf[1] = 0x45; ret = 2; break; }
if (wc == 0x20ac) { buf[0] = 0xa3; buf[1] = 0xe1; ret = 2; break; }
if (wc == 0x2013 || wc == 0x2022)
return RET_ILUNI;
break;
case 0x21:
if (wc >= 0x2170 && wc <= 0x2179) {
buf[0] = 0xc6; buf[1] = wc - 0x20bb; ret = 2;
break;
}
break;
case 0x22:
if (wc == 0x2215) { buf[0] = 0xa2; buf[1] = 0x41; ret = 2; break; }
if (wc == 0x2295) { buf[0] = 0xa1; buf[1] = 0xf2; ret = 2; break; }
if (wc == 0x2299) { buf[0] = 0xa1; buf[1] = 0xf3; ret = 2; break; }
if (wc == 0x223c)
return RET_ILUNI;
break;
case 0x24:
if (wc <= 0x241f) { buf[0] = 0xa3; buf[1] = wc - 0x2340; ret = 2; break; }
if (wc == 0x2421) { buf[0] = 0xa3; buf[1] = 0xe0; ret = 2; break; }
if (wc >= 0x2460 && wc <= 0x2469) {
buf[0] = 0xc6; buf[1] = wc - 0x23bf; ret = 2;
break;
}
if (wc >= 0x2474 && wc <= 0x247d) {
buf[0] = 0xc6; buf[1] = wc - 0x23c9; ret = 2;
break;
}
break;
case 0x25:
if (wc == 0x2501) { buf[0] = 0xa2; buf[1] = 0xa4; ret = 2; break; }
if (wc == 0x251d) { buf[0] = 0xa2; buf[1] = 0xa5; ret = 2; break; }
if (wc == 0x2525) { buf[0] = 0xa2; buf[1] = 0xa7; ret = 2; break; }
if (wc == 0x253f) { buf[0] = 0xa2; buf[1] = 0xa6; ret = 2; break; }
if (wc >= 0x2550 && wc <= 0x256c) {
buf[0] = 0xf9; buf[1] = big5_2003_2charset_page25[wc-0x2550]; ret = 2;
break;
}
if (wc == 0x2574) { buf[0] = 0xa1; buf[1] = 0x5a; ret = 2; break; }
if (wc == 0x2593) { buf[0] = 0xf9; buf[1] = 0xfe; ret = 2; break; }
if (wc == 0x25dc) { buf[0] = 0xf9; buf[1] = 0xfa; ret = 2; break; }
if (wc == 0x25dd) { buf[0] = 0xf9; buf[1] = 0xfb; ret = 2; break; }
if (wc == 0x25de) { buf[0] = 0xf9; buf[1] = 0xfd; ret = 2; break; }
if (wc == 0x25df) { buf[0] = 0xf9; buf[1] = 0xfc; ret = 2; break; }
break;
case 0x26:
if (wc == 0x2609 || wc == 0x2641)
return RET_ILUNI;
break;
case 0x27:
if (wc == 0x273d) { buf[0] = 0xc6; buf[1] = 0xe6; ret = 2; break; }
break;
case 0x2f:
if (wc == 0x2f02) { buf[0] = 0xc6; buf[1] = 0xbf; ret = 2; break; }
if (wc == 0x2f03) { buf[0] = 0xc6; buf[1] = 0xc0; ret = 2; break; }
if (wc == 0x2f05) { buf[0] = 0xc6; buf[1] = 0xc1; ret = 2; break; }
if (wc == 0x2f07) { buf[0] = 0xc6; buf[1] = 0xc2; ret = 2; break; }
if (wc == 0x2f0c) { buf[0] = 0xc6; buf[1] = 0xc3; ret = 2; break; }
if (wc == 0x2f0d) { buf[0] = 0xc6; buf[1] = 0xc4; ret = 2; break; }
if (wc == 0x2f0e) { buf[0] = 0xc6; buf[1] = 0xc5; ret = 2; break; }
if (wc == 0x2f13) { buf[0] = 0xc6; buf[1] = 0xc6; ret = 2; break; }
if (wc == 0x2f16) { buf[0] = 0xc6; buf[1] = 0xc7; ret = 2; break; }
if (wc == 0x2f19) { buf[0] = 0xc6; buf[1] = 0xc8; ret = 2; break; }
if (wc == 0x2f1b) { buf[0] = 0xc6; buf[1] = 0xc9; ret = 2; break; }
if (wc == 0x2f22) { buf[0] = 0xc6; buf[1] = 0xca; ret = 2; break; }
if (wc == 0x2f27) { buf[0] = 0xc6; buf[1] = 0xcb; ret = 2; break; }
if (wc == 0x2f2e) { buf[0] = 0xc6; buf[1] = 0xcc; ret = 2; break; }
if (wc == 0x2f33) { buf[0] = 0xc6; buf[1] = 0xcd; ret = 2; break; }
if (wc == 0x2f34) { buf[0] = 0xc6; buf[1] = 0xce; ret = 2; break; }
if (wc == 0x2f35) { buf[0] = 0xc6; buf[1] = 0xcf; ret = 2; break; }
if (wc == 0x2f39) { buf[0] = 0xc6; buf[1] = 0xd0; ret = 2; break; }
if (wc == 0x2f3a) { buf[0] = 0xc6; buf[1] = 0xd1; ret = 2; break; }
if (wc == 0x2f41) { buf[0] = 0xc6; buf[1] = 0xd2; ret = 2; break; }
if (wc == 0x2f46) { buf[0] = 0xc6; buf[1] = 0xd3; ret = 2; break; }
if (wc == 0x2f67) { buf[0] = 0xc6; buf[1] = 0xd4; ret = 2; break; }
if (wc == 0x2f68) { buf[0] = 0xc6; buf[1] = 0xd5; ret = 2; break; }
if (wc == 0x2fa1) { buf[0] = 0xc6; buf[1] = 0xd6; ret = 2; break; }
if (wc == 0x2faa) { buf[0] = 0xc6; buf[1] = 0xd7; ret = 2; break; }
break;
case 0x30:
if (wc >= 0x3005 && wc <= 0x3007) {
buf[0] = 0xc6; buf[1] = wc - 0x2f25; ret = 2;
break;
}
if (wc >= 0x3038 && wc <= 0x303a) {
buf[0] = 0xa2; buf[1] = wc - 0x2f6c; ret = 2;
break;
}
if (wc >= 0x3041 && wc <= 0x3093) {
if (wc < 0x3059) {
buf[0] = 0xc6; buf[1] = wc - 0x2f5a;
} else {
buf[0] = 0xc7; buf[1] = wc - 0x3019;
}
ret = 2;
break;
}
if (wc == 0x309d) { buf[0] = 0xc6; buf[1] = 0xdc; ret = 2; break; }
if (wc == 0x309e) { buf[0] = 0xc6; buf[1] = 0xdd; ret = 2; break; }
if (wc >= 0x30a1 && wc <= 0x30f6) {
buf[0] = 0xc7; buf[1] = wc - (wc < 0x30a5 ? 0x3026 : 0x3004); ret = 2;
break;
}
if (wc == 0x30fc) { buf[0] = 0xc6; buf[1] = 0xe3; ret = 2; break; }
if (wc == 0x30fd) { buf[0] = 0xc6; buf[1] = 0xda; ret = 2; break; }
if (wc == 0x30fe) { buf[0] = 0xc6; buf[1] = 0xdb; ret = 2; break; }
break;
case 0x53:
if (wc == 0x5344)
return RET_ILUNI;
break;
case 0x58:
if (wc == 0x58bb) { buf[0] = 0xf9; buf[1] = 0xd9; ret = 2; break; }
break;
case 0x5a:
if (wc == 0x5afa) { buf[0] = 0xf9; buf[1] = 0xdc; ret = 2; break; }
break;
case 0x5f:
if (wc == 0x5f5e) { buf[0] = 0xc2; buf[1] = 0x55; ret = 2; break; }
if (wc == 0x5f5d)
return RET_ILUNI;
break;
case 0x60:
if (wc == 0x6052) { buf[0] = 0xf9; buf[1] = 0xda; ret = 2; break; }
break;
case 0x78:
if (wc == 0x7881) { buf[0] = 0xf9; buf[1] = 0xd6; ret = 2; break; }
break;
case 0x7c:
if (wc == 0x7ca7) { buf[0] = 0xf9; buf[1] = 0xdb; ret = 2; break; }
break;
case 0x88:
if (wc == 0x88cf) { buf[0] = 0xf9; buf[1] = 0xd8; ret = 2; break; }
break;
case 0x92:
if (wc == 0x92b9) { buf[0] = 0xf9; buf[1] = 0xd7; ret = 2; break; }
break;
case 0xe0: case 0xe1: case 0xe2: case 0xe3: case 0xe4: case 0xe5:
case 0xe6: case 0xe7: case 0xe8: case 0xe9: case 0xea: case 0xeb:
case 0xec: case 0xed: case 0xee: case 0xef: case 0xf0: case 0xf1:
case 0xf2: case 0xf3: case 0xf4: case 0xf5: case 0xf6:
{
unsigned int i = wc - 0xe000;
if (i < 5809) {
unsigned int c1 = i / 157;
unsigned int c2 = i % 157;
buf[0] = c1 + (c1 < 5 ? 0xfa : c1 < 24 ? 0x89 : 0x69);
buf[1] = c2 + (c2 < 0x3f ? 0x40 : 0x62);
ret = 2;
break;
}
}
break;
case 0xfe:
if (wc == 0xfe51) { buf[0] = 0xa1; buf[1] = 0x4e; ret = 2; break; }
if (wc == 0xfe68) { buf[0] = 0xa2; buf[1] = 0x42; ret = 2; break; }
break;
case 0xff:
if (wc == 0xff0f) { buf[0] = 0xa1; buf[1] = 0xfe; ret = 2; break; }
if (wc == 0xff3b) { buf[0] = 0xc6; buf[1] = 0xe4; ret = 2; break; }
if (wc == 0xff3c) { buf[0] = 0xa2; buf[1] = 0x40; ret = 2; break; }
if (wc == 0xff3d) { buf[0] = 0xc6; buf[1] = 0xe5; ret = 2; break; }
if (wc == 0xff3e) { buf[0] = 0xc6; buf[1] = 0xd9; ret = 2; break; }
if (wc == 0xff5e) { buf[0] = 0xa1; buf[1] = 0xe3; ret = 2; break; }
if (wc == 0xffe0) { buf[0] = 0xa2; buf[1] = 0x46; ret = 2; break; }
if (wc == 0xffe1) { buf[0] = 0xa2; buf[1] = 0x47; ret = 2; break; }
if (wc == 0xffe3) { buf[0] = 0xa1; buf[1] = 0xc3; ret = 2; break; }
if (wc == 0xffe5) { buf[0] = 0xa2; buf[1] = 0x44; ret = 2; break; }
if (wc == 0xff64)
return RET_ILUNI;
break;
}
if (ret == RET_ILUNI)
ret = big5_wctomb(conv,buf,wc,2);
if (ret != RET_ILUNI) {
if (ret != 2) abort();
if (n < 2)
return RET_TOOSMALL;
r[0] = buf[0];
r[1] = buf[1];
return 2;
}
return RET_ILUNI;
}

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -0,0 +1,104 @@
(int)(long)&((struct stringpool_t *)0)->stringpool_str380,
(int)(long)&((struct stringpool_t *)0)->stringpool_str297,
(int)(long)&((struct stringpool_t *)0)->stringpool_str263,
(int)(long)&((struct stringpool_t *)0)->stringpool_str476,
(int)(long)&((struct stringpool_t *)0)->stringpool_str295,
(int)(long)&((struct stringpool_t *)0)->stringpool_str231,
(int)(long)&((struct stringpool_t *)0)->stringpool_str460,
(int)(long)&((struct stringpool_t *)0)->stringpool_str279,
(int)(long)&((struct stringpool_t *)0)->stringpool_str272,
(int)(long)&((struct stringpool_t *)0)->stringpool_str510,
(int)(long)&((struct stringpool_t *)0)->stringpool_str329,
(int)(long)&((struct stringpool_t *)0)->stringpool_str381,
(int)(long)&((struct stringpool_t *)0)->stringpool_str594,
(int)(long)&((struct stringpool_t *)0)->stringpool_str413,
(int)(long)&((struct stringpool_t *)0)->stringpool_str433,
(int)(long)&((struct stringpool_t *)0)->stringpool_str320,
(int)(long)&((struct stringpool_t *)0)->stringpool_str590,
(int)(long)&((struct stringpool_t *)0)->stringpool_str304,
(int)(long)&((struct stringpool_t *)0)->stringpool_str574,
(int)(long)&((struct stringpool_t *)0)->stringpool_str157,
(int)(long)&((struct stringpool_t *)0)->stringpool_str489,
(int)(long)&((struct stringpool_t *)0)->stringpool_str117,
(int)(long)&((struct stringpool_t *)0)->stringpool_str163,
(int)(long)&((struct stringpool_t *)0)->stringpool_str235,
(int)(long)&((struct stringpool_t *)0)->stringpool_str131,
(int)(long)&((struct stringpool_t *)0)->stringpool_str135,
(int)(long)&((struct stringpool_t *)0)->stringpool_str113,
(int)(long)&((struct stringpool_t *)0)->stringpool_str281,
(int)(long)&((struct stringpool_t *)0)->stringpool_str145,
(int)(long)&((struct stringpool_t *)0)->stringpool_str149,
(int)(long)&((struct stringpool_t *)0)->stringpool_str270,
(int)(long)&((struct stringpool_t *)0)->stringpool_str124,
(int)(long)&((struct stringpool_t *)0)->stringpool_str242,
(int)(long)&((struct stringpool_t *)0)->stringpool_str138,
(int)(long)&((struct stringpool_t *)0)->stringpool_str142,
(int)(long)&((struct stringpool_t *)0)->stringpool_str120,
(int)(long)&((struct stringpool_t *)0)->stringpool_str245,
(int)(long)&((struct stringpool_t *)0)->stringpool_str607,
(int)(long)&((struct stringpool_t *)0)->stringpool_str612,
(int)(long)&((struct stringpool_t *)0)->stringpool_str324,
(int)(long)&((struct stringpool_t *)0)->stringpool_str178,
(int)(long)&((struct stringpool_t *)0)->stringpool_str224,
(int)(long)&((struct stringpool_t *)0)->stringpool_str296,
(int)(long)&((struct stringpool_t *)0)->stringpool_str192,
(int)(long)&((struct stringpool_t *)0)->stringpool_str196,
(int)(long)&((struct stringpool_t *)0)->stringpool_str174,
(int)(long)&((struct stringpool_t *)0)->stringpool_str342,
(int)(long)&((struct stringpool_t *)0)->stringpool_str206,
(int)(long)&((struct stringpool_t *)0)->stringpool_str308,
(int)(long)&((struct stringpool_t *)0)->stringpool_str197,
(int)(long)&((struct stringpool_t *)0)->stringpool_str147,
(int)(long)&((struct stringpool_t *)0)->stringpool_str528,
(int)(long)&((struct stringpool_t *)0)->stringpool_str569,
(int)(long)&((struct stringpool_t *)0)->stringpool_str504,
(int)(long)&((struct stringpool_t *)0)->stringpool_str547,
(int)(long)&((struct stringpool_t *)0)->stringpool_str618,
(int)(long)&((struct stringpool_t *)0)->stringpool_str649,
(int)(long)&((struct stringpool_t *)0)->stringpool_str792,
(int)(long)&((struct stringpool_t *)0)->stringpool_str763,
(int)(long)&((struct stringpool_t *)0)->stringpool_str737,
(int)(long)&((struct stringpool_t *)0)->stringpool_str845,
(int)(long)&((struct stringpool_t *)0)->stringpool_str796,
(int)(long)&((struct stringpool_t *)0)->stringpool_str372,
(int)(long)&((struct stringpool_t *)0)->stringpool_str298,
(int)(long)&((struct stringpool_t *)0)->stringpool_str287,
(int)(long)&((struct stringpool_t *)0)->stringpool_str397,
(int)(long)&((struct stringpool_t *)0)->stringpool_str291,
(int)(long)&((struct stringpool_t *)0)->stringpool_str211,
(int)(long)&((struct stringpool_t *)0)->stringpool_str277,
(int)(long)&((struct stringpool_t *)0)->stringpool_str116,
(int)(long)&((struct stringpool_t *)0)->stringpool_str283,
(int)(long)&((struct stringpool_t *)0)->stringpool_str323,
(int)(long)&((struct stringpool_t *)0)->stringpool_str233,
(int)(long)&((struct stringpool_t *)0)->stringpool_str249,
(int)(long)&((struct stringpool_t *)0)->stringpool_str252,
(int)(long)&((struct stringpool_t *)0)->stringpool_str156,
(int)(long)&((struct stringpool_t *)0)->stringpool_str580,
(int)(long)&((struct stringpool_t *)0)->stringpool_str568,
(int)(long)&((struct stringpool_t *)0)->stringpool_str596,
(int)(long)&((struct stringpool_t *)0)->stringpool_str541,
(int)(long)&((struct stringpool_t *)0)->stringpool_str284,
(int)(long)&((struct stringpool_t *)0)->stringpool_str345,
(int)(long)&((struct stringpool_t *)0)->stringpool_str77,
(int)(long)&((struct stringpool_t *)0)->stringpool_str435,
(int)(long)&((struct stringpool_t *)0)->stringpool_str555,
(int)(long)&((struct stringpool_t *)0)->stringpool_str421,
(int)(long)&((struct stringpool_t *)0)->stringpool_str260,
(int)(long)&((struct stringpool_t *)0)->stringpool_str604,
(int)(long)&((struct stringpool_t *)0)->stringpool_str548,
(int)(long)&((struct stringpool_t *)0)->stringpool_str571,
(int)(long)&((struct stringpool_t *)0)->stringpool_str278,
(int)(long)&((struct stringpool_t *)0)->stringpool_str426,
(int)(long)&((struct stringpool_t *)0)->stringpool_str354,
(int)(long)&((struct stringpool_t *)0)->stringpool_str327,
(int)(long)&((struct stringpool_t *)0)->stringpool_str340,
(int)(long)&((struct stringpool_t *)0)->stringpool_str18,
(int)(long)&((struct stringpool_t *)0)->stringpool_str470,
(int)(long)&((struct stringpool_t *)0)->stringpool_str241,
(int)(long)&((struct stringpool_t *)0)->stringpool_str310,
(int)(long)&((struct stringpool_t *)0)->stringpool_str593,
(int)(long)&((struct stringpool_t *)0)->stringpool_str356,
(int)(long)&((struct stringpool_t *)0)->stringpool_str194,
(int)(long)&((struct stringpool_t *)0)->stringpool_str721,
(int)(long)&((struct stringpool_t *)0)->stringpool_str405,

View File

@ -0,0 +1,9 @@
(int)(long)&((struct stringpool2_t *)0)->stringpool_aix_0,
(int)(long)&((struct stringpool2_t *)0)->stringpool_aix_1,
(int)(long)&((struct stringpool2_t *)0)->stringpool_aix_2,
(int)(long)&((struct stringpool2_t *)0)->stringpool_aix_3,
(int)(long)&((struct stringpool2_t *)0)->stringpool_aix_4,
(int)(long)&((struct stringpool2_t *)0)->stringpool_aix_5,
(int)(long)&((struct stringpool2_t *)0)->stringpool_aix_6,
(int)(long)&((struct stringpool2_t *)0)->stringpool_aix_10,
(int)(long)&((struct stringpool2_t *)0)->stringpool_aix_14,

View File

@ -0,0 +1,15 @@
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_0,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_4,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_5,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_8,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_12,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_13,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_17,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_21,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_22,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_26,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_31,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_35,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_38,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_42,
(int)(long)&((struct stringpool2_t *)0)->stringpool_dos_47,

View File

@ -0,0 +1,7 @@
(int)(long)&((struct stringpool2_t *)0)->stringpool_extra_0,
(int)(long)&((struct stringpool2_t *)0)->stringpool_extra_1,
(int)(long)&((struct stringpool2_t *)0)->stringpool_extra_2,
(int)(long)&((struct stringpool2_t *)0)->stringpool_extra_3,
(int)(long)&((struct stringpool2_t *)0)->stringpool_extra_4,
(int)(long)&((struct stringpool2_t *)0)->stringpool_extra_6,
(int)(long)&((struct stringpool2_t *)0)->stringpool_extra_8,

View File

@ -0,0 +1,2 @@
(int)(long)&((struct stringpool_t *)0)->stringpool_str169,
(int)(long)&((struct stringpool_t *)0)->stringpool_str267,

View File

@ -0,0 +1,2 @@
(int)(long)&((struct stringpool2_t *)0)->stringpool_osf1_0,
(int)(long)&((struct stringpool2_t *)0)->stringpool_osf1_1,

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999-2001 Free Software Foundation, Inc. * Copyright (C) 1999-2005 Free Software Foundation, Inc.
* This file is part of the GNU LIBICONV Library. * This file is part of the GNU LIBICONV Library.
* *
* The GNU LIBICONV Library is free software; you can redistribute it * The GNU LIBICONV Library is free software; you can redistribute it
@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*
@ -94,13 +94,13 @@ static const unsigned short cns11643_1_2uni_page21[500] = {
0x247a, 0x247b, 0x247c, 0x247d, 0x2170, 0x2171, 0x2172, 0x2173, 0x247a, 0x247b, 0x247c, 0x247d, 0x2170, 0x2171, 0x2172, 0x2173,
0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179,
}; };
static const unsigned short cns11643_1_2uni_page42[33] = { static const unsigned short cns11643_1_2uni_page42[34] = {
/* 0x42 */ /* 0x42 */
0x2400, 0x2401, 0x2402, 0x2403, 0x2404, 0x2405, 0x2406, 0x2407, 0x2400, 0x2401, 0x2402, 0x2403, 0x2404, 0x2405, 0x2406, 0x2407,
0x2408, 0x2409, 0x240a, 0x240b, 0x240c, 0x240d, 0x240e, 0x240f, 0x2408, 0x2409, 0x240a, 0x240b, 0x240c, 0x240d, 0x240e, 0x240f,
0x2410, 0x2411, 0x2412, 0x2413, 0x2414, 0x2415, 0x2416, 0x2417, 0x2410, 0x2411, 0x2412, 0x2413, 0x2414, 0x2415, 0x2416, 0x2417,
0x2418, 0x2419, 0x241a, 0x241b, 0x241c, 0x241d, 0x241e, 0x241f, 0x2418, 0x2419, 0x241a, 0x241b, 0x241c, 0x241d, 0x241e, 0x241f,
0x2421, 0x2421, 0x20ac,
}; };
static const unsigned short cns11643_1_2uni_page44[5401] = { static const unsigned short cns11643_1_2uni_page44[5401] = {
/* 0x44 */ /* 0x44 */
@ -873,7 +873,7 @@ cns11643_1_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
else if (i == 583) else if (i == 583)
wc = 0x52f9; wc = 0x52f9;
} else if (i < 3290) { } else if (i < 3290) {
if (i < 3135) if (i < 3136)
wc = cns11643_1_2uni_page42[i-3102]; wc = cns11643_1_2uni_page42[i-3102];
} else { } else {
if (i < 8691) if (i < 8691)

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999-2002 Free Software Foundation, Inc. * Copyright (C) 1999-2002, 2004-2005 Free Software Foundation, Inc.
* This file is part of the GNU LIBICONV Library. * This file is part of the GNU LIBICONV Library.
* *
* The GNU LIBICONV Library is free software; you can redistribute it * The GNU LIBICONV Library is free software; you can redistribute it
@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* This file defines all the converters. */ /* This file defines all the converters. */
@ -98,6 +98,9 @@ struct conv_struct {
/* Operation flags */ /* Operation flags */
int transliterate; int transliterate;
int discard_ilseq; int discard_ilseq;
#ifndef LIBICONV_PLUG
struct iconv_hooks hooks;
#endif
}; };
/* /*
@ -139,6 +142,7 @@ struct conv_struct {
#include "iso8859_8.h" #include "iso8859_8.h"
#include "iso8859_9.h" #include "iso8859_9.h"
#include "iso8859_10.h" #include "iso8859_10.h"
#include "iso8859_11.h"
#include "iso8859_13.h" #include "iso8859_13.h"
#include "iso8859_14.h" #include "iso8859_14.h"
#include "iso8859_15.h" #include "iso8859_15.h"
@ -176,6 +180,7 @@ struct conv_struct {
#include "georgian_academy.h" #include "georgian_academy.h"
#include "georgian_ps.h" #include "georgian_ps.h"
#include "koi8_t.h" #include "koi8_t.h"
#include "pt154.h"
#include "mulelao.h" #include "mulelao.h"
#include "cp1133.h" #include "cp1133.h"
#include "tis620.h" #include "tis620.h"
@ -272,7 +277,9 @@ typedef struct {
#include "euc_jisx0213.h" #include "euc_jisx0213.h"
#include "shift_jisx0213.h" #include "shift_jisx0213.h"
#include "iso2022_jp3.h" #include "iso2022_jp3.h"
#include "big5_2003.h"
#include "tds565.h" #include "tds565.h"
#include "atarist.h"
#include "riscos1.h" #include "riscos1.h"
#endif #endif

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999-2001 Free Software Foundation, Inc. * Copyright (C) 1999-2001, 2004 Free Software Foundation, Inc.
* This file is part of the GNU LIBICONV Library. * This file is part of the GNU LIBICONV Library.
* *
* The GNU LIBICONV Library is free software; you can redistribute it * The GNU LIBICONV Library is free software; you can redistribute it
@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*
@ -241,7 +241,8 @@ cp1255_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
*pwc = (ucs4_t) last_wc; *pwc = (ucs4_t) last_wc;
return 0; /* Don't advance the input pointer. */ return 0; /* Don't advance the input pointer. */
} }
if (wc >= 0x05d0 && wc <= 0x05f2) { if ((wc >= 0x05d0 && wc <= 0x05ea && ((0x07db5f7f >> (wc - 0x05d0)) & 1))
|| wc == 0x05f2) {
/* wc is a possible match in cp1255_comp_table_data. Buffer it. */ /* wc is a possible match in cp1255_comp_table_data. Buffer it. */
conv->istate = wc; conv->istate = wc;
return RET_TOOFEW(1); return RET_TOOFEW(1);

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999-2001 Free Software Foundation, Inc. * Copyright (C) 1999-2001, 2004 Free Software Foundation, Inc.
* This file is part of the GNU LIBICONV Library. * This file is part of the GNU LIBICONV Library.
* *
* The GNU LIBICONV Library is free software; you can redistribute it * The GNU LIBICONV Library is free software; you can redistribute it
@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*
@ -29,6 +29,18 @@ static const unsigned char cp1258_comb_table[] = {
0xcc, 0xec, 0xde, 0xd2, 0xf2, 0xcc, 0xec, 0xde, 0xd2, 0xf2,
}; };
/* The possible bases in viet_comp_table_data:
0x0041..0x0045, 0x0047..0x0049, 0x004B..0x0050, 0x0052..0x0057,
0x0059..0x005A, 0x0061..0x0065, 0x0067..0x0069, 0x006B..0x0070,
0x0072..0x0077, 0x0079..0x007A, 0x00A5, 0x00A8, 0x00C2, 0x00C5..0x00C7,
0x00CA, 0x00CF, 0x00D3..0x00D4, 0x00D6, 0x00D8, 0x00DA, 0x00DC, 0x00E2,
0x00E5..0x00E7, 0x00EA, 0x00EF, 0x00F3..0x00F4, 0x00F6, 0x00F8, 0x00FA,
0x00FC, 0x0102..0x0103, 0x01A0..0x01A1, 0x01AF..0x01B0. */
static const unsigned int cp1258_comp_bases[] = {
0x06fdfbbe, 0x06fdfbbe, 0x00000000, 0x00000120, 0x155884e4, 0x155884e4,
0x0000000c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00018003
};
static const unsigned short cp1258_2uni[128] = { static const unsigned short cp1258_2uni[128] = {
/* 0x80 */ /* 0x80 */
0x20ac, 0xfffd, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x20ac, 0xfffd, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021,
@ -123,7 +135,8 @@ cp1258_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
*pwc = (ucs4_t) last_wc; *pwc = (ucs4_t) last_wc;
return 0; /* Don't advance the input pointer. */ return 0; /* Don't advance the input pointer. */
} }
if (wc >= 0x0041 && wc <= 0x01b0) { if (wc >= 0x0041 && wc <= 0x01b0
&& ((cp1258_comp_bases[(wc - 0x0040) >> 5] >> (wc & 0x1f)) & 1)) {
/* wc is a possible match in viet_comp_table_data. Buffer it. */ /* wc is a possible match in viet_comp_table_data. Buffer it. */
conv->istate = wc; conv->istate = wc;
return RET_TOOFEW(1); return RET_TOOFEW(1);

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2001 Free Software Foundation, Inc. * Copyright (C) 2001, 2005 Free Software Foundation, Inc.
* This file is part of the GNU LIBICONV Library. * This file is part of the GNU LIBICONV Library.
* *
* The GNU LIBICONV Library is free software; you can redistribute it * The GNU LIBICONV Library is free software; you can redistribute it
@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*
@ -51,9 +51,11 @@ dec_hanyu_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
} }
} }
} else if (c2 >= 0xa1 && c2 < 0xff) { } else if (c2 >= 0xa1 && c2 < 0xff) {
unsigned char buf[2]; if (c != 0xc2 || c2 < 0xc2) {
buf[0] = c-0x80; buf[1] = c2-0x80; unsigned char buf[2];
return cns11643_1_mbtowc(conv,pwc,buf,2); buf[0] = c-0x80; buf[1] = c2-0x80;
return cns11643_1_mbtowc(conv,pwc,buf,2);
}
} else if (c2 >= 0x21 && c2 < 0x7f) { } else if (c2 >= 0x21 && c2 < 0x7f) {
unsigned char buf[2]; unsigned char buf[2];
buf[0] = c-0x80; buf[1] = c2; buf[0] = c-0x80; buf[1] = c2;
@ -80,7 +82,7 @@ dec_hanyu_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
if (ret != 3) abort(); if (ret != 3) abort();
/* Code set 1 (CNS 11643-1992 Plane 1) */ /* Code set 1 (CNS 11643-1992 Plane 1) */
if (buf[0] == 1) { if (buf[0] == 1 && (buf[1] != 0x42 || buf[2] < 0x42)) {
if (n < 2) if (n < 2)
return RET_TOOSMALL; return RET_TOOSMALL;
r[0] = buf[1]+0x80; r[0] = buf[1]+0x80;

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999-2003 Free Software Foundation, Inc. /* Copyright (C) 1999-2005 Free Software Foundation, Inc.
This file is part of the GNU LIBICONV Library. This file is part of the GNU LIBICONV Library.
The GNU LIBICONV Library is free software; you can redistribute it The GNU LIBICONV Library is free software; you can redistribute it
@ -13,8 +13,8 @@
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU Library General Public
License along with the GNU LIBICONV Library; see the file COPYING.LIB. License along with the GNU LIBICONV Library; see the file COPYING.LIB.
If not, write to the Free Software Foundation, Inc., 59 Temple Place - If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Suite 330, Boston, MA 02111-1307, USA. */ Fifth Floor, Boston, MA 02110-1301, USA. */
/* The list of all system independent user-visible encodings. */ /* The list of all system independent user-visible encodings. */
@ -56,6 +56,7 @@ DEFENCODING(( "US-ASCII", /* IANA */
DEFENCODING(( "UTF-8", /* IANA, RFC 2279 */ DEFENCODING(( "UTF-8", /* IANA, RFC 2279 */
/*"UTF8", JDK 1.1 */ /*"UTF8", JDK 1.1 */
/*"CP65001", Windows */
), ),
utf8, utf8,
{ utf8_mbtowc, NULL }, { utf8_wctomb, NULL }) { utf8_mbtowc, NULL }, { utf8_wctomb, NULL })
@ -71,12 +72,14 @@ DEFENCODING(( "UCS-2BE", /* glibc */
"UNICODEBIG", /* glibc */ "UNICODEBIG", /* glibc */
"UNICODE-1-1", /* IANA */ "UNICODE-1-1", /* IANA */
"csUnicode11", /* IANA */ "csUnicode11", /* IANA */
/*"CP1201", Windows */
), ),
ucs2be, ucs2be,
{ ucs2be_mbtowc, NULL }, { ucs2be_wctomb, NULL }) { ucs2be_mbtowc, NULL }, { ucs2be_wctomb, NULL })
DEFENCODING(( "UCS-2LE", /* glibc */ DEFENCODING(( "UCS-2LE", /* glibc */
"UNICODELITTLE", /* glibc */ "UNICODELITTLE", /* glibc */
/*"CP1200", Windows */
), ),
ucs2le, ucs2le,
{ ucs2le_mbtowc, NULL }, { ucs2le_wctomb, NULL }) { ucs2le_mbtowc, NULL }, { ucs2le_wctomb, NULL })
@ -89,11 +92,13 @@ DEFENCODING(( "UCS-4", /* glibc */
{ ucs4_mbtowc, NULL }, { ucs4_wctomb, NULL }) { ucs4_mbtowc, NULL }, { ucs4_wctomb, NULL })
DEFENCODING(( "UCS-4BE", /* glibc */ DEFENCODING(( "UCS-4BE", /* glibc */
/*"CP12001", Windows */
), ),
ucs4be, ucs4be,
{ ucs4be_mbtowc, NULL }, { ucs4be_wctomb, NULL }) { ucs4be_mbtowc, NULL }, { ucs4be_wctomb, NULL })
DEFENCODING(( "UCS-4LE", /* glibc */ DEFENCODING(( "UCS-4LE", /* glibc */
/*"CP12000", Windows */
), ),
ucs4le, ucs4le,
{ ucs4le_mbtowc, NULL }, { ucs4le_wctomb, NULL }) { ucs4le_mbtowc, NULL }, { ucs4le_wctomb, NULL })
@ -113,17 +118,17 @@ DEFENCODING(( "UTF-16LE", /* IANA, RFC 2781 */
utf16le, utf16le,
{ utf16le_mbtowc, NULL }, { utf16le_wctomb, NULL }) { utf16le_mbtowc, NULL }, { utf16le_wctomb, NULL })
DEFENCODING(( "UTF-32", /* Unicode 3.1 */ DEFENCODING(( "UTF-32", /* IANA, Unicode 3.1 */
), ),
utf32, utf32,
{ utf32_mbtowc, NULL }, { utf32_wctomb, NULL }) { utf32_mbtowc, NULL }, { utf32_wctomb, NULL })
DEFENCODING(( "UTF-32BE", /* Unicode 3.1 */ DEFENCODING(( "UTF-32BE", /* IANA, Unicode 3.1 */
), ),
utf32be, utf32be,
{ utf32be_mbtowc, NULL }, { utf32be_wctomb, NULL }) { utf32be_mbtowc, NULL }, { utf32be_wctomb, NULL })
DEFENCODING(( "UTF-32LE", /* Unicode 3.1 */ DEFENCODING(( "UTF-32LE", /* IANA, Unicode 3.1 */
), ),
utf32le, utf32le,
{ utf32le_mbtowc, NULL }, { utf32le_wctomb, NULL }) { utf32le_mbtowc, NULL }, { utf32le_wctomb, NULL })
@ -131,6 +136,7 @@ DEFENCODING(( "UTF-32LE", /* Unicode 3.1 */
DEFENCODING(( "UTF-7", /* IANA, RFC 2152 */ DEFENCODING(( "UTF-7", /* IANA, RFC 2152 */
"UNICODE-1-1-UTF-7", /* IANA, RFC 1642 */ "UNICODE-1-1-UTF-7", /* IANA, RFC 1642 */
"csUnicode11UTF7", /* IANA */ "csUnicode11UTF7", /* IANA */
/*"CP65000", Windows */
), ),
utf7, utf7,
{ utf7_mbtowc, NULL }, { utf7_wctomb, utf7_reset }) { utf7_mbtowc, NULL }, { utf7_wctomb, utf7_reset })
@ -178,6 +184,7 @@ DEFENCODING(( "ISO-8859-1", /* IANA */
"csISOLatin1", /* IANA */ "csISOLatin1", /* IANA */
"ISO8859-1", /* X11R6.4, glibc, FreeBSD */ "ISO8859-1", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_1", JDK 1.1 */ /*"ISO8859_1", JDK 1.1 */
/*"CP28591", Windows */
), ),
iso8859_1, iso8859_1,
{ iso8859_1_mbtowc, NULL }, { iso8859_1_wctomb, NULL }) { iso8859_1_mbtowc, NULL }, { iso8859_1_wctomb, NULL })
@ -191,6 +198,7 @@ DEFENCODING(( "ISO-8859-2", /* IANA */
"csISOLatin2", /* IANA */ "csISOLatin2", /* IANA */
"ISO8859-2", /* X11R6.4, glibc, FreeBSD */ "ISO8859-2", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_2", JDK 1.1 */ /*"ISO8859_2", JDK 1.1 */
/*"CP28592", Windows */
), ),
iso8859_2, iso8859_2,
{ iso8859_2_mbtowc, NULL }, { iso8859_2_wctomb, NULL }) { iso8859_2_mbtowc, NULL }, { iso8859_2_wctomb, NULL })
@ -204,6 +212,7 @@ DEFENCODING(( "ISO-8859-3", /* IANA */
"csISOLatin3", /* IANA */ "csISOLatin3", /* IANA */
"ISO8859-3", /* X11R6.4, glibc, FreeBSD */ "ISO8859-3", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_3", JDK 1.1 */ /*"ISO8859_3", JDK 1.1 */
/*"CP28593", Windows */
), ),
iso8859_3, iso8859_3,
{ iso8859_3_mbtowc, NULL }, { iso8859_3_wctomb, NULL }) { iso8859_3_mbtowc, NULL }, { iso8859_3_wctomb, NULL })
@ -217,6 +226,7 @@ DEFENCODING(( "ISO-8859-4", /* IANA */
"csISOLatin4", /* IANA */ "csISOLatin4", /* IANA */
"ISO8859-4", /* X11R6.4, glibc, FreeBSD */ "ISO8859-4", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_4", JDK 1.1 */ /*"ISO8859_4", JDK 1.1 */
/*"CP28594", Windows */
), ),
iso8859_4, iso8859_4,
{ iso8859_4_mbtowc, NULL }, { iso8859_4_wctomb, NULL }) { iso8859_4_mbtowc, NULL }, { iso8859_4_wctomb, NULL })
@ -229,6 +239,7 @@ DEFENCODING(( "ISO-8859-5", /* IANA */
"csISOLatinCyrillic", /* IANA */ "csISOLatinCyrillic", /* IANA */
"ISO8859-5", /* X11R6.4, glibc, FreeBSD */ "ISO8859-5", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_5", JDK 1.1 */ /*"ISO8859_5", JDK 1.1 */
/*"CP28595", Windows */
), ),
iso8859_5, iso8859_5,
{ iso8859_5_mbtowc, NULL }, { iso8859_5_wctomb, NULL }) { iso8859_5_mbtowc, NULL }, { iso8859_5_wctomb, NULL })
@ -243,6 +254,7 @@ DEFENCODING(( "ISO-8859-6", /* IANA */
"csISOLatinArabic", /* IANA */ "csISOLatinArabic", /* IANA */
"ISO8859-6", /* X11R6.4, glibc, FreeBSD */ "ISO8859-6", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_6", JDK 1.1 */ /*"ISO8859_6", JDK 1.1 */
/*"CP28596", Windows */
), ),
iso8859_6, iso8859_6,
{ iso8859_6_mbtowc, NULL }, { iso8859_6_wctomb, NULL }) { iso8859_6_mbtowc, NULL }, { iso8859_6_wctomb, NULL })
@ -250,6 +262,7 @@ DEFENCODING(( "ISO-8859-6", /* IANA */
DEFENCODING(( "ISO-8859-7", /* IANA, RFC 1947 */ DEFENCODING(( "ISO-8859-7", /* IANA, RFC 1947 */
"ISO_8859-7", /* IANA */ "ISO_8859-7", /* IANA */
"ISO_8859-7:1987", /* IANA */ "ISO_8859-7:1987", /* IANA */
"ISO_8859-7:2003",
"ISO-IR-126", /* IANA */ "ISO-IR-126", /* IANA */
"ECMA-118", /* IANA */ "ECMA-118", /* IANA */
"ELOT_928", /* IANA */ "ELOT_928", /* IANA */
@ -258,6 +271,7 @@ DEFENCODING(( "ISO-8859-7", /* IANA, RFC 1947 */
"csISOLatinGreek", /* IANA */ "csISOLatinGreek", /* IANA */
"ISO8859-7", /* X11R6.4, glibc, FreeBSD */ "ISO8859-7", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_7", JDK 1.1 */ /*"ISO8859_7", JDK 1.1 */
/*"CP28597", Windows */
), ),
iso8859_7, iso8859_7,
{ iso8859_7_mbtowc, NULL }, { iso8859_7_wctomb, NULL }) { iso8859_7_mbtowc, NULL }, { iso8859_7_wctomb, NULL })
@ -270,6 +284,8 @@ DEFENCODING(( "ISO-8859-8", /* IANA */
"csISOLatinHebrew", /* IANA */ "csISOLatinHebrew", /* IANA */
"ISO8859-8", /* X11R6.4, glibc, FreeBSD */ "ISO8859-8", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_8", JDK 1.1 */ /*"ISO8859_8", JDK 1.1 */
/*"CP28598", Windows */
/*"CP38598", Windows */
), ),
iso8859_8, iso8859_8,
{ iso8859_8_mbtowc, NULL }, { iso8859_8_wctomb, NULL }) { iso8859_8_mbtowc, NULL }, { iso8859_8_wctomb, NULL })
@ -283,6 +299,7 @@ DEFENCODING(( "ISO-8859-9", /* IANA */
"csISOLatin5", /* IANA */ "csISOLatin5", /* IANA */
"ISO8859-9", /* X11R6.4, glibc, FreeBSD */ "ISO8859-9", /* X11R6.4, glibc, FreeBSD */
/*"ISO8859_9", JDK 1.1 */ /*"ISO8859_9", JDK 1.1 */
/*"CP28599", Windows */
), ),
iso8859_9, iso8859_9,
{ iso8859_9_mbtowc, NULL }, { iso8859_9_wctomb, NULL }) { iso8859_9_mbtowc, NULL }, { iso8859_9_wctomb, NULL })
@ -299,6 +316,13 @@ DEFENCODING(( "ISO-8859-10", /* IANA */
iso8859_10, iso8859_10,
{ iso8859_10_mbtowc, NULL }, { iso8859_10_wctomb, NULL }) { iso8859_10_mbtowc, NULL }, { iso8859_10_wctomb, NULL })
DEFENCODING(( "ISO-8859-11", /* glibc */
"ISO_8859-11",
"ISO8859-11", /* X11R6.7, glibc */
),
iso8859_11,
{ iso8859_11_mbtowc, NULL }, { iso8859_11_wctomb, NULL })
DEFENCODING(( "ISO-8859-13", /* IANA, glibc */ DEFENCODING(( "ISO-8859-13", /* IANA, glibc */
"ISO_8859-13", "ISO_8859-13",
"ISO-IR-179", /* glibc */ "ISO-IR-179", /* glibc */
@ -325,15 +349,19 @@ DEFENCODING(( "ISO-8859-15", /* IANA, glibc */
"ISO_8859-15", /* IANA */ "ISO_8859-15", /* IANA */
"ISO_8859-15:1998", /* glibc */ "ISO_8859-15:1998", /* glibc */
"ISO-IR-203", "ISO-IR-203",
"LATIN-9", /* IANA */
"ISO8859-15", /* glibc, FreeBSD */ "ISO8859-15", /* glibc, FreeBSD */
/*"CP28605", Windows */
), ),
iso8859_15, iso8859_15,
{ iso8859_15_mbtowc, NULL }, { iso8859_15_wctomb, NULL }) { iso8859_15_mbtowc, NULL }, { iso8859_15_wctomb, NULL })
DEFENCODING(( "ISO-8859-16", DEFENCODING(( "ISO-8859-16", /* IANA */
"ISO_8859-16", "ISO_8859-16", /* IANA */
"ISO_8859-16:2000", "ISO_8859-16:2001", /* IANA */
"ISO-IR-226", "ISO-IR-226", /* IANA */
"LATIN10", /* IANA */
"L10", /* IANA */
"ISO8859-16", /* glibc, FreeBSD */ "ISO8859-16", /* glibc, FreeBSD */
), ),
iso8859_16, iso8859_16,
@ -341,6 +369,7 @@ DEFENCODING(( "ISO-8859-16",
DEFENCODING(( "KOI8-R", /* IANA, RFC 1489, X11R6.4, JDK 1.1 */ DEFENCODING(( "KOI8-R", /* IANA, RFC 1489, X11R6.4, JDK 1.1 */
"csKOI8R", /* IANA */ "csKOI8R", /* IANA */
/*"CP20866", Windows */
), ),
koi8_r, koi8_r,
{ koi8_r_mbtowc, NULL }, { koi8_r_wctomb, NULL }) { koi8_r_mbtowc, NULL }, { koi8_r_wctomb, NULL })
@ -453,61 +482,73 @@ DEFENCODING(( "MacRoman", /* JDK 1.1 */
"MACINTOSH", /* IANA */ "MACINTOSH", /* IANA */
"MAC", /* IANA */ "MAC", /* IANA */
"csMacintosh", /* IANA */ "csMacintosh", /* IANA */
/*"CP10000", Windows */
), ),
mac_roman, mac_roman,
{ mac_roman_mbtowc, NULL }, { mac_roman_wctomb, NULL }) { mac_roman_mbtowc, NULL }, { mac_roman_wctomb, NULL })
DEFENCODING(( "MacCentralEurope", /* JDK 1.1 */ DEFENCODING(( "MacCentralEurope", /* JDK 1.1 */
/*"CP10029", Windows */
), ),
mac_centraleurope, mac_centraleurope,
{ mac_centraleurope_mbtowc, NULL }, { mac_centraleurope_wctomb, NULL }) { mac_centraleurope_mbtowc, NULL }, { mac_centraleurope_wctomb, NULL })
DEFENCODING(( "MacIceland", /* JDK 1.1 */ DEFENCODING(( "MacIceland", /* JDK 1.1 */
/*"CP10079", Windows */
), ),
mac_iceland, mac_iceland,
{ mac_iceland_mbtowc, NULL }, { mac_iceland_wctomb, NULL }) { mac_iceland_mbtowc, NULL }, { mac_iceland_wctomb, NULL })
DEFENCODING(( "MacCroatian", /* JDK 1.1 */ DEFENCODING(( "MacCroatian", /* JDK 1.1 */
/*"CP10082", Windows */
), ),
mac_croatian, mac_croatian,
{ mac_croatian_mbtowc, NULL }, { mac_croatian_wctomb, NULL }) { mac_croatian_mbtowc, NULL }, { mac_croatian_wctomb, NULL })
DEFENCODING(( "MacRomania", /* JDK 1.1 */ DEFENCODING(( "MacRomania", /* JDK 1.1 */
/*"CP10010", Windows */
), ),
mac_romania, mac_romania,
{ mac_romania_mbtowc, NULL }, { mac_romania_wctomb, NULL }) { mac_romania_mbtowc, NULL }, { mac_romania_wctomb, NULL })
DEFENCODING(( "MacCyrillic", /* JDK 1.1 */ DEFENCODING(( "MacCyrillic", /* JDK 1.1 */
/*"CP10007", Windows */
), ),
mac_cyrillic, mac_cyrillic,
{ mac_cyrillic_mbtowc, NULL }, { mac_cyrillic_wctomb, NULL }) { mac_cyrillic_mbtowc, NULL }, { mac_cyrillic_wctomb, NULL })
DEFENCODING(( "MacUkraine", /* JDK 1.1 */ DEFENCODING(( "MacUkraine", /* JDK 1.1 */
/*"CP10017", Windows */
), ),
mac_ukraine, mac_ukraine,
{ mac_ukraine_mbtowc, NULL }, { mac_ukraine_wctomb, NULL }) { mac_ukraine_mbtowc, NULL }, { mac_ukraine_wctomb, NULL })
DEFENCODING(( "MacGreek", /* JDK 1.1 */ DEFENCODING(( "MacGreek", /* JDK 1.1 */
/*"CP10006", Windows */
), ),
mac_greek, mac_greek,
{ mac_greek_mbtowc, NULL }, { mac_greek_wctomb, NULL }) { mac_greek_mbtowc, NULL }, { mac_greek_wctomb, NULL })
DEFENCODING(( "MacTurkish", /* JDK 1.1 */ DEFENCODING(( "MacTurkish", /* JDK 1.1 */
/*"CP10081", Windows */
), ),
mac_turkish, mac_turkish,
{ mac_turkish_mbtowc, NULL }, { mac_turkish_wctomb, NULL }) { mac_turkish_mbtowc, NULL }, { mac_turkish_wctomb, NULL })
DEFENCODING(( "MacHebrew", /* JDK 1.1 */ DEFENCODING(( "MacHebrew", /* JDK 1.1 */
/*"CP10005", Windows */
), ),
mac_hebrew, mac_hebrew,
{ mac_hebrew_mbtowc, NULL }, { mac_hebrew_wctomb, NULL }) { mac_hebrew_mbtowc, NULL }, { mac_hebrew_wctomb, NULL })
DEFENCODING(( "MacArabic", /* JDK 1.1 */ DEFENCODING(( "MacArabic", /* JDK 1.1 */
/*"CP10004", Windows */
), ),
mac_arabic, mac_arabic,
{ mac_arabic_mbtowc, NULL }, { mac_arabic_wctomb, NULL }) { mac_arabic_mbtowc, NULL }, { mac_arabic_wctomb, NULL })
DEFENCODING(( "MacThai", /* JDK 1.1 */ DEFENCODING(( "MacThai", /* JDK 1.1 */
/*"CP10021", Windows */
), ),
mac_thai, mac_thai,
{ mac_thai_mbtowc, NULL }, { mac_thai_wctomb, NULL }) { mac_thai_mbtowc, NULL }, { mac_thai_wctomb, NULL })
@ -549,6 +590,15 @@ DEFENCODING(( "KOI8-T",
koi8_t, koi8_t,
{ koi8_t_mbtowc, NULL }, { koi8_t_wctomb, NULL }) { koi8_t_mbtowc, NULL }, { koi8_t_wctomb, NULL })
DEFENCODING(( "PT154", /* IANA, glibc */
"PTCP154", /* IANA */
"CP154", /* IANA */
"CYRILLIC-ASIAN", /* IANA */
"csPTCP154", /* IANA */
),
pt154,
{ pt154_mbtowc, NULL }, { pt154_wctomb, NULL })
DEFENCODING(( "MULELAO-1", DEFENCODING(( "MULELAO-1",
), ),
mulelao, mulelao,
@ -683,6 +733,7 @@ DEFENCODING(( "EUC-JP", /* IANA */
"Extended_UNIX_Code_Packed_Format_for_Japanese", /* IANA */ "Extended_UNIX_Code_Packed_Format_for_Japanese", /* IANA */
"csEUCPkdFmtJapanese", /* IANA */ "csEUCPkdFmtJapanese", /* IANA */
/*"EUC_JP", JDK 1.1 */ /*"EUC_JP", JDK 1.1 */
/*"CP51932", Windows */
), ),
euc_jp, euc_jp,
{ euc_jp_mbtowc, NULL }, { euc_jp_wctomb, NULL }) { euc_jp_mbtowc, NULL }, { euc_jp_wctomb, NULL })
@ -725,17 +776,21 @@ DEFENCODING(( "EUC-CN", /* glibc */
"CN-GB", /* RFC 1922 */ "CN-GB", /* RFC 1922 */
"csGB2312", /* IANA */ "csGB2312", /* IANA */
/*"EUC_CN", JDK 1.1 */ /*"EUC_CN", JDK 1.1 */
/*"CP51936", Windows */
), ),
euc_cn, euc_cn,
{ euc_cn_mbtowc, NULL }, { euc_cn_wctomb, NULL }) { euc_cn_mbtowc, NULL }, { euc_cn_wctomb, NULL })
DEFENCODING(( "GBK", /* JDK 1.1 */ DEFENCODING(( "GBK", /* IANA, JDK 1.1 */
"CP936", "CP936", /* IANA */
"MS936", /* IANA */
"WINDOWS-936", /* IANA */
), ),
ces_gbk, ces_gbk,
{ ces_gbk_mbtowc, NULL }, { ces_gbk_wctomb, NULL }) { ces_gbk_mbtowc, NULL }, { ces_gbk_wctomb, NULL })
DEFENCODING(( "GB18030", /* glibc */ DEFENCODING(( "GB18030", /* IANA, glibc */
/*"CP54936", Windows */
), ),
gb18030, gb18030,
{ gb18030_mbtowc, NULL }, { gb18030_wctomb, NULL }) { gb18030_mbtowc, NULL }, { gb18030_wctomb, NULL })
@ -762,6 +817,7 @@ DEFENCODING(( "EUC-TW", /* glibc */
"EUCTW", /* glibc */ "EUCTW", /* glibc */
"csEUCTW", "csEUCTW",
/*"EUC_TW", JDK 1.1 */ /*"EUC_TW", JDK 1.1 */
/*"CP51950", Windows */
), ),
euc_tw, euc_tw,
{ euc_tw_mbtowc, NULL }, { euc_tw_wctomb, NULL }) { euc_tw_mbtowc, NULL }, { euc_tw_wctomb, NULL })
@ -791,6 +847,7 @@ DEFENCODING(( "EUC-KR", /* IANA, RFC 1557 */
"EUCKR", /* glibc */ "EUCKR", /* glibc */
"csEUCKR", /* IANA */ "csEUCKR", /* IANA */
/*"EUC_KR", JDK 1.1 */ /*"EUC_KR", JDK 1.1 */
/*"CP51949", Windows */
), ),
euc_kr, euc_kr,
{ euc_kr_mbtowc, NULL }, { euc_kr_wctomb, NULL }) { euc_kr_mbtowc, NULL }, { euc_kr_wctomb, NULL })

View File

@ -13,8 +13,8 @@
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU Library General Public
License along with the GNU LIBICONV Library; see the file COPYING.LIB. License along with the GNU LIBICONV Library; see the file COPYING.LIB.
If not, write to the Free Software Foundation, Inc., 59 Temple Place - If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Suite 330, Boston, MA 02111-1307, USA. */ Fifth Floor, Boston, MA 02110-1301, USA. */
/* Encodings used by system dependent locales on AIX. */ /* Encodings used by system dependent locales on AIX. */

View File

@ -13,8 +13,8 @@
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU Library General Public
License along with the GNU LIBICONV Library; see the file COPYING.LIB. License along with the GNU LIBICONV Library; see the file COPYING.LIB.
If not, write to the Free Software Foundation, Inc., 59 Temple Place - If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Suite 330, Boston, MA 02111-1307, USA. */ Fifth Floor, Boston, MA 02110-1301, USA. */
/* Encodings used by system dependent locales on MSDOS. */ /* Encodings used by system dependent locales on MSDOS. */

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002 Free Software Foundation, Inc. /* Copyright (C) 2002, 2005 Free Software Foundation, Inc.
This file is part of the GNU LIBICONV Library. This file is part of the GNU LIBICONV Library.
The GNU LIBICONV Library is free software; you can redistribute it The GNU LIBICONV Library is free software; you can redistribute it
@ -13,8 +13,8 @@
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU Library General Public
License along with the GNU LIBICONV Library; see the file COPYING.LIB. License along with the GNU LIBICONV Library; see the file COPYING.LIB.
If not, write to the Free Software Foundation, Inc., 59 Temple Place - If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Suite 330, Boston, MA 02111-1307, USA. */ Fifth Floor, Boston, MA 02110-1301, USA. */
DEFENCODING(( "EUC-JISX0213", DEFENCODING(( "EUC-JISX0213",
), ),
@ -31,12 +31,23 @@ DEFENCODING(( "ISO-2022-JP-3",
iso2022_jp3, iso2022_jp3,
{ iso2022_jp3_mbtowc, iso2022_jp3_flushwc }, { iso2022_jp3_wctomb, iso2022_jp3_reset }) { iso2022_jp3_mbtowc, iso2022_jp3_flushwc }, { iso2022_jp3_wctomb, iso2022_jp3_reset })
DEFENCODING(( "BIG5-2003",
),
big5_2003,
{ big5_2003_mbtowc, NULL }, { big5_2003_wctomb, NULL })
DEFENCODING(( "TDS565", DEFENCODING(( "TDS565",
"ISO-IR-230", "ISO-IR-230",
), ),
tds565, tds565,
{ tds565_mbtowc, NULL }, { tds565_wctomb, NULL }) { tds565_mbtowc, NULL }, { tds565_wctomb, NULL })
DEFENCODING(( "ATARIST",
"ATARI",
),
atarist,
{ atarist_mbtowc, NULL }, { atarist_wctomb, NULL })
DEFENCODING(( "RISCOS-LATIN1", DEFENCODING(( "RISCOS-LATIN1",
), ),
riscos1, riscos1,

View File

@ -13,8 +13,8 @@
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU Library General Public
License along with the GNU LIBICONV Library; see the file COPYING.LIB. License along with the GNU LIBICONV Library; see the file COPYING.LIB.
If not, write to the Free Software Foundation, Inc., 59 Temple Place - If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Suite 330, Boston, MA 02111-1307, USA. */ Fifth Floor, Boston, MA 02110-1301, USA. */
/* Names for locale dependent encodings. */ /* Names for locale dependent encodings. */

View File

@ -13,8 +13,8 @@
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU Library General Public
License along with the GNU LIBICONV Library; see the file COPYING.LIB. License along with the GNU LIBICONV Library; see the file COPYING.LIB.
If not, write to the Free Software Foundation, Inc., 59 Temple Place - If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
Suite 330, Boston, MA 02111-1307, USA. */ Fifth Floor, Boston, MA 02110-1301, USA. */
/* Encodings used by system dependent locales on OSF/1 a.k.a. Tru64. */ /* Encodings used by system dependent locales on OSF/1 a.k.a. Tru64. */

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -43,6 +43,7 @@
#define ei_iso8859_8_oflags (HAVE_ACCENTS) #define ei_iso8859_8_oflags (HAVE_ACCENTS)
#define ei_iso8859_9_oflags (HAVE_ACCENTS) #define ei_iso8859_9_oflags (HAVE_ACCENTS)
#define ei_iso8859_10_oflags (0) #define ei_iso8859_10_oflags (0)
#define ei_iso8859_11_oflags (0)
#define ei_iso8859_13_oflags (0) #define ei_iso8859_13_oflags (0)
#define ei_iso8859_14_oflags (0) #define ei_iso8859_14_oflags (0)
#define ei_iso8859_15_oflags (0) #define ei_iso8859_15_oflags (0)
@ -80,6 +81,7 @@
#define ei_georgian_academy_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS) #define ei_georgian_academy_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
#define ei_georgian_ps_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS) #define ei_georgian_ps_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
#define ei_koi8_t_oflags (HAVE_QUOTATION_MARKS) #define ei_koi8_t_oflags (HAVE_QUOTATION_MARKS)
#define ei_pt154_oflags (HAVE_QUOTATION_MARKS)
#define ei_mulelao_oflags (0) #define ei_mulelao_oflags (0)
#define ei_cp1133_oflags (0) #define ei_cp1133_oflags (0)
#define ei_tis620_oflags (0) #define ei_tis620_oflags (0)
@ -143,5 +145,7 @@
#define ei_euc_jisx0213_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS) #define ei_euc_jisx0213_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
#define ei_shift_jisx0213_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS) #define ei_shift_jisx0213_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
#define ei_iso2022_jp3_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS) #define ei_iso2022_jp3_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)
#define ei_big5_2003_oflags (HAVE_QUOTATION_MARKS)
#define ei_tds565_oflags (0) #define ei_tds565_oflags (0)
#define ei_atarist_oflags (HAVE_ACCENTS)
#define ei_riscos1_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS) #define ei_riscos1_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef _FLUSHWC_H #ifndef _FLUSHWC_H

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

View File

@ -14,8 +14,8 @@
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with the GNU LIBICONV Library; see the file COPYING.LIB. * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
* If not, write to the Free Software Foundation, Inc., 59 Temple Place - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
* Suite 330, Boston, MA 02111-1307, USA. * Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/* /*

Some files were not shown because too many files have changed in this diff Show More