mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-19 13:40:59 +08:00
Update.
* iconvdata/iso-ir-165.c: New file. * iconvdata/iso-ir-165.h: New file. * iconvdata/Makefile: Add rules to build libISOIR165.
This commit is contained in:
parent
03c0d6ef17
commit
c456edaaac
@ -1,5 +1,9 @@
|
||||
2000-01-12 Ulrich Drepper <drepper@cygnus.com>
|
||||
|
||||
* iconvdata/iso-ir-165.c: New file.
|
||||
* iconvdata/iso-ir-165.h: New file.
|
||||
* iconvdata/Makefile: Add rules to build libISOIR165.
|
||||
|
||||
* Makefile (install): Correct passing -r parameter to ldconfig.
|
||||
|
||||
* iconvdata/gconv-modules: Add aliases ISO-IR-199 and ISO-IR-203.
|
||||
|
@ -45,7 +45,7 @@ modules := ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 \
|
||||
INIS-CYRILLIC ISO_6937-2 ISO_2033 ISO_5427 ISO_5427-EXT \
|
||||
ISO_5428 ISO_10367-BOX MAC-IS MAC-UK NATS-DANO NATS-SEFI \
|
||||
SAMI-WS2 ISO-IR-197 TIS-620 KOI8-U GBK ISIRI-3342 GBGBK \
|
||||
ISO-2022-CN
|
||||
ISO-2022-CN libISOIR165
|
||||
|
||||
modules.so := $(addsuffix .so, $(modules))
|
||||
|
||||
@ -55,6 +55,7 @@ libJIS-routines := jis0201 jis0208 jis0212
|
||||
libKSC-routines := ksc5601
|
||||
libGB-routines := gb2312
|
||||
libCNS-routines := cns11643l1 cns11643
|
||||
libISOIR165-routines := iso-ir-165
|
||||
|
||||
LDFLAGS-EUC-KR.so = -Wl,-rpath,'$$ORIGIN'
|
||||
$(objpfx)EUC-KR.so: $(objpfx)libKSC.so
|
||||
@ -81,6 +82,7 @@ LDFLAGS-libJIS.so = -Wl,-soname,$(@F)
|
||||
LDFLAGS-libKSC.so = -Wl,-soname,$(@F)
|
||||
LDFLAGS-libGB.so = -Wl,-soname,$(@F)
|
||||
LDFLAGS-libCNS.so = -Wl,-soname,$(@F)
|
||||
LDFLAGS-libISOIR165.so = -Wl,-soname,$(@F)
|
||||
|
||||
distribute := gconv-modules extra-module.mk gap.awk gaptab.awk \
|
||||
gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh \
|
||||
|
5483
iconvdata/iso-ir-165.c
Normal file
5483
iconvdata/iso-ir-165.c
Normal file
File diff suppressed because it is too large
Load Diff
100
iconvdata/iso-ir-165.h
Normal file
100
iconvdata/iso-ir-165.h
Normal file
@ -0,0 +1,100 @@
|
||||
/* Tables for conversion to and from ISO-IR-165.
|
||||
converting from UCS using gaps.
|
||||
Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
|
||||
|
||||
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 _ISO_IR_165_H
|
||||
#define _ISO_IR_165_H 1
|
||||
|
||||
#include <gconv.h>
|
||||
#include <stdint.h>
|
||||
|
||||
struct gap
|
||||
{
|
||||
uint16_t start;
|
||||
uint16_t end;
|
||||
int32_t idx;
|
||||
};
|
||||
|
||||
/* Table for ISO-IR-165 (CCITT Chinese) to UCS4 conversion. */
|
||||
#define ISOIR165_FROMSIZE 0x2284
|
||||
extern const uint16_t __isoir165_to_tab[ISOIR165_FROMSIZE];
|
||||
|
||||
|
||||
/* XXX If we at some point need an offset value to decode the byte
|
||||
sequences another parameter can be added. */
|
||||
static inline uint32_t
|
||||
ucs4_from_isoir165 (const char **s, size_t avail)
|
||||
{
|
||||
unsigned char ch = *(*s);
|
||||
unsigned char ch2;
|
||||
|
||||
if (ch <= 0x20 || ch >= 0x7f)
|
||||
return __UNKNOWN_10646_CHAR;
|
||||
|
||||
if (avail < 2)
|
||||
return 0;
|
||||
|
||||
ch2 = (*s)[1];
|
||||
if (ch2 <= 0x20 || ch2 >= 0x7f)
|
||||
return __UNKNOWN_10646_CHAR;
|
||||
|
||||
return (__isoir165_to_tab[(ch - 0x21) * 94 + (ch2 - 0x21)]
|
||||
?: __UNKNOWN_10646_CHAR);
|
||||
}
|
||||
|
||||
|
||||
/* Tables for ISO-IR-165 (CCITT Chinese) from UCS4 conversion. */
|
||||
extern const struct gap __isoir165_from_idx[];
|
||||
extern const char __isoir165_from_tab[];
|
||||
|
||||
static inline size_t
|
||||
ucs4_to_isoir165 (uint32_t wch, char *s, size_t avail)
|
||||
{
|
||||
unsigned int ch = (unsigned int) wch;
|
||||
const char *cp;
|
||||
const struct gap *rp = __isoir165_from_idx;
|
||||
|
||||
if (ch > 0xffe5)
|
||||
/* This is an illegal character. */
|
||||
return __UNKNOWN_10646_CHAR;
|
||||
|
||||
while (ch > rp->end)
|
||||
++rp;
|
||||
if (ch < rp->start)
|
||||
/* This is an illegal character. */
|
||||
return __UNKNOWN_10646_CHAR;
|
||||
|
||||
/* The two bytes following the index given in this record give the
|
||||
encoding in ISO-IR-165. Unless the bytes are zero. */
|
||||
cp = &__isoir165_from_tab[(ch + rp->idx) * 2];
|
||||
if (*cp == '\0')
|
||||
/* This is an illegal character. */
|
||||
return __UNKNOWN_10646_CHAR;
|
||||
|
||||
if (avail < 2)
|
||||
return 0;
|
||||
|
||||
s[0] = cp[0];
|
||||
s[1] = cp[1];
|
||||
|
||||
return 2;
|
||||
}
|
||||
|
||||
#endif /* iso-ir-165.h */
|
Loading…
x
Reference in New Issue
Block a user