mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
d64b6ad075
* Versions.def: Add GLIBC_2.2 for libc. * iconv/gconv.h: Make header suitable for inclusion in public header by protecting all names with __. * iconv/gconv.c: Adapt for symbol name changes. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.c: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/iconv_close.c: Likewise. * iconv/iconv_open.c: Likewise. * iconv/loop.c: Likewise. * iconv/skeleton.c: Likewise. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/cns11643.h: Likewise. * iconvdata/cns11643l1.h: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gb2312.h: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/jis0201.h: Likewise. * iconvdata/jis0208.h: Likewise. * iconvdata/jis0212.h: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/ksc5601.h: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * stdlib/mblen.c: Likewise. * stdlib/mbtowc.c: Likewise. * stdlib/wctomb.c: Likewise. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wchar.h: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * wcsmbs/wcsmbsload.h: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * include/limits.h (MB_LEN_MAX): Increase to 16. * sysdeps/generic/_G_config.h: Define _G_fpos_t as struct. Define _G_iconv_t. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * include/wchar.h: Change mbstate_t to __mbstate_t. * libio/Makefile (routines): Add wfiledoalloc, oldiofgetpos, oldiofgetpos64, oldiofsetpos, oldiofsetpos64, fputwc, fputwc_u, getwc, getwc_u, getwchar, getwchar_u, iofgetws, iofgetws_u, iofputws, iofputws_u, iogetwline, iowpadn, ioungetwc, putwc, putwc_u, putchar, putchar_u, swprintf, vwprintf, wprintf, wscanf, fwscanf, vwscanf, vswprintf, iovswscanf, swscanf, wgenops, wstrops, wfileops, and iofwide. (tests): Add tst_swprintf, tst_wprintf, tst_swscanf, and tst_wscanf. * libio/Versions: Add _IO_fgetpos, _IO_fgetpos64, _IO_fsetpos, _IO_fsetpos64, fgetpos, fgetpos64, fgetwc, fgetwc_unlocked, fgetws, fgetws_unlocked, fputwc, fputwc_unlocked, fputws, fputws_unlocked, fsetpos, fsetpos64, fwide, fwprintf, fwscanf, getwc, getwc_unlocked, getwchar, getwchar_unlocked, putwc, putwc_unlocked, putwchar, putwchar_unlocked, swprintf, swscanf, ungetwc, vfwprintf, vswprintf, vwprintf, vfwscanf, vswscanf, vwscanf, wprintf, and wscanf to GLIBC_2.2 for libc. * libio/libio.h: Define codecvt struct. Define _IO_wide_data. Extend _IO_file contain pointer to codecvt, widedata and mode. (_IO_getwc_unlocked): New macro. (_IO_putwc_unlocked): New macro. (_IO_fwide): New macro. * libio/libioP.h: Add new prototypes and adjust existing declarations. * libio/fileops.c (_IO_new_file_close_it): Reset normal or widedata buffers based on mode. (new_do_write): Set _IO_write_end to _IO_buf_end if stream is wide oriented. (_IO_new_file_overflow): Don't depend only on _IO_CURRENTLY_PUTTING flag to be enough to signal unallocated buffer. For wide oriented stream don't make it linebuffered. Don't use _IO_do_flush, use _IO_new_do_write directly. (_IO_new_file_seekoff): Change return value type to _IO_off64_t. (_IO_file_seek): Likewise. * libio/genops.c (_IO_least_marker): Make global. (__underflow): Orient stream if not already done. (__uflow): Likewise. (_IO_default_seekpos): Change to type _IO_off64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_no_init): New function. Similar to _IO_init but allows to orient in initialization. * libio/iolibio.h: Add prototype for _IO_vswprintf. Change _IO_pos_BAD to use _IO_off64_t. * libio/ftello.c: Use _IO_off_t. For now abort when use with wide char stream. * libio/ftello64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofopncook.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/oldfileops.c: Likewise. * libio/iofgetpos.c: Store state of conversion if necessary. * libio/iofgetpos64.c: Likewise. * libio/iofsetpos.c: Restore conversion state if necessary. * libio/iofsetpos64.c: Likewise. * libio/iofdopen.c: Initialize so that stream can be wide oriented. * libio/iofopen.c: Likewise. * libio/iofopen64.c: Likewise. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/iofputs.c: Orient stream if not already happened. * libio/iofputs_u.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iofwrite_u.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Handle not yet oriented stream. * libio/iosetvbuf.c: Likewise. * libio/oldstdfiles.c: Adjust FILEBUF_LITERAL call. * libio/stdfiles.c: Likewise. * libio/strops.c (_IO_str_overflow): Correctly free buffer after failed allocation. (_IO_str_seekoff): Use _IO_off64_t. * libio/vasprintf.c: Pre-orient stream. * libio/vsnprintf.c: Likewise. * libio/fputwc.c: New file. * libio/fputwc_u.c: New file. * libio/fwprintf.c: New file. * libio/fwscanf.c: New file. * libio/getwc.c: New file. * libio/getwc_u.c: New file. * libio/getwchar.c: New file. * libio/getwchar_u.c: New file. * libio/iofgetws.c: New file. * libio/iofgetws_u.c: New file. * libio/iofputws.c: New file. * libio/iofputws_u.c: New file. * libio/iofwide.c: New file. * libio/iogetwline.c: New file. * libio/ioungetwc.c: New file. * libio/iovswscanf.c: New file. * libio/iowpadn.c: New file. * libio/oldiofgetpos.c: New file. * libio/oldiofgetpos64.c: New file. * libio/oldiofsetpos.c: New file. * libio/oldiofsetpos64.c: New file. * libio/putwc.c: New file. * libio/putwc_u.c: New file. * libio/putwchar.c: New file. * libio/putwchar_u.c: New file. * libio/swprintf.c: New file. * libio/swscanf.c: New file. * libio/tst_swprintf.c: New file. * libio/tst_swscanf.c: New file. * libio/tst_wprintf.c: New file. * libio/tst_wscanf.c: New file. * libio/tst_wscanf.input: New file. * libio/vswprintf.c: New file. * libio/vwprintf.c: New file. * libio/vwscanf.c: New file. * libio/wfiledoalloc.c: New file. * libio/wfileops.c: New file. * libio/wgenops.c: New file. * libio/wprintf.c: New file. * libio/wscanf.c: New file. * libio/wstrops.c: New file. * stdio-common/Makefile (routines): Add _itowa, itowa-digits, vfwprintf, and vfwscanf. * stdio-common/_itoa.c (base_table): Rename to _IO_base_table and make global. * stdio-common/_itowa.c: New file. * stdio-common/_itowa.h: New file. * stdio-common/itoa-digits.c: Minimal optimization. * stdio-common/itowa-digits.c: New file. * stdio-common/printf-parse.h: Allow use in wide character context. * stdio-common/printf-prs.c: Define ISASCII and MBRLEN. * stdio-common/printf.h (printf_info): Add wide bit. * stdio-common/printf_fp.c: Determine from wide bit whether stream is wide oriented or not. * stdio-common/printf_size.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * stdlib/strfmon.c: Call __printf_fp with wide bit cleared. * stdio-common/vfprintf.c: Rewrite to allow use in wide character context. * stdio-common/vfscand.c: Likewise. * stdio-common/vfwprintf.c: New file. * stdio-common/vfwscanf.c: New file. * time/Makefile (routines): Add wcsftime. (tests): Add tst_wcsftime. * time/Versions: Add wcsftime to GLIBC_2.2 for libc. * time/strftime.c: Make usable as wcsftime. * time/wcsftime.c: New file. * time/tst_wcsftime.c: New file. * wcsmbs/Makefile (routines): Add wmempcpy and wcschrnul. * wcsmbs/Versions: Add wmempcpy and wcschrnul to GLIBC_2.2 for libc. * wcsmbs/wcschrnul.c: New file. * wcsmbs/wmemcpy.c: New file. * wcsmbs/wmemcpy.c: Rename to __wmemcpy and make wmemcpy weak alias. * wcsmbs/wmemmove.c: Likewise for wmemmove. * manual/stdio.texi: Document is_char and wide element if printf_info. * manual/time.texi: Document wcsftime. * include/wchar.h: Add prototypes for __wmemcpy, __wmempcpy, __wmemmove, __wcschrnul, and __vfwscanf. * locale/langinfo.h: Add new LC_TIME entries for wchar_t data. * locale/C-time.c: Adapt for above change. * locale/categories.def: Likewise. * locale/localeinfo.h: Likewise. * localedata/Makefile: Don't run tests for now.
231 lines
5.2 KiB
C
231 lines
5.2 KiB
C
/* Access functions for GB2312 conversion.
|
|
Copyright (C) 1998, 1999 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. */
|
|
|
|
#ifndef _GB2312_H
|
|
#define _GB2312_H 1
|
|
|
|
#include <gconv.h>
|
|
#include <stdint.h>
|
|
#include <assert.h>
|
|
|
|
/* Conversion table. */
|
|
extern const uint16_t __gb2312_to_ucs[];
|
|
|
|
|
|
static inline uint32_t
|
|
gb2312_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 || (ch - offset) > 0x77)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
if (avail < 2)
|
|
return 0;
|
|
|
|
ch2 = (*s)[1];
|
|
if ((ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
idx = (ch - 0x21 - offset) * 94 + (ch2 - 0x21 - offset);
|
|
if (idx > 0x1ff1)
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
(*s) += 2;
|
|
|
|
return __gb2312_to_ucs[idx] ?: ((*s) -= 2, __UNKNOWN_10646_CHAR);
|
|
}
|
|
|
|
|
|
extern const char __gb2312_from_ucs4_tab1[][2];
|
|
extern const char __gb2312_from_ucs4_tab2[][2];
|
|
extern const char __gb2312_from_ucs4_tab3[][2];
|
|
extern const char __gb2312_from_ucs4_tab4[][2];
|
|
extern const char __gb2312_from_ucs4_tab5[][2];
|
|
extern const char __gb2312_from_ucs4_tab6[][2];
|
|
extern const char __gb2312_from_ucs4_tab7[][2];
|
|
extern const char __gb2312_from_ucs4_tab8[][2];
|
|
extern const char __gb2312_from_ucs4_tab9[][2];
|
|
|
|
static inline size_t
|
|
ucs4_to_gb2312 (uint32_t wch, unsigned char *s, size_t avail)
|
|
{
|
|
unsigned int ch = (unsigned int) wch;
|
|
char buf[2];
|
|
const char *cp = buf;
|
|
|
|
switch (ch)
|
|
{
|
|
case 0xa4 ... 0x100:
|
|
cp = __gb2312_from_ucs4_tab1[ch - 0xa4];
|
|
break;
|
|
case 0x113:
|
|
cp = "\x28\x25";
|
|
break;
|
|
case 0x11b:
|
|
cp = "\x28\x27";
|
|
break;
|
|
case 0x12b:
|
|
cp = "\x28\x29";
|
|
break;
|
|
case 0x14d:
|
|
cp = "\x28\x2d";
|
|
break;
|
|
case 0x16b:
|
|
cp = "\x28\x31";
|
|
break;
|
|
case 0x1ce:
|
|
cp = "\x28\x23";
|
|
break;
|
|
case 0x1d0:
|
|
cp = "\x28\x2b";
|
|
break;
|
|
case 0x1d2:
|
|
cp = "\x28\x2f";
|
|
break;
|
|
case 0x1d4:
|
|
cp = "\x28\x33";
|
|
break;
|
|
case 0x1d6:
|
|
cp = "\x28\x35";
|
|
break;
|
|
case 0x1d8:
|
|
cp = "\x28\x36";
|
|
break;
|
|
case 0x1da:
|
|
cp = "\x28\x37";
|
|
break;
|
|
case 0x1dc:
|
|
cp = "\x28\x38";
|
|
break;
|
|
case 0x2c7:
|
|
cp = "\x21\x26";
|
|
break;
|
|
case 0x2c9:
|
|
cp = "\x21\x25";
|
|
break;
|
|
case 0x391 ... 0x3c9:
|
|
cp = __gb2312_from_ucs4_tab2[ch - 0x391];
|
|
break;
|
|
case 0x401 ... 0x451:
|
|
cp = __gb2312_from_ucs4_tab3[ch - 0x401];
|
|
break;
|
|
case 0x2015 ... 0x203b:
|
|
cp = __gb2312_from_ucs4_tab4[ch - 0x2015];
|
|
break;
|
|
case 0x2103 ... 0x22a5:
|
|
cp = __gb2312_from_ucs4_tab5[ch - 0x2103];
|
|
break;
|
|
case 0x2313:
|
|
cp = "\x21\x50";
|
|
break;
|
|
case 0x2460 ... 0x249b:
|
|
cp = __gb2312_from_ucs4_tab6[ch - 0x2460];
|
|
break;
|
|
case 0x2500 ... 0x254b:
|
|
buf[0] = '\x29';
|
|
buf[1] = '\x24' + (ch & 256);
|
|
break;
|
|
case 0x25a0:
|
|
cp = "\x21\x76";
|
|
break;
|
|
case 0x25a1:
|
|
cp = "\x21\x75";
|
|
break;
|
|
case 0x25b2:
|
|
cp = "\x21\x78";
|
|
break;
|
|
case 0x25b3:
|
|
cp = "\x21\x77";
|
|
break;
|
|
case 0x25c6:
|
|
cp = "\x21\x74";
|
|
break;
|
|
case 0x25c7:
|
|
cp = "\x21\x73";
|
|
break;
|
|
case 0x25cb:
|
|
cp = "\x21\x70";
|
|
break;
|
|
case 0x25ce:
|
|
cp = "\x21\x72";
|
|
break;
|
|
case 0x25cf:
|
|
cp = "\x21\x71";
|
|
break;
|
|
case 0x2605:
|
|
cp = "\x21\x6f";
|
|
break;
|
|
case 0x2606:
|
|
cp = "\x21\x6e";
|
|
break;
|
|
case 0x2640:
|
|
cp = "\x21\x62";
|
|
break;
|
|
case 0x2642:
|
|
cp = "\x21\x61";
|
|
break;
|
|
case 0x3000 ... 0x3129:
|
|
cp = __gb2312_from_ucs4_tab7[ch - 0x3000];
|
|
break;
|
|
case 0x3220 ... 0x3229:
|
|
buf[0] = '\x22';
|
|
buf[1] = '\x65' + (ch - 0x3220);
|
|
break;
|
|
case 0x4e00 ... 0x9fa0:
|
|
cp = __gb2312_from_ucs4_tab8[ch - 0x4e00];
|
|
break;
|
|
case 0xff01 ... 0xff5e:
|
|
cp = __gb2312_from_ucs4_tab9[ch - 0xff01];
|
|
break;
|
|
case 0xffe0:
|
|
cp = "\x21\x69";
|
|
break;
|
|
case 0xffe1:
|
|
cp = "\x21\x6a";
|
|
break;
|
|
case 0xffe3:
|
|
cp = "\x23\x7e";
|
|
break;
|
|
case 0xffe5:
|
|
cp = "\x23\x24";
|
|
break;
|
|
default:
|
|
return __UNKNOWN_10646_CHAR;
|
|
}
|
|
|
|
if (cp[0] == '\0')
|
|
return __UNKNOWN_10646_CHAR;
|
|
|
|
assert (cp[1] != '\0');
|
|
|
|
if (avail < 2)
|
|
return 0;
|
|
|
|
s[0] = cp[0];
|
|
s[1] = cp[1];
|
|
|
|
return 2;
|
|
}
|
|
|
|
#endif /* gb2312.h */
|