diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-12-31 18:19:19 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-12-31 18:19:19 +0000 |
commit | 118bad87bd098285be80cd32268c36668b4aea2b (patch) | |
tree | f2ad4c7200d2c3e2a88c541301f7950112042489 /iconvdata/euc-tw.c | |
parent | c046e7a5a6007631882a7a1838fe804bc66882b9 (diff) | |
download | glibc-118bad87bd098285be80cd32268c36668b4aea2b.zip glibc-118bad87bd098285be80cd32268c36668b4aea2b.tar.gz glibc-118bad87bd098285be80cd32268c36668b4aea2b.tar.bz2 |
Update.
1998-12-31 Ulrich Drepper <drepper@cygnus.com>
* iconvdata/Makefile: Use rpath $ORIGIN for modules which use any of
the conversion libraries.
* include/features.h: Mention latest extensions in _POSIX_C_SOURCE
description.
* libio/genops.c (list_all_lock): New variable.
(_IO_un_link, _IO_link_in): Acquire lock before modifying _IO_list_all.
[PR libc/911].
* sysdeps/i386/i686/strtok.s: Add missing cld.
* sysdeps/i386/i686/mempcpy.S: New file.
1998-12-30 Geoff Keating <geoffk@ozemail.com.au>
Suppress parentheses warnings:
* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c
(DL_FIND_ARG_COMPONENTS): here,
* sysdeps/powerpc/dl-machine.c: here,
* sysdeps/powerpc/fclrexcpt.c (feclearexcept): here,
* sysdeps/powerpc/fesetround.c (fesetround): here,
* sysdeps/powerpc/feupdateenv.c (feupdateenv): here,
* sysdeps/powerpc/fraiseexcpt.c (feraiseexcept): here,
* sysdeps/powerpc/fsetexcptflg.c (fesetexceptflag): here,
* sysdeps/powerpc/s_rint.c (__rint): here,
* sysdeps/powerpc/s_rintf.c (__rintf): here,
* sysdeps/powerpc/w_sqrt.c (__sqrt): here,
* sysdeps/powerpc/w_sqrtf.c (__sqrtf): and here.
1998-12-30 Geoff Keating <geoffk@ozemail.com.au>
* wcsmbs/wcstold.c [__NO_LONG_DOUBLE_MATH]: Include wchar.h.
* wcsmbs/wcstold_l.c [__NO_LONG_DOUBLE_MATH]: Likewise. Also define
appropropriate prototypes, correct procedure names.
1998-12-30 Geoff Keating <geoffk@ozemail.com.au>
* sysdeps/generic/crypt-entry.c: Prototype __crypt_r, suppress
warning.
(__crypt_r): Add __restrict.
* sysdeps/generic/crypt.h: Remove internal routine. Add __restrict.
1998-12-31 Ulrich Drepper <drepper@cygnus.com>
* stdlib/longlong.h: Add missing #else in SPARC definitions.
1998-12-30 Andreas Jaeger <aj@arthur.rhein-neckar.de>
Patches by Ralf Baechle <ralf@gnu.org>:
* sysdeps/unix/sysv/linux/mips/sgidefs.h: Removed.
* sysdeps/unix/sysv/linux/mips/sys/asm.h: Removed.
* sysdeps/unix/sysv/linux/mips/sys/regdef.h: Removed.
* sysdeps/unix/sysv/linux/mips/sys/fpregdef.h: Removed.
* sysdeps/unix/sysv/linux/mips/regdef.h: Removed.
* sysdeps/unix/sysv/linux/mips/fpregdef.h: Removed.
* sysdeps/unix/sysv/linux/mips/Makefile: Remove delete files.
* sysdeps/unix/sysv/linux/mips/Dist: Remove deleted files.
* sysdeps/mips/sys/fpregdef.h: New files, enhanced versions of deleted
linux specific files.
* sysdeps/mips/sys/asm.h: Likewise.
* sysdeps/mips/sgidefs.h: Likewise.
* sysdeps/mips/fpregdef.h: Likewise.
* sysdeps/mips/regdef.h: Likewise.
* sysdeps/mips/Makefile: Add new headers.
* sysdeps/mips/Dist: Add new files.
* sysdeps/mips/fpu_control.h (_FPU_DEFAULT): Change value.
1998-12-28 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* iconvdata/Makefile: Remove variable assignments and rules that
are now auto-generated. Include $(objpfx)iconv-rules instead.
Btw, that removes a few typos.
(charmaps): New variable.
($(objpfx)iconv-rules): New target.
(gen-8bit-modules): Renamed from sed-generated-headers, remove .h
suffixes.
(gen-8bit-gap-modules): Renamed from awk-generated-headers, remove
.h suffixes.
(gen-special-modules): New variable.
(generated-modules): New variable.
(headers): Use it.
(before-compile): Likewise.
(generated): Likewise, and add iconv-rules.
* iconvdata/euc-cn.c: Renamed from euccn.c.
* iconvdata/euc-jp.c: Renamed from eucjp.c.
* iconvdata/euc-kr.c: Renamed from euckr.c.
* iconvdata/euc-tw.c: Renamed from euctw.c.
* iconvdata/iso_6937.c: Renamed from iso6937.c.
* iconvdata/iso_6937-2.c: Renamed from iso6937-2.c.
* iconvdata/t.61.c: Renamed from t61.c.
* iconvdata/Makefile (distribute): Adjusted for those renames.
Remove $(objpfx) from names.
1998-12-28 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* sysdeps/generic/hp-timing.h: Fix comment.
* sysdeps/generic/dl-hash.h: Likewise.
* sysdeps/i386/i686/hp-timing.h: Likewise.
1998-12-28 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* posix/fnmatch.c (fnmatch): Always pass unsigned char values to
FOLD macro.
1998-12-28 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* nss/db-Makefile ($(VAR_DB)/shadow.db): Fix last change.
1998-12-29 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/mips/bits/sigaction.h: Sync with
current Linux 2.1.132 kernel sources.
1998-12-28 Andreas Jaeger <aj@arthur.rhein-neckar.de>
Patches by Ralf Baechle <ralf@gnu.org> for Linux/MIPS:
* sysdeps/unix/sysv/linux/mips/syscalls.list: Add ipc, change
pread/pwrite and llseek calls.
* sysdeps/unix/sysv/linux/mips/sysdep.S: New file.
1998-12-29 Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
* malloc/thread-m.h [_LIBC] : Fix for NO_THREADS case.
Diffstat (limited to 'iconvdata/euc-tw.c')
-rw-r--r-- | iconvdata/euc-tw.c | 188 |
1 files changed, 188 insertions, 0 deletions
diff --git a/iconvdata/euc-tw.c b/iconvdata/euc-tw.c new file mode 100644 index 0000000..ca1cdac --- /dev/null +++ b/iconvdata/euc-tw.c @@ -0,0 +1,188 @@ +/* Mapping tables for EUC-TW handling. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <stdint.h> +#include <cns11643l1.h> +#include <cns11643.h> + +/* Definitions used in the body of the `gconv' function. */ +#define CHARSET_NAME "EUC-TW//" +#define FROM_LOOP from_euc_tw +#define TO_LOOP to_euc_tw +#define DEFINE_INIT 1 +#define DEFINE_FINI 1 +#define MIN_NEEDED_FROM 1 +#define MAX_NEEDED_FROM 4 +#define MIN_NEEDED_TO 4 + + +/* First define the conversion function from EUC-TW to UCS4. */ +#define MIN_NEEDED_INPUT MIN_NEEDED_FROM +#define MAX_NEEDED_INPUT MAX_NEEDED_FROM +#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO +#define LOOPFCT FROM_LOOP +#define BODY \ + { \ + uint32_t ch = *inptr; \ + \ + if (ch <= 0x7f) \ + /* Plain ASCII. */ \ + ++inptr; \ + else if ((ch <= 0xa0 || ch > 0xfe) && ch != 0x8e) \ + { \ + /* This is illegal. */ \ + result = GCONV_ILLEGAL_INPUT; \ + break; \ + } \ + else \ + { \ + /* Two or more byte character. First test whether the next \ + character is also available. */ \ + uint32_t ch2; \ + \ + if (NEED_LENGTH_TEST && inptr + (ch == 0x8e ? 3 : 1) >= inend) \ + { \ + /* The second character is not available. Store the \ + intermediate result. */ \ + result = GCONV_INCOMPLETE_INPUT; \ + break; \ + } \ + \ + ch2 = *inptr; \ + \ + /* All second bytes of a multibyte character must be >= 0xa1. */ \ + if (ch2 < 0xa1 || ch2 == 0xff) \ + { \ + /* This is an illegal character. */ \ + result = GCONV_ILLEGAL_INPUT; \ + break; \ + } \ + \ + if (ch == 0x8e) \ + { \ + /* This is code set 2: CNS 11643, planes 1 to 16. */ \ + const char *endp = inptr + 1; \ + \ + ch = cns11643_to_ucs4 (&endp, \ + NEED_LENGTH_TEST ? inend - inptr - 1 : 3, \ + 0x80); \ + /* Please note that we need not test for the missing input \ + characters here anymore. */ \ + if (ch == UNKNOWN_10646_CHAR) \ + { \ + /* Illegal input. */ \ + result = GCONV_ILLEGAL_INPUT; \ + break; \ + } \ + \ + inptr += 4; \ + } \ + else \ + { \ + /* This is code set 1: CNS 11643, plane 1. */ \ + const char *endp = inptr; \ + \ + ch = cns11643l1_to_ucs4 (&endp, \ + NEED_LENGTH_TEST ? inend - inptr : 2, \ + 0x80); \ + /* Please note that we need not test for the missing input \ + characters here anymore. */ \ + if (ch == UNKNOWN_10646_CHAR) \ + { \ + /* Illegal input. */ \ + result = GCONV_ILLEGAL_INPUT; \ + break; \ + } \ + \ + inptr += 2; \ + } \ + } \ + \ + *((uint32_t *) outptr)++ = ch; \ + } +#include <iconv/loop.c> + + +/* Next, define the other direction. */ +#define MIN_NEEDED_INPUT MIN_NEEDED_TO +#define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM +#define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM +#define LOOPFCT TO_LOOP +#define BODY \ + { \ + uint32_t ch = *((uint32_t *) inptr); \ + \ + if (ch <= 0x7f) \ + /* It's plain ASCII. */ \ + *outptr++ = ch; \ + else \ + { \ + /* Try the JIS character sets. */ \ + size_t found; \ + \ + found = ucs4_to_cns11643l1 (ch, outptr, \ + NEED_LENGTH_TEST ? outend - outptr : 2); \ + if (NEED_LENGTH_TEST && found == 0) \ + { \ + /* We ran out of space. */ \ + result = GCONV_INCOMPLETE_INPUT; \ + break; \ + } \ + if (found != UNKNOWN_10646_CHAR) \ + { \ + /* It's a CNS 11643, plane 1 character, adjust it for EUC-TW. */ \ + *outptr++ += 0x80; \ + *outptr++ += 0x80; \ + } \ + else \ + { \ + /* No CNS 11643, plane 1 character. */ \ + \ + found = ucs4_to_cns11643 (ch, outptr + 1, \ + (NEED_LENGTH_TEST \ + ? outend - outptr - 1 : 3)); \ + if (NEED_LENGTH_TEST && found == 0) \ + { \ + /* We ran out of space. */ \ + result = GCONV_INCOMPLETE_INPUT; \ + break; \ + } \ + if (found == UNKNOWN_10646_CHAR) \ + { \ + /* No legal input. */ \ + result = GCONV_ILLEGAL_INPUT; \ + break; \ + } \ + \ + /* It's a CNS 11643 character, adjust it for EUC-TW. */ \ + *outptr++ = '\x8e'; \ + *outptr++ += 0xa0; \ + *outptr++ += 0x80; \ + *outptr++ += 0x80; \ + } \ + } \ + \ + inptr += 4; \ + } +#include <iconv/loop.c> + + +/* Now define the toplevel functions. */ +#include <iconv/skeleton.c> |