diff options
| -rw-r--r-- | lib/unicodeio.c | 140 |
1 files changed, 52 insertions, 88 deletions
diff --git a/lib/unicodeio.c b/lib/unicodeio.c index 3565dedd7..138885292 100644 --- a/lib/unicodeio.c +++ b/lib/unicodeio.c @@ -38,20 +38,6 @@ #ifndef errno extern int errno; #endif -#ifndef ENOTSUP -# define ENOTSUP EINVAL -#endif - -#if HAVE_LIMITS_H -# include <limits.h> -#endif - -/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC - installation; work around this configuration error. */ -#if MB_LEN_MAX < 6 -# undef MB_LEN_MAX -# define MB_LEN_MAX 6 -#endif #if HAVE_ICONV # include <iconv.h> @@ -68,25 +54,6 @@ extern int errno; #include "unicodeio.h" -#if __STDC_ISO_10646__ && HAVE_WCTOMB - -/* Values of type wchar_t are Unicode code points. */ - -/* Place into BUF the locale-dependent representation of the character - CODE. Return the size of the result. If there is a conversion - error, return -1, setting errno appropriately. Assumes that the - locale doesn't change between two calls. */ -static size_t -convert_unicode_char (char buf[MB_LEN_MAX], unsigned int code) -{ - wchar_t wc = code; - errno = 0; - /* Test for truncation before invoking wctomb. */ - return wc == code ? wctomb (buf, wc) : -1; -} - -#else - /* When we pass a Unicode character to iconv(), we must pass it in a suitable encoding. The standardized Unicode encodings are UTF-8, UCS-2, UCS-4, UTF-16, UTF-16BE, UTF-16LE, UTF-7. @@ -136,20 +103,21 @@ utf8_wctomb (unsigned char *r, unsigned int wc) } /* Luckily, the encoding's name is platform independent. */ -# define UTF8_NAME "UTF-8" - -/* Place into BUF the locale-dependent representation of the character - CODE. Return the size of the result. If there is a conversion - error, return -1, setting errno appropriately. Assumes that the - locale doesn't change between two calls. */ -static size_t -convert_unicode_char (char buf[MB_LEN_MAX], unsigned int code) +#define UTF8_NAME "UTF-8" + +/* Outputs the Unicode character CODE to the output stream STREAM. + Assumes that the locale doesn't change between two calls. */ +void +print_unicode_char (FILE *stream, unsigned int code) { static int initialized; static int is_utf8; -# if HAVE_ICONV +#if HAVE_ICONV static iconv_t utf8_to_local; -# endif +#endif + + char inbuf[6]; + int count; if (!initialized) { @@ -157,80 +125,76 @@ convert_unicode_char (char buf[MB_LEN_MAX], unsigned int code) const char *charset = locale_charset (); is_utf8 = (charset != NULL && !strcmp (charset, UTF8_NAME)); -# if HAVE_ICONV +#if HAVE_ICONV if (!is_utf8) { utf8_to_local = (charset != NULL ? iconv_open (charset, UTF8_NAME) - : (iconv_t) -1); - if (utf8_to_local == (iconv_t) -1) + : (iconv_t)(-1)); + if (utf8_to_local == (iconv_t)(-1)) { /* For an unknown encoding, assume ASCII. */ utf8_to_local = iconv_open ("ASCII", UTF8_NAME); - if (utf8_to_local == (iconv_t) -1) - { - errno = ENOTSUP; - return -1; - } + if (utf8_to_local == (iconv_t)(-1)) + error (1, 0, + _("cannot output U+%04X: iconv function not usable"), + code); } } -# endif +#endif initialized = 1; } /* Convert the character to UTF-8. */ + count = utf8_wctomb ((unsigned char *) inbuf, code); + if (count < 0) + error (1, 0, _("U+%04X: character out of range"), code); + if (is_utf8) - return utf8_wctomb ((unsigned char *) buf, code); + { + fwrite (inbuf, 1, count, stream); + } else { -# if HAVE_ICONV - char inbuf[6]; - const char *inptr = inbuf; - size_t inbytesleft = utf8_wctomb ((unsigned char *) inbuf, code); - char *outptr = buf; - size_t outbytesleft = MB_LEN_MAX; +#if HAVE_ICONV + char outbuf[25]; + const char *inptr; + size_t inbytesleft; + char *outptr; + size_t outbytesleft; size_t res; - if (inbytesleft == (size_t) -1) - return -1; + inptr = inbuf; + inbytesleft = count; + outptr = outbuf; + outbytesleft = sizeof (outbuf); /* Convert the character from UTF-8 to the locale's charset. */ res = iconv (utf8_to_local, &inptr, &inbytesleft, &outptr, &outbytesleft); - if (inbytesleft > 0 || res == (size_t) -1 + if (inbytesleft > 0 || res == (size_t)(-1) /* Irix iconv() inserts a NUL byte if it cannot convert. */ -# if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi) +# if !defined _LIBICONV_VERSION && (defined sgi || defined __sgi) || (res > 0 && code != 0 && outptr - outbuf == 1 && *outbuf == '\0') -# endif - ) - return -1; +# endif + ) + error (1, res == (size_t)(-1) ? errno : 0, + _("cannot convert U+%04X to local character set"), code); /* Avoid glibc-2.1 bug and Solaris 2.7 bug. */ -# if defined _LIBICONV_VERSION \ +# if defined _LIBICONV_VERSION \ || !((__GLIBC__ - 0 == 2 && __GLIBC_MINOR__ - 0 <= 1) || defined __sun) /* Get back to the initial shift state. */ - return iconv (utf8_to_local, NULL, NULL, &outptr, &outbytesleft); -# endif - - return outptr - buf; -# else - errno = ENOTSUP; - return -1; + res = iconv (utf8_to_local, NULL, NULL, &outptr, &outbytesleft); + if (res == (size_t)(-1)) + error (1, errno, _("cannot convert U+%04X to local character set"), + code); # endif - } -} + fwrite (outbuf, 1, outptr - outbuf, stream); +#else + error (1, 0, _("cannot output U+%04X: iconv function not available"), + code); #endif - -/* Output the Unicode character CODE to the output stream STREAM. */ -void -print_unicode_char (FILE *stream, unsigned int code) -{ - char buf[MB_LEN_MAX]; - size_t s = convert_unicode_char (buf, code); - - if (s == (size_t) -1) - error (1, errno, _("cannot convert U+%04X to local character set"), code); - else - fwrite (buf, 1, s, stream); + } } |