mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 03:19:54 +08:00
b10ab72581
* Makefile.am: Add include files under bits sub-directory.
* Makefile.in: Regenerated.
* libc/sys/linux/argp/argp-fs-xinl.c: Set __OPTIMIZE__ to
actual value of 1 to be compatible with newer glibc headers.
* libc/sys/linux/sys/cdefs.h: Fix to be compatible with newer
glibc headers.
* libc/sys/linux/sys/dirent.h: Ditto.
* libc/sys/linux/argp/argp-xinl.c: Ditto.
* libc/sys/linux/dl/dl-runtime.c: Make sure fixup and
profile_fixup routines are marked used so they won't be
optimized away.
* libc/sys/linux/dl/dl-cache.c: Don't use weak_extern macro
to mark functions as weak.
* libc/sys/linux/dl/dl-open.c: Ditto.
* libc/sys/linux/iconv/gconv_open.c: Fix to obey new gcc4
rules about lvalues.
* libc/sys/linux/iconv/gconv_simple.c: Ditto.
* libc/sys/linux/linuxthreads/bits/libc-lock.h: Don't use
weak_extern macro to mark functions as weak. Instead always
use #pragma weak.
* iconvdata/jis0208.h: Fix to work with gcc4.
* libc/sys/linux/dl/dl-load.c: Ditto.
* libc/sys/linux/dl/dl-reloc.c: Ditto.
* libc/sys/linux/dl/do-rel.h: Ditto.
* libc/sys/linux/dl/dynamic-link.h: Ditto.
* libc/sys/linux/include/ltdl.h: Ditto.
* libc/sys/linux/machine/i386/dl-machine.h: Ditto.
* libc/sys/linux/machine/i386/weakalias.h: Ditto.
* libc/sys/linux/net/ns_ntoa.c: Ditto.
* libc/sys/linux/bits/initspin.h: New file.
* libc/sys/linux/bits/libc-lock.h: Ditto.
* libc/sys/linux/bits/pthreadtypes.h: Ditto.
* libc/sys/linux/bits/typesizes.h: Ditto.
107 lines
2.8 KiB
C
107 lines
2.8 KiB
C
/* Access functions for JISX0208 conversion.
|
|
Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#ifndef _JIS0208_H
|
|
#define _JIS0208_H 1
|
|
|
|
#include <gconv.h>
|
|
#include <stdint.h>
|
|
|
|
/* Struct for table with indeces in UCS mapping table. */
|
|
struct jisx0208_ucs_idx
|
|
{
|
|
uint16_t start;
|
|
uint16_t end;
|
|
uint16_t idx;
|
|
};
|
|
|
|
/* Conversion table. */
|
|
extern const uint16_t __jis0208_to_ucs[];
|
|
|
|
extern const char __jisx0208_from_ucs4_lat1[256][2];
|
|
extern const char __jisx0208_from_ucs4_greek[0xc1][2];
|
|
extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
|
|
extern const char __jisx0208_from_ucs_tab[][2];
|
|
|
|
static inline uint32_t
|
|
jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
|
|
{
|
|
unsigned char ch = *(*s);
|
|
unsigned char ch2;
|
|
int idx;
|
|
|
|
if (ch < offset || (ch - offset) <= 0x20)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
if (avail < 2)
|
|
return 0;
|
|
|
|
ch2 = (*s)[1];
|
|
if (ch2 < offset || (ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
idx = (ch - 0x21 - offset) * 94 + (ch2 - 0x21 - offset);
|
|
if (idx >= 0x1e80)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
(*s) += 2;
|
|
|
|
return __jis0208_to_ucs[idx] ?: ((*s) -= 2, __UNKNOWN_10646_CHAR);
|
|
}
|
|
|
|
|
|
static inline size_t
|
|
ucs4_to_jisx0208 (uint32_t wch, char *s, size_t avail)
|
|
{
|
|
unsigned int ch = (unsigned int) wch;
|
|
const char *cp;
|
|
|
|
if (avail < 2)
|
|
return 0;
|
|
|
|
if (ch < 0x100)
|
|
cp = __jisx0208_from_ucs4_lat1[ch];
|
|
else if (ch >= 0x391 && ch <= 0x451)
|
|
cp = __jisx0208_from_ucs4_greek[ch - 0x391];
|
|
else
|
|
{
|
|
const struct jisx0208_ucs_idx *rp = __jisx0208_from_ucs_idx;
|
|
|
|
if (ch >= 0xffff)
|
|
return __UNKNOWN_10646_CHAR;
|
|
while (ch > rp->end)
|
|
++rp;
|
|
if (ch >= rp->start)
|
|
cp = __jisx0208_from_ucs_tab[rp->idx + ch - rp->start];
|
|
else
|
|
return __UNKNOWN_10646_CHAR;
|
|
}
|
|
|
|
if (cp[0] == '\0')
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
s[0] = cp[0];
|
|
s[1] = cp[1];
|
|
|
|
return 2;
|
|
}
|
|
|
|
#endif /* jis0208.h */
|