diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-12-21 08:10:06 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-12-21 08:10:06 +0000 |
| commit | c63598bf0547a8fa3286c79f9dd4f801a05ee7f8 (patch) | |
| tree | fdeea64c9c74d09b0fd9975f25941dc041d826bd /iconvdata/johab.c | |
| parent | 47cd4757a888ac74bbdb89ba6a72bbf36327d283 (diff) | |
Update.
1999-12-21 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/i386/getmsg.c: New file.
* sysdeps/unix/sysv/linux/i386/getpmsg.c: New file.
* sysdeps/unix/sysv/linux/i386/putmsg.c: New file.
* sysdeps/unix/sysv/linux/i386/putpmsg.c: New file.
* sysdeps/unix/sysv/linux/m68k/getmsg.c: New file.
* sysdeps/unix/sysv/linux/m68k/getpmsg.c: New file.
* sysdeps/unix/sysv/linux/m68k/putmsg.c: New file.
* sysdeps/unix/sysv/linux/m68k/putpmsg.c: New file.
* sysdeps/unix/sysv/linux/mips/getmsg.c: New file.
* sysdeps/unix/sysv/linux/mips/getpmsg.c: New file.
* sysdeps/unix/sysv/linux/mips/putmsg.c: New file.
* sysdeps/unix/sysv/linux/mips/putpmsg.c: New file.
* sysdeps/unix/sysv/linux/powerpc/getmsg.c: New file.
* sysdeps/unix/sysv/linux/powerpc/getpmsg.c: New file.
* sysdeps/unix/sysv/linux/powerpc/putmsg.c: New file.
* sysdeps/unix/sysv/linux/powerpc/putpmsg.c: New file.
* sysdeps/unix/sysv/linux/powerpc/syscalls.list: Add getpmsg and
putpmsg.
1999-12-20 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/lxstat64.c: Include "kernel-features.h"
before testing for __ASSUME_STAT64_SYSCALL.
* sysdeps/unix/sysv/linux/fxstat64.c: Likewise.
* sysdeps/unix/sysv/linux/xstat64.c: Likewise.
1999-12-20 Andreas Schwab <schwab@suse.de>
* manual/install.texi (Running make install): Clearify that
install_root should be an absolute file name.
* iconv/gconv.c (__gconv): Deal with outbuf being NULL.
* iconv/iconv.c (iconv): Allow omitting output buffer if no input
buffer is given to place conversion descriptor in initial state.
* iconvdata/gconv-modules: Correct aliases CSPC850MULTILINGUAL and
CSPC862LATINHEBREW.
* iconvdata/gconv-modules: Add aliases GB2312 and csGB2312
(according to IANA registry).
Reported by Bruno Haible <haible@ilog.fr>.
* iconvdata/johab.c: Correct completely broken conversion to JOHAB.
Diffstat (limited to 'iconvdata/johab.c')
| -rw-r--r-- | iconvdata/johab.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/iconvdata/johab.c b/iconvdata/johab.c index 21a9c9b6a6..4cff932c2f 100644 --- a/iconvdata/johab.c +++ b/iconvdata/johab.c @@ -64,12 +64,12 @@ static const uint32_t init_to_ucs[19] = 0x314c, 0x314d, 0x314e }; -static const uint32_t final_to_ucs[27] = +static const uint32_t final_to_ucs[31] = { L'\0', L'\0', 0x3133, L'\0', 0x3135, 0x3136, L'\0', L'\0', 0x313a, 0x313b, 0x314c, 0x313d, 0x313e, 0x313f, - 0x3140, L'\0', L'\0', 0x3144, L'\0', L'\0', L'\0', - L'\0', L'\0', L'\0', L'\0', L'\0', L'\0' + 0x3140, L'\0', L'\0', L'\0', 0x3144, L'\0', L'\0', L'\0', + L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0', L'\0' }; /* The following three arrays are used to convert @@ -307,18 +307,18 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) { \ if (ch >= 0xac00 && ch <= 0xd7a3) \ { \ - ch -= 0xac00; \ - \ - ch = (init_to_bit[ch / 588] /* 21 * 28 = 588 */ \ - + mid_to_bit[(ch / 28) % 21]/* (ch % (21 * 28)) / 28 */ \ - + final_to_bit[ch % 28]); /* (ch % (21 * 28)) % 28 */ \ - \ if (NEED_LENGTH_TEST && outptr + 2 > outend) \ { \ result = __GCONV_FULL_OUTPUT; \ break; \ } \ \ + ch -= 0xac00; \ + \ + ch = (init_to_bit[ch / 588] /* 21 * 28 = 588 */ \ + + mid_to_bit[(ch / 28) % 21]/* (ch % (21 * 28)) / 28 */ \ + + final_to_bit[ch % 28]); /* (ch % (21 * 28)) % 28 */ \ + \ *outptr++ = ch / 256; \ *outptr++ = ch % 256; \ } \ @@ -337,9 +337,11 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) *outptr++ = ch / 256; \ *outptr++ = ch % 256; \ } \ - if ((ch >= 0x4e00 && ch <= 0x9fa5) || (ch >= 0xf900 && ch <= 0xfa0b)) \ + else if ((ch >= 0x4e00 && ch <= 0x9fa5) \ + || (ch >= 0xf900 && ch <= 0xfa0b)) \ { \ size_t written; \ + uint32_t temp; \ \ written = ucs4_to_ksc5601_hanja (ch, outptr, \ (NEED_LENGTH_TEST \ @@ -356,13 +358,13 @@ johab_sym_hanja_to_ucs (uint_fast32_t idx, uint_fast32_t c1, uint_fast32_t c2) } \ \ outptr[0] -= 0x4a; \ - outptr[1] += 0x80; \ + outptr[1] -= 0x21; \ \ - outptr[1] += (outptr[0] % 2 \ - ? 0 : (outptr[1] > 0xee ? 0x43 : 0x31)); \ - outptr[1] -= 0xa1; \ - outptr[0] /= 2; \ - outptr[0] += 0xe0; \ + temp = outptr[0] * 94 + outptr[1]; \ + \ + outptr[0] = 0xe0 + temp / 188; \ + outptr[1] = temp % 188; \ + outptr[1] += outptr[1] >= 78 ? 0x43 : 0x31; \ \ outptr += 2; \ } \ |