X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funicodeio.c;h=049b9afd0ae87039fe9dfa0fa3b44a7dc09eef15;hb=2238bc8f821ef84c53dc823a67b4326b0b211da1;hp=4f14adf459887ced882c67d20bcdb36953be8ade;hpb=e678e74fc23692fc3326176051a522db8e9e2368;p=gnulib.git diff --git a/lib/unicodeio.c b/lib/unicodeio.c index 4f14adf45..049b9afd0 100644 --- a/lib/unicodeio.c +++ b/lib/unicodeio.c @@ -1,6 +1,6 @@ /* Unicode character output to streams with locale dependent encoding. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000-2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -19,6 +19,9 @@ /* Written by Bruno Haible . */ +/* Note: This file requires the locale_charset() function. See in + libiconv-1.7/libcharset/INTEGRATE for how to obtain it. */ + #ifdef HAVE_CONFIG_H # include #endif @@ -39,15 +42,6 @@ extern int errno; #endif -#if HAVE_WCHAR_H -# include -#endif - -/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */ -#if HAVE_WCRTOMB && defined mbstate_t -# define wcrtomb(s, wc, ps) (wcrtomb) (s, wc, 0) -#endif - #if HAVE_ICONV # include #endif @@ -56,46 +50,15 @@ extern int errno; #if ENABLE_NLS # include -# define _(Text) gettext (Text) #else -# define _(Text) Text +# define gettext(Text) Text #endif +#define _(Text) gettext (Text) +#define N_(Text) Text +/* Specification. */ #include "unicodeio.h" -#if __STDC_ISO_10646__ && HAVE_WCRTOMB - -/* Values of type wchar_t are Unicode code points. */ - -/* 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) -{ - wchar_t wc = (wchar_t) code; - - /* Test for truncation. */ - if (wc == code) - { - /* Convert from wide character to multibyte representation. */ - char buf[64]; /* Assume MB_LEN_MAX <= 64. */ - mbstate_t state; - size_t res; - - memset (&state, 0, sizeof (mbstate_t)); - res = wcrtomb (buf, wc, &state); - if (res != (size_t)(-1)) - fwrite (buf, 1, res, stream); - else - error (1, errno, - _("cannot convert U+%04X to local character set"), code); - } - else - error (1, 0, _("cannot convert U+%04X to local character set"), code); -} - -#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. @@ -145,18 +108,27 @@ utf8_wctomb (unsigned char *r, unsigned int wc) } /* Luckily, the encoding's name is platform independent. */ -# define UTF8_NAME "UTF-8" +#define UTF8_NAME "UTF-8" -/* Outputs the Unicode character CODE to the output stream STREAM. +/* Converts the Unicode character CODE to its multibyte representation + in the current locale and calls the SUCCESS callback on the resulting + byte sequence. If an error occurs, invokes the FAILURE callback instead, + passing it CODE and an English error string. + Returns whatever the callback returned. Assumes that the locale doesn't change between two calls. */ -void -print_unicode_char (FILE *stream, unsigned int code) +long +unicode_to_mb (unsigned int code, + long (*success) PARAMS ((const char *buf, size_t buflen, + void *callback_arg)), + long (*failure) PARAMS ((unsigned int code, const char *msg, + void *callback_arg)), + void *callback_arg) { 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; @@ -166,39 +138,38 @@ print_unicode_char (FILE *stream, unsigned int code) extern const char *locale_charset PARAMS ((void)); const char *charset = locale_charset (); - is_utf8 = (charset != NULL && !strcmp (charset, UTF8_NAME)); -# if HAVE_ICONV + is_utf8 = !strcmp (charset, UTF8_NAME); +#if HAVE_ICONV if (!is_utf8) { - utf8_to_local = (charset != NULL - ? iconv_open (charset, UTF8_NAME) - : (iconv_t)(-1)); + utf8_to_local = iconv_open (charset, UTF8_NAME); 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)) - error (1, 0, - _("cannot output U+%04X: iconv function not usable"), - code); - } + /* For an unknown encoding, assume ASCII. */ + utf8_to_local = iconv_open ("ASCII", UTF8_NAME); } -# endif +#endif initialized = 1; } + /* Test whether the utf8_to_local converter is available at all. */ + if (!is_utf8) + { +#if HAVE_ICONV + if (utf8_to_local == (iconv_t)(-1)) + return failure (code, N_("iconv function not usable"), callback_arg); +#else + return failure (code, N_("iconv function not available"), callback_arg); +#endif + } + /* 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); + return failure (code, N_("character out of range"), callback_arg); - if (is_utf8) - { - fwrite (inbuf, 1, count, stream); - } - else +#if HAVE_ICONV + if (!is_utf8) { -# if HAVE_ICONV char outbuf[25]; const char *inptr; size_t inbytesleft; @@ -212,33 +183,81 @@ print_unicode_char (FILE *stream, unsigned int code) outbytesleft = sizeof (outbuf); /* Convert the character from UTF-8 to the locale's charset. */ - res = iconv (utf8_to_local, &inptr, &inbytesleft, &outptr, &outbytesleft); + res = iconv (utf8_to_local, + (ICONV_CONST char **)&inptr, &inbytesleft, + &outptr, &outbytesleft); 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 +# endif ) - error (1, res == (size_t)(-1) ? errno : 0, - _("cannot convert U+%04X to local character set"), code); + return failure (code, NULL, callback_arg); /* 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. */ 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); + return failure (code, NULL, callback_arg); # endif + + return success (outbuf, outptr - outbuf, callback_arg); } +#endif + + /* At this point, is_utf8 is true, so no conversion is needed. */ + return success (inbuf, count, callback_arg); } -#endif +/* Simple success callback that outputs the converted string. + The STREAM is passed as callback_arg. */ +long +fwrite_success_callback (const char *buf, size_t buflen, void *callback_arg) +{ + FILE *stream = (FILE *) callback_arg; + + fwrite (buf, 1, buflen, stream); + return 0; +} + +/* Simple failure callback that displays an error and exits. */ +static long +exit_failure_callback (unsigned int code, const char *msg, void *callback_arg) +{ + if (msg == NULL) + error (1, 0, _("cannot convert U+%04X to local character set"), code); + else + error (1, 0, _("cannot convert U+%04X to local character set: %s"), code, + gettext (msg)); + return -1; +} + +/* Simple failure callback that displays a fallback representation in plain + ASCII, using the same notation as ISO C99 strings. */ +static long +fallback_failure_callback (unsigned int code, const char *msg, void *callback_arg) +{ + FILE *stream = (FILE *) callback_arg; + + if (code < 0x10000) + fprintf (stream, "\\u%04X", code); + else + fprintf (stream, "\\U%08X", code); + return -1; +} + +/* Outputs the Unicode character CODE to the output stream STREAM. + Upon failure, exit if exit_on_error is true, otherwise output a fallback + notation. */ +void +print_unicode_char (FILE *stream, unsigned int code, int exit_on_error) +{ + unicode_to_mb (code, fwrite_success_callback, + exit_on_error + ? exit_failure_callback + : fallback_failure_callback, + stream); +}