From a44d23932dea41a56c4345394a973767af45cf02 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 27 Mar 1998 22:57:26 +0000 Subject: Update. 1998-03-27 22:46 Ulrich Drepper * Rules: Allow Makefiles to specify test-static for tests which cannot be linked dynamically. * math/Makefile: Move atest-exp, atest-sincos, atest-exp2 to tests-static. * libc.map: Add __nss_passwd_lookup, __nss_group_lookup, __nss_next. * misc/error.c: Pretty print. 1998-03-27 Andreas Schwab * Makerules (libc_nonshared-name): Remove variable. (installed-libcs): Use libc-name instead. ($(inst_libdir)/libc.so): Likewise. Remove explicit reference to dynamic linker. * Makeconfig (link-libc): Link against libc_nonshared.a instead of libc.a. Remove explicit reference to dynamic linker. 1998-03-27 Ulrich Drepper * iconvdata/iso8859-1.c (gconv): Add cast to assignment from char to wchar_t. * iconv/iconv_prog.c: Correctly test for write failure. * iconvdata/Makefile: Add rules for EUC-KR, UHC, and JOHAB conversions. * iconvdata/gconv-modules: Likewise. * iconvdata/euckr.c: New file. * iconvdata/johab.c: New file. * iconvdata/ksc5601.c: New file. * iconvdata/ksc5601.h: New file. * iconvdata/uhc.c: New file. Contributed by Jungshik Shin . * libio/fileops.c (_IO_file_fopen): Interpret x flag to fopen. * stdio/fopen.c: Correct handling of 'x' flag. Reported by Jason M. Petry . 1998-03-27 Andreas Jaeger * sunrpc/rpc/key_prot.h: Prevent warning by unknown pragma ident. * sunrpc/rpcsvc/key_prot.x: Likewise. * sunrpc/key_prot.c: Likewise. 1998-03-27 13:49 Ulrich Drepper * sysdeps/i386/bits/string.h: Correct things which never worked. * sysdeps/i386/i486/bits/string.h: Add clobber marks. Patches by Bernd Schmidt . 1998-03-27 Ulrich Drepper * intl/textdomain.c [_LIBC]: Define strdup only if not yet defined. Reported by Thorsten Kukuk. --- iconvdata/ksc5601.h | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 iconvdata/ksc5601.h (limited to 'iconvdata/ksc5601.h') diff --git a/iconvdata/ksc5601.h b/iconvdata/ksc5601.h new file mode 100644 index 0000000000..0b649c70a1 --- /dev/null +++ b/iconvdata/ksc5601.h @@ -0,0 +1,161 @@ +/* Access functions for KS C 5601-1992 based encoding conversion. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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. */ + +#ifndef _KSC5601_H +#define _KSC5601_H 1 + +#define KSC5601_HANGUL 2350 +#define KSC5601_HANJA 4888 +#define KSC5601_SYMBOL 986 + +#include +#include + +/* Conversion table. */ +extern const uint16_t ksc5601_hangul_to_ucs[KSC5601_HANGUL]; +extern const uint16_t ksc5601_sym_to_ucs[]; +extern const uint16_t ksc5601_sym_from_ucs[KSC5601_SYMBOL][2]; +extern const uint16_t ksc5601_hanja_to_ucs[KSC5601_HANJA]; +extern const uint16_t ksc5601_hanja_from_ucs[KSC5601_HANJA][2]; + + +/* +static inline wchar_t +ksc5601_to_ucs4 (char **s, size_t avail) +*/ +static inline wchar_t +ksc5601_to_ucs4 (uint16_t s) +{ + unsigned char ch = s / 256; + unsigned char ch2; + int idx; + + /* row 94(0x7e) and row 41(0x49) are user-defined area in KS C 5601 */ + + if (ch <= 0x20 || ch >= 0x7e || ch == 0x49) + return UNKNOWN_10646_CHAR; + + ch2 = s % 256; + if (ch2 <= 0x20 || ch2 >= 0x7f) + return UNKNOWN_10646_CHAR; + + idx = (ch - 0x21) * 94 + (ch2 - 0x21); + + /* 1410 = 15 * 94 , 3760 = 40 * 94 + Hangul in KS C 5601 : row 16 - row 40 */ + + if (idx >= 1410 && idx < 3760) + return ksc5601_hangul_to_ucs[idx-1410]; + else if (idx > 3854) + /* Hanja : row 42 - row 93 : 3854 = 94 * (42-1) */ + return ksc5601_hanja_to_ucs[idx-3854]; + else + return ksc5601_sym_to_ucs[idx] ?: UNKNOWN_10646_CHAR; +} + +static inline size_t +ucs4_to_ksc5601_hangul (wchar_t wch, uint16_t *s) +{ + int l=0,m,u=KSC5601_HANGUL-1; + wchar_t try; + + while (l <= u) + { + try = (wchar_t) ksc5601_hangul_to_ucs[m=(l+u)/2]; + if (try > wch) + u = m - 1; + else if (try < wch) + l= m + 1; + else + { + *s = (uint16_t) ((m / 94) * 256 + m % 94 + 0x3021) ; + return 2; + } + } + return 0; +} + + +static inline size_t +ucs4_to_ksc5601_hanja (wchar_t wch, uint16_t *s) +{ + int l=0,m,u=KSC5601_HANJA-1; + wchar_t try; + + while (l <= u) + { + try = (wchar_t) ksc5601_hanja_from_ucs[m=(l+u)/2][0]; + if (try > wch) + u=m-1; + else if (try < wch) + l = m + 1; + else + { + *s = ksc5601_hanja_from_ucs[m][1]; + return 2; + } + } + return 0; +} + +static inline size_t +ucs4_to_ksc5601_sym (wchar_t wch, uint16_t *s) +{ + int l = 0; + int m; + int u = KSC5601_SYMBOL - 1; + wchar_t try; + + while (l <= u) + { + m = (l + u) / 2; + try = ksc5601_sym_from_ucs[m][0]; + if (try > wch) + u = m - 1; + else if (try < wch) + l = m + 1; + else + { + *s = ksc5601_sym_from_ucs[m][1]; + return 2; + } + } + return 0; +} + + +/* +static inline size_t +ucs4_to_ksc5601 (wchar_t wch, char **s, size_t avail) +*/ + +static inline size_t +ucs4_to_ksc5601 (wchar_t ch, uint16_t *s) +{ + *s = (uint16_t) UNKNOWN_10646_CHAR; /* FIXIT */ + + if (ch >= 0xac00 && ch <= 0xd7a3) + return ucs4_to_ksc5601_hangul (ch, s); + else if (ch >= 0x4e00 && ch <= 0x9fff || ch >= 0xf900 && ch <= 0xfa0b) + return ucs4_to_ksc5601_hanja (ch, s); + else + return ucs4_to_ksc5601_sym (ch, s); +} + +#endif /* ksc5601.h */ -- cgit v1.2.3