From 9b26f5c47dd7efd663119d02e2d2e3d9886c422c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 24 Apr 1998 07:07:59 +0000 Subject: Update. <<<<<<< ChangeLog 1998-04-23 22:43 Ulrich Drepper * elf/dl-load.c (fillin_rpath): Handle empty element returned by strsep as current directory. * iconv/gconv_builtin.h: Add aliases unicode and unicodebig for Java. Add definitions for unicodelittle implementation. * iconv/gconv_int.h: Add declaration for unicodelittle functions. * iconv/gconv_simple.c: Define unicodelittle functions. * iconv/iconv_prog.c: Make program print information about position of illegal character in input. * iconv/skeleton.c: Use __strcasecmp instead of __strcasestr for comparison of charset name. * iconvdata/big5.c (CHARSET_NAME): Adapt for this. * iconvdata/ebcdic-at-de-a.c: Likewise. * iconvdata/ebcdic-at-de.c: Likewise. * iconvdata/ebcdic-ca-fr.c: Likewise. * iconvdata/euccn.c: Likewise. * iconvdata/eucjp.c: Likewise. * iconvdata/euckr.c: Likewise. * iconvdata/euctw.c: Likewise. * iconvdata/hp-roman8.c: Likewise. * iconvdata/iso6937.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso8859-10.c: Likewise. * iconvdata/iso8859-2.c: Likewise. * iconvdata/iso8859-3.c: Likewise. * iconvdata/iso8859-4.c: Likewise. * iconvdata/iso8859-5.c: Likewise. * iconvdata/iso8859-6.c: Likewise. * iconvdata/iso8859-7.c: Likewise. * iconvdata/iso8859-8.c: Likewise. * iconvdata/iso8859-9.c: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/koi-8.c: Likewise. * iconvdata/koi8-r.c: Likewise. * iconvdata/latin-greek-1.c: Likewise. * iconvdata/latin-greek.c: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t61.c: Likewise. * iconvdata/uhc.c: Likewise. * iconvdata/iso646.c: Add support for more ISO 646 variants. * iconvdata/TESTS: Add tests for ISO646 module. * iconvdata/gconv-modules: Add new modules. * iconvdata/testdate/CSA_Z243.4-1985-1: New tests for ISO646 module. * iconvdata/testdate/CSA_Z243.4-1985-1..UCS2: Likewise. * iconvdata/testdate/CSA_Z243.4-1985-2: Likewise. * iconvdata/testdate/CSA_Z243.4-1985-2..UCS4: Likewise. * iconvdata/testdate/DIN_66003: Likewise. * iconvdata/testdate/DIN_66003..UTF8: Likewise. * iconvdata/testdate/DS_2089: Likewise. * iconvdata/testdate/DS_2089..UTF8: Likewise. * iconvdata/testdate/ES: Likewise. * iconvdata/testdate/ES..UTF8: Likewise. * iconvdata/testdate/ES2: Likewise. * iconvdata/testdate/ES2..UTF8: Likewise. * iconvdata/testdate/GB_1988-80: Likewise. * iconvdata/testdate/GB_1988-80..UTF8: Likewise. * iconvdata/testdate/IT: Likewise. * iconvdata/testdate/IT..UTF8: Likewise. * iconvdata/testdate/JIS_C6220-1969-RO: Likewise. * iconvdata/testdate/JIS_C6220-1969-RO..UTF8: Likewise. * iconvdata/testdate/JIS_C6229-1984-B: Likewise. * iconvdata/testdate/JIS_C6229-1984-B..UTF8: Likewise. * iconvdata/testdate/JUS_I.B1.002: Likewise. * iconvdata/testdate/JUS_I.B1.002..UTF8: Likewise. * iconvdata/testdate/KSC5636: Likewise. * iconvdata/testdate/KSC5636..UTF8: Likewise. * iconvdata/testdate/MSZ_7795.3: Likewise. * iconvdata/testdate/MSZ_7795.3..UTF8: Likewise. * iconvdata/testdate/NC_NC00-10: Likewise. * iconvdata/testdate/NC_NC00-10..UTF8: Likewise. * iconvdata/testdate/NF_Z_62-010: Likewise. * iconvdata/testdate/NF_Z_62-010..UTF8: Likewise. * iconvdata/testdate/NF_Z_62-010_1973: Likewise. * iconvdata/testdate/NF_Z_62-010_1973..UTF8: Likewise. * iconvdata/testdate/NS_4551-1: Likewise. * iconvdata/testdate/NS_4551-1..UTF8: Likewise. * iconvdata/testdate/NS_4551-2: Likewise. * iconvdata/testdate/NS_4551-2..UTF8: Likewise. * iconvdata/testdate/PT: Likewise. * iconvdata/testdate/PT..UTF8: Likewise. * iconvdata/testdate/PT2: Likewise. * iconvdata/testdate/PT2..UTF8: Likewise. * iconvdata/testdate/SEN_850200_B: Likewise. * iconvdata/testdate/SEN_850200_B..UTF8: Likewise. * iconvdata/testdate/SEN_850200_C: Likewise. * iconvdata/testdate/SEN_850200_C..UTF8: Likewise. * iconvdata/cns11643.h: Use uint32_t instead of wchar_t. * iconvdata/cns11643l1.h: Likewise. * iconvdata/latin-greek-1.h: Likewise. * iconvdata/latin-greek.h: Likewise. * iconvdata/koi8-r.h: Likewise. * iconvdata/jis0212.h: Likewise. * iconvdata/gb2312.h: Likewise. * iconvdata/ksc5601.h: Likewise. * iconvdata/8bit-gap.c: Use 32 bit type for idx element of struct gap. * iconvdata/Makefile: Add rules for lots of more modules. * iconvdata/cp1250.c: New file. * iconvdata/cp1251.c: New file. * iconvdata/cp1252.c: New file. * iconvdata/cp1253.c: New file. * iconvdata/cp1254.c: New file. * iconvdata/cp1255.c: New file. * iconvdata/cp1256.c: New file. * iconvdata/cp1257.c: New file. * iconvdata/ebcdic-dk-no-a.c: New file. * iconvdata/ebcdic-dk-no.c: New file. * iconvdata/ebcdic-es-a.c: New file. * iconvdata/ebcdic-es-s.c: New file. * iconvdata/ebcdic-es.c: New file. * iconvdata/ebcdic-fi-se-a.c: New file. * iconvdata/ebcdic-fi-se.c: New file. * iconvdata/ebcdic-fr.c: New file. * iconvdata/ebcdic-is-friss.c: New file. * iconvdata/ebcdic-it.c: New file. * iconvdata/ebcdic-pt.c: New file. * iconvdata/ebcdic-uk.c: New file. * iconvdata/ebcdic-us.c: New file. * iconvdata/ibm037.c: New file. * iconvdata/ibm038.c: New file. * iconvdata/ibm1004.c: New file. * iconvdata/ibm1026.c: New file. * iconvdata/ibm1047.c: New file. * iconvdata/ibm256.c: New file. * iconvdata/ibm273.c: New file. * iconvdata/ibm274.c: New file. * iconvdata/ibm275.c: New file. * iconvdata/ibm277.c: New file. * iconvdata/ibm278.c: New file. * iconvdata/ibm280.c: New file. * iconvdata/ibm281.c: New file. * iconvdata/ibm284.c: New file. * iconvdata/ibm285.c: New file. * iconvdata/ibm290.c: New file. * iconvdata/ibm297.c: New file. * iconvdata/ibm420.c: New file. * iconvdata/ibm423.c: New file. * iconvdata/ibm424.c: New file. * iconvdata/ibm437.c: New file. * iconvdata/ibm500.c: New file. * iconvdata/ibm850.c: New file. * iconvdata/ibm851.c: New file. * iconvdata/ibm852.c: New file. * iconvdata/ibm855.c: New file. * iconvdata/ibm857.c: New file. * iconvdata/ibm860.c: New file. * iconvdata/ibm861.c: New file. * iconvdata/ibm862.c: New file. * iconvdata/ibm863.c: New file. * iconvdata/ibm864.c: New file. * iconvdata/ibm865.c: New file. * iconvdata/ibm868.c: New file. * iconvdata/ibm869.c: New file. * iconvdata/ibm870.c: New file. * iconvdata/ibm871.c: New file. * iconvdata/ibm875.c: New file. * iconvdata/ibm880.c: New file. * iconvdata/ibm891.c: New file. * iconvdata/ibm903.c: New file. * iconvdata/ibm904.c: New file. * iconvdata/ibm905.c: New file. * iconvdata/ibm918.c: New file. * locale/iso-4217.def: Update. * localedata/locales/pt_BR: Correct. Patches by Andreas Jaeger. * stdio-common/vfscanf.h: Recognize nan and inf in floating-point formats. 1998-04-22 Andreas Jaeger * elf/dl-load.c (_dl_init_paths): ';' is also a terminal for LD_LIBRARY_PATH. 1998-04-22 Gordon Matzigkeit * Makerules: Change occurances of `cd dir; cmd' to `cd dir && cmd'. * Makefile: Likewise. * posix/Makefile: Likewise. * sysdeps/mach/hurd/Makefile: Likewise. 1998-04-22 Gordon Matzigkeit * sysdeps/mach/hurd/bits/dirent.h: New file. * sysdeps/mach/hurd/readdir64.c: New file. * sysdeps/mach/hurd/readdir64_r.c: New file. 1998-04-21 Gordon Matzigkeit * stdio/stdio.h (vasprintf, __asprintf, asprintf, vdprintf, dprintf): Synchronize declarations with libio/stdio.h. 1998-04-21 Gordon Matzigkeit * elf/dlerror.c (dlerror): Don't assume that __libc_internal_tsd_get is defined. __libc_getspecific is already well-protected, so just use it directly. 1998-04-22 Gordon Matzigkeit * io/ftw.h (ftw): Fix typo. 1998-04-21 Gordon Matzigkeit * sysdeps/gnu/utmp_file.c: Fix typo. 1998-04-22 11:06 Andreas Schwab * iconvdata/run-iconv-test.sh: Fix more portability bugs. When one part of a test fails move on to the next test. 1998-04-21 Andreas Schwab * sysdeps/i386/bits/setjmp.h (_JMPBUF_UNWINDS): Compare addresses as pointers, not signed integers. 1998-04-22 11:06 Andreas Schwab --- iconv/gconv_int.h | 2 ++ iconv/gconv_simple.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++ iconv/iconv_prog.c | 8 ++++--- iconv/skeleton.c | 4 ++-- 4 files changed, 74 insertions(+), 5 deletions(-) (limited to 'iconv') diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h index 86e892f..80cced4 100644 --- a/iconv/gconv_int.h +++ b/iconv/gconv_int.h @@ -158,6 +158,8 @@ __BUILTIN_TRANS (__gconv_transform_utf8_internal); __BUILTIN_TRANS (__gconv_transform_internal_utf8); __BUILTIN_TRANS (__gconv_transform_ucs2_internal); __BUILTIN_TRANS (__gconv_transform_internal_ucs2); +__BUILTIN_TRANS (__gconv_transform_ucs2little_internal); +__BUILTIN_TRANS (__gconv_transform_internal_ucs2little); __BUILTIN_TRANS (__gconv_transform_internal_ucs4); # undef __BUITLIN_TRANS diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index 95b4a66..c491c97 100644 --- a/iconv/gconv_simple.c +++ b/iconv/gconv_simple.c @@ -418,3 +418,68 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend, #endif #include #include + + +/* Convert from UCS2 in little endian to the internal (UCS4-like) format. */ +#define DEFINE_INIT 0 +#define DEFINE_FINI 0 +#define MIN_NEEDED_FROM 2 +#define MIN_NEEDED_TO 4 +#define FROM_DIRECTION 1 +#define FROM_LOOP ucs2little_internal_loop +#define TO_LOOP ucs2little_internal_loop /* This is not used.*/ +#define FUNCTION_NAME __gconv_transform_ucs2little_internal + +#define MIN_NEEDED_INPUT MIN_NEEDED_FROM +#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO +#define LOOPFCT FROM_LOOP +#if __BYTE_ORDER == __LITTLE_ENDIAN +# define BODY \ + *((uint32_t *) outptr)++ = *((uint16_t *) inptr)++; +#else +# define BODY \ + *((uint32_t *) outptr)++ = bswap_16 (*((uint16_t *) inptr)++); +#endif +#include +#include + + +/* Convert from the internal (UCS4-like) format to UCS2 in little endian. */ +#define DEFINE_INIT 0 +#define DEFINE_FINI 0 +#define MIN_NEEDED_FROM 4 +#define MIN_NEEDED_TO 2 +#define FROM_DIRECTION 1 +#define FROM_LOOP internal_ucs2little_loop +#define TO_LOOP internal_ucs2little_loop /* This is not used.*/ +#define FUNCTION_NAME __gconv_transform_internal_ucs2little + +#define MIN_NEEDED_INPUT MIN_NEEDED_FROM +#define MIN_NEEDED_OUTPUT MIN_NEEDED_TO +#define LOOPFCT FROM_LOOP +#if __BYTE_ORDER == __LITTLE_ENDIAN +# define BODY \ + { \ + if (*((uint32_t *) inptr) >= 0x10000) \ + { \ + result = GCONV_ILLEGAL_INPUT; \ + break; \ + } \ + *((uint16_t *) outptr)++ = *((uint32_t *) inptr)++; \ + } +#else +# define BODY \ + { \ + if (*((uint32_t *) inptr) >= 0x10000) \ + { \ + result = GCONV_ILLEGAL_INPUT; \ + break; \ + } \ + /* Please note that we use the `uint32_t' from-pointer as an `uint16_t' \ + pointer which works since we are on a little endian machine. */ \ + *((uint16_t *) outptr)++ = bswap_16 (*((uint16_t *) inptr)); \ + inptr += 4; \ + } +#endif +#include +#include diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 2452a88..5a08a21 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -298,6 +298,7 @@ static int process_block (iconv_t cd, const char *addr, size_t len, FILE *output) { #define OUTBUF_SIZE 32768 + const char *start = addr; char outbuf[OUTBUF_SIZE]; char *outptr; size_t outlen; @@ -332,7 +333,8 @@ conversion stopped due to problem in writing the output")); switch (errno) { case EILSEQ: - error (0, 0, _("illegal input sequence")); + error (0, 0, _("illegal input sequence at position %ld"), + addr - start); break; case EINVAL: error (0, 0, _("\ @@ -448,7 +450,7 @@ insert_print_list (const void *nodep, VISIT value, int level) if (value == leaf || value == postorder) { const struct gconv_alias *s = *(const struct gconv_alias **) nodep; - tsearch (s->fromname, &printlist, (__compar_fn_t) strcoll); + tsearch (s->fromname, &printlist, (__compar_fn_t) strverscmp); } } @@ -487,7 +489,7 @@ do_print (const void *nodep, VISIT value, int level) } } else - not_first = 1; + not_first = 1; fwrite (s, len, 1, stdout); column += len; diff --git a/iconv/skeleton.c b/iconv/skeleton.c index 8421941..78f584e 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -137,9 +137,9 @@ int gconv_init (struct gconv_step *step) { /* Determine which direction. */ - if (__strcasestr (step->from_name, CHARSET_NAME) != NULL) + if (__strcasecmp (step->from_name, CHARSET_NAME) == 0) step->data = &from_object; - else if (__strcasestr (step->to_name, CHARSET_NAME) != NULL) + else if (__strcasecmp (step->to_name, CHARSET_NAME) == 0) step->data = &to_object; else return GCONV_NOCONV; -- cgit v1.1