mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-17 12:01:53 +08:00
01e0a77749
* configure.in: Add support to generate iconv converter flags for newlib.h * newlib.hin: Add iconv converter flags. * configure: Regenerated. * libc/Makefile.in: Ditto. * libc/configure.in: Moved iconv converter parsing logic to top level newlib configure.in. * libc/configure: Regenerated. * libc/iconv/Makefile.in: Ditto. * libc/iconv/README.TODO * libc/iconv/charset.aliases: Remove wrong BE aliases for UCS2/UCS4/UTF8. * libc/iconv/ccs/Makefile.am: Remove C flag setting now that newlib.h can be used. * libc/iconv/ces/Makefile.am: Ditto. * libc/iconv/lib/Makefile.am: Ditto. * libc/iconv/ccs/Makefile.in: Regenerated. * libc/iconv/ces/Makefile.in: Ditto. * libc/iconv/lib/Makefile.in: Ditto. * libc/iconv/ccs/README.CCS.SOURCES: Updated. * libc/iconv/ccs/iconv_mktbl: Don't write junk strings to binaries. * libc/iconv/ccs/big5.c: Switch to use new underscored flags defined in newlib.h. * libc/iconv/ccs/cns11643_plane1.c: Ditto. * libc/iconv/ccs/cns11643_plane14.c: Ditto. * libc/iconv/ccs/cns11643_plane2.c: Ditto. * libc/iconv/ccs/cp775.c: Ditto. * libc/iconv/ccs/cp850.c: Ditto. * libc/iconv/ccs/cp852.c: Ditto. * libc/iconv/ccs/cp855.c: Ditto. * libc/iconv/ccs/cp866.c: Ditto. * libc/iconv/ccs/gb_2312_80.c: Ditto. * libc/iconv/ccs/iso_8859_1.c: Ditto. * libc/iconv/ccs/iso_8859_15.c: Ditto. * libc/iconv/ccs/iso_8859_2.c: Ditto. * libc/iconv/ccs/iso_8859_4.c: Ditto. * libc/iconv/ccs/iso_8859_5.c: Ditto. * libc/iconv/ccs/jis_x0201.c: Ditto. * libc/iconv/ccs/jis_x0208_1983.c: Ditto. * libc/iconv/ccs/jis_x0212_1990.c: Ditto. * libc/iconv/ccs/koi8_r.c: Ditto. * libc/iconv/ccs/koi8_u.c: Ditto. * libc/iconv/ccs/ksx1001.c: Ditto. * libc/iconv/ccs/shift_jis.c: Ditto. * libc/iconv/ccs/us_ascii.c: Ditto. * libc/iconv/ccs/binary/big5.cct: Newly generated. * libc/iconv/ccs/binary/cns11643_plane1.cct: Ditto. * libc/iconv/ccs/binary/cns11643_plane14.cct: Ditto. * libc/iconv/ccs/binary/cns11643_plane2.cct: Ditto. * libc/iconv/ccs/binary/cp775.cct: Ditto. * libc/iconv/ccs/binary/cp850.cct: Ditto. * libc/iconv/ccs/binary/cp852.cct: Ditto. * libc/iconv/ccs/binary/cp855.cct: Ditto. * libc/iconv/ccs/binary/cp866.cct: Ditto. * libc/iconv/ccs/binary/gb_2312_80.cct: Ditto. * libc/iconv/ccs/binary/iso_8859_1.cct: Ditto. * libc/iconv/ccs/binary/iso_8859_15.cct: Ditto. * libc/iconv/ccs/binary/iso_8859_2.cct: Ditto. * libc/iconv/ccs/binary/iso_8859_4.cct: Ditto. * libc/iconv/ccs/binary/iso_8859_5.cct: Ditto. * libc/iconv/ccs/binary/jis_x0201.cct: Ditto. * libc/iconv/ccs/binary/jis_x0208_1983.cct: Ditto. * libc/iconv/ccs/binary/jis_x0212_1990.cct: Ditto. * libc/iconv/ccs/binary/koi8_r.cct: Ditto. * libc/iconv/ccs/binary/koi8_u.cct: Ditto. * libc/iconv/ccs/binary/ksx1001.cct: Ditto. * libc/iconv/ccs/binary/shift_jis.cct: Ditto. * libc/iconv/ccs/binary/us_ascii.cct: Ditto. * libc/iconv/lib/bialiasesi.c: Sync with charset.aliases. * libc/iconv/ces/euc-jp.c: Use newlib.h macros. * libc/iconv/ces/euc-kr.c: Ditto. * libc/iconv/ces/euc-tw.c: Ditto. * libc/iconv/ces/gb2312.c: Ditto. * libc/iconv/ces/iso-10646-ucs-2.c: Ditto. * libc/iconv/ces/iso-10646-ucs-4.c: Ditto. * libc/iconv/ces/ucs-2-internal.c: Ditto. * libc/iconv/ces/ucs-4-internal.c: Ditto. * libc/iconv/ces/utf-16.c: Ditto. * libc/iconv/ces/utf-8.c: Ditto. * libc/iconv/lib/aliases.c: Ditto. * libc/iconv/lib/biccs.c: Ditto. * libc/iconv/lib/bices.c: Ditto. * libc/iconv/lib/ccs.c: Ditto. * libc/iconv/lib/ces.c: Ditto. * libc/iconv/lib/ces_euc.c: Ditto. * libc/iconv/lib/ces_iso2022.c: Ditto. * libc/iconv/lib/ces_table.c: Ditto. * libc/iconv/lib/converter.c: Ditto. * libc/iconv/lib/deps.h: Ditto. * libc/iconv/lib/endian.h: Ditto. * libc/iconv/lib/iconv.c: Ditto. * libc/iconv/lib/loaddata.c: Ditto. * libc/iconv/lib/local.h: Include newlib.h. * libc/argz/Makefile.in: Regenerated. * libc/ctype/Makefile.in: Ditto. * libc/errno/Makefile.in: Ditto. * libc/iconv/ccs/binary/Makefile.in: Ditto. * libc/locale/Makefile.in: Ditto. * libc/misc/Makefile.in: Ditto. * libc/posix/Makefile.in: Ditto. * libc/reent/Makefile.in: Ditto. * libc/search/Makefile.in: Ditto. * libc/signal/Makefile.in: Ditto. * libc/stdio/Makefile.in: Ditto. * libc/stdio64/Makefile.in: Ditto. * libc/stdlib/Makefile.in: Ditto. * libc/string/Makefile.in: Ditto. * libc/syscalls/Makefile.in: Ditto. * libc/time/Makefile.in: Ditto. * libc/unix/Makefile.in: Ditto. * testsuite/newlib.iconv/iconv.exp: New file. * testsuite/newlib.iconv/iconvjp.c: Ditto. * testsuite/newlib.iconv/iconvnm.c: Ditto. * testsuite/newlib.iconv/iconvru.c: Ditto.
139 lines
4.3 KiB
C
139 lines
4.3 KiB
C
/*-
|
|
* Copyright (c) 1999,2000
|
|
* Konstantin Chuguev. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* iconv (Charset Conversion Library) v2.0
|
|
*/
|
|
#include "../lib/deps.h"
|
|
|
|
#ifdef _ICONV_CONVERTER_UTF_16
|
|
#include <string.h>
|
|
#include "../lib/local.h"
|
|
|
|
static ssize_t
|
|
_DEFUN(convert_from_ucs, (ces, in, outbuf, outbytesleft),
|
|
struct iconv_ces *ces _AND
|
|
ucs_t in _AND
|
|
unsigned char **outbuf _AND
|
|
size_t *outbytesleft)
|
|
{
|
|
unsigned char *cp;
|
|
int *state;
|
|
int bytes;
|
|
|
|
if (in == UCS_CHAR_NONE)
|
|
return 1; /* No state reinitialization for table charsets */
|
|
if (in > 0x10FFFF)
|
|
return -1;
|
|
bytes = *(state = (int *)(ces->data)) ? 2 : 4;
|
|
if (in > 0xFFFF)
|
|
bytes += 2;
|
|
if (*outbytesleft < bytes)
|
|
return 0; /* No space in the output buffer */
|
|
cp = *outbuf;
|
|
if (*state == 0) {
|
|
*cp++ = 0xFE;
|
|
*cp++ = 0xFF;
|
|
*state = 1;
|
|
}
|
|
if (in > 0xFFFF) {
|
|
*cp++ = ((in -= 0x10000) >> 18) | 0xD8;
|
|
*cp++ = (in >> 10) & 0xFF;
|
|
*cp++ = ((in >> 8) & 3) | 0xDC;
|
|
} else
|
|
*cp++ = (in >> 8) & 0xFF;
|
|
*cp++ = in & 0xFF;
|
|
(*outbuf) += bytes;
|
|
*outbytesleft -= bytes;
|
|
return 1;
|
|
}
|
|
|
|
static __inline ucs_t
|
|
_DEFUN(msb, (buf), _CONST unsigned char *buf)
|
|
{
|
|
return (buf[0] << 8) | buf[1];
|
|
}
|
|
|
|
static ucs_t
|
|
_DEFUN(convert_to_ucs, (ces, inbuf, inbytesleft),
|
|
struct iconv_ces *ces _AND
|
|
_CONST unsigned char **inbuf _AND
|
|
size_t *inbytesleft)
|
|
{
|
|
ucs_t res, res2;
|
|
int *state, mark;
|
|
|
|
if (*inbytesleft < 2)
|
|
return UCS_CHAR_NONE; /* Not enough bytes in the input buffer */
|
|
state = (int *)(ces->data);
|
|
res = msb(*inbuf);
|
|
switch (res) {
|
|
case UCS_CHAR_ZERO_WIDTH_NBSP:
|
|
if (*state == 0)
|
|
*state = 1;
|
|
mark = 1;
|
|
break;
|
|
case UCS_CHAR_INVALID:
|
|
if (*state == 0)
|
|
*state = 2;
|
|
mark = 1;
|
|
break;
|
|
default:
|
|
if (*state == 0)
|
|
*state = 1;
|
|
mark = 0;
|
|
}
|
|
if (mark) {
|
|
if (*inbytesleft < 4)
|
|
return UCS_CHAR_NONE; /* Not enough bytes in the input buffer */
|
|
*inbytesleft -= 2;
|
|
res = msb((*inbuf) += 2);
|
|
}
|
|
if (*state == 2) { /* LSB order */
|
|
res = (*(*inbuf) ++);
|
|
res |= (*(*inbuf) ++) << 8;
|
|
} else
|
|
*inbuf += 2;
|
|
*inbytesleft -= 2;
|
|
if ((res & 0xFC00) != 0xD800) /* Non-surrogate character */
|
|
return res;
|
|
if (*inbytesleft < 2)
|
|
return UCS_CHAR_NONE; /* Not enough bytes in the input buffer */
|
|
if (*state == 2) {
|
|
res2 = (*inbuf)[0];
|
|
res2 |= (*inbuf)[1] << 8;
|
|
} else
|
|
res2 = msb(*inbuf);
|
|
if ((res2 & 0xFC00) != 0xDC00) /* Broken surrogate pair */
|
|
return -1;
|
|
(*inbuf) += 2;
|
|
(*inbytesleft) -= 2;
|
|
return (((res & 0x3FF) << 10) | (res2 & 0x3FF)) + 0x10000;
|
|
}
|
|
|
|
ICONV_CES_STATEFUL_MODULE_DECL(utf_16);
|
|
|
|
#endif /* #ifdef _ICONV_CONVERTER_UTF_16 */
|
|
|