X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=e08ba2804bbf4d6b0dbe7c6cf81b820c7a239462;hb=1221be814f2f1d67c49849512e0938b059a58009;hp=1463a4eecf667e43dd8fcbbedfa35f0d527ad4d4;hpb=e23e02f4ab1b3c3160dc084e241a647636e7a6b9;p=pspp-builds.git diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c index 1463a4ee..e08ba280 100644 --- a/src/libpspp/i18n.c +++ b/src/libpspp/i18n.c @@ -21,14 +21,19 @@ #include #include #include +#include #include #include +#include #include "assertion.h" #include "hmapx.h" #include "hash-functions.h" +#include "pool.h" #include "i18n.h" +#include "version.h" + #include #include "xstrndup.h" @@ -36,6 +41,13 @@ #include #endif +struct converter + { + const char *tocode; + const char *fromcode; + iconv_t conv; + }; + static char *default_encoding; static struct hmapx map; @@ -43,51 +55,53 @@ static struct hmapx map; static iconv_t create_iconv (const char* tocode, const char* fromcode) { - iconv_t conv; + size_t hash; struct hmapx_node *node; - size_t hash ; - char *key = alloca (strlen (tocode) + strlen (fromcode) + 2); - - strcpy (key, tocode); - strcat (key, "\n"); /* hopefully no encoding names contain '\n' */ - strcat (key, fromcode); - - hash = hsh_hash_string (key); - - node = hmapx_first_with_hash (&map, hash); - - if (!node) - { - conv = iconv_open (tocode, fromcode); - - /* I don't think it's safe to translate this string or to use messaging - as the convertors have not yet been set up */ - if ( (iconv_t) -1 == conv && 0 != strcmp (tocode, fromcode)) - { - const int err = errno; - fprintf (stderr, - "Warning: " - "cannot create a convertor for \"%s\" to \"%s\": %s\n", - fromcode, tocode, strerror (err)); - } - - hmapx_insert (&map, conv, hash); - } - else + struct converter *converter; + assert (fromcode); + + hash = hash_string (tocode, hash_string (fromcode, 0)); + HMAPX_FOR_EACH_WITH_HASH (converter, node, hash, &map) + if (!strcmp (tocode, converter->tocode) + && !strcmp (fromcode, converter->fromcode)) + return converter->conv; + + converter = xmalloc (sizeof *converter); + converter->tocode = xstrdup (tocode); + converter->fromcode = xstrdup (fromcode); + converter->conv = iconv_open (tocode, fromcode); + hmapx_insert (&map, converter, hash); + + /* I don't think it's safe to translate this string or to use messaging + as the convertors have not yet been set up */ + if ( (iconv_t) -1 == converter->conv && 0 != strcmp (tocode, fromcode)) { - conv = hmapx_node_data (node); + const int err = errno; + fprintf (stderr, + "Warning: " + "cannot create a convertor for \"%s\" to \"%s\": %s\n", + fromcode, tocode, strerror (err)); } - return conv; + return converter->conv; +} + +char * +recode_string (const char *to, const char *from, + const char *text, int length) +{ + return recode_string_pool (to, from, text, length, NULL); } -/* Return a string based on TEXT converted according to HOW. + +/* Return a string based on TEXT which must be encoded using FROM. + The returned string will be encoded in TO. If length is not -1, then it must be the number of bytes in TEXT. The returned string must be freed when no longer required. */ char * -recode_string (const char *to, const char *from, - const char *text, int length) +recode_string_pool (const char *to, const char *from, + const char *text, int length, struct pool *pool) { char *outbuf = 0; size_t outbufferlength; @@ -106,7 +120,6 @@ recode_string (const char *to, const char *from, if ( length == -1 ) length = strlen(text); - if (to == NULL) to = default_encoding; @@ -117,7 +130,7 @@ recode_string (const char *to, const char *from, if ( outbufferlength > length) break; - outbuf = xmalloc(outbufferlength); + outbuf = pool_malloc (pool, outbufferlength); op = outbuf; outbytes = outbufferlength; @@ -126,6 +139,9 @@ recode_string (const char *to, const char *from, conv = create_iconv (to, from); + if ( (iconv_t) -1 == conv ) + return xstrdup (text); + do { const char *ip = text; result = iconv (conv, (ICONV_CONST char **) &text, &inbytes, @@ -151,7 +167,7 @@ recode_string (const char *to, const char *from, case E2BIG: free (outbuf); outbufferlength <<= 1; - outbuf = xmalloc (outbufferlength); + outbuf = pool_malloc (pool, outbufferlength); op = outbuf; outbytes = outbufferlength; inbytes = length; @@ -159,6 +175,7 @@ recode_string (const char *to, const char *from, break; default: /* should never happen */ + fprintf (stderr, "Character conversion error: %s\n", strerror (the_error)); NOT_REACHED (); break; } @@ -168,7 +185,7 @@ recode_string (const char *to, const char *from, if (outbytes == 0 ) { char *const oldaddr = outbuf; - outbuf = xrealloc (outbuf, outbufferlength + 1); + outbuf = pool_realloc (pool, outbuf, outbufferlength + 1); op += (outbuf - oldaddr) ; } @@ -182,20 +199,91 @@ recode_string (const char *to, const char *from, void i18n_init (void) { - free (default_encoding); - default_encoding = strdup (locale_charset ()); +#if ENABLE_NLS + setlocale (LC_CTYPE, ""); +#ifdef LC_MESSAGES + setlocale (LC_MESSAGES, ""); +#endif +#if HAVE_LC_PAPER + setlocale (LC_PAPER, ""); +#endif + bindtextdomain (PACKAGE, relocate(locale_dir)); + textdomain (PACKAGE); +#endif /* ENABLE_NLS */ + + assert (default_encoding == NULL); + default_encoding = xstrdup (locale_charset ()); hmapx_init (&map); } +const char * +get_default_encoding (void) +{ + return default_encoding; +} + +void +set_default_encoding (const char *enc) +{ + free (default_encoding); + default_encoding = xstrdup (enc); +} + + +/* Attempts to set the encoding from a locale name + returns true if successfull. + This function does not (should not!) alter the current locale. +*/ +bool +set_encoding_from_locale (const char *loc) +{ + bool ok = true; + char *c_encoding; + char *loc_encoding; + char *tmp = xstrdup (setlocale (LC_CTYPE, NULL)); + + setlocale (LC_CTYPE, "C"); + c_encoding = xstrdup (locale_charset ()); + + setlocale (LC_CTYPE, loc); + loc_encoding = xstrdup (locale_charset ()); + + + if ( 0 == strcmp (loc_encoding, c_encoding)) + { + ok = false; + } + + + setlocale (LC_CTYPE, tmp); + + free (tmp); + + if (ok) + { + free (default_encoding); + default_encoding = loc_encoding; + } + else + free (loc_encoding); + + free (c_encoding); + + return ok; +} + void i18n_done (void) { struct hmapx_node *node; - iconv_t conv; - HMAPX_FOR_EACH (conv, node, &map) - iconv_close (conv); + struct converter *cvtr; + HMAPX_FOR_EACH (cvtr, node, &map) + { + iconv_close (cvtr->conv); + free (cvtr); + } hmapx_destroy (&map); @@ -205,6 +293,19 @@ i18n_done (void) +bool +valid_encoding (const char *enc) +{ + iconv_t conv = iconv_open ("UTF8", enc); + + if ( conv == (iconv_t) -1) + return false; + + iconv_close (conv); + + return true; +} + /* Return the system local's idea of the decimal seperator character */ @@ -213,7 +314,7 @@ get_system_decimal (void) { char radix_char; - char *ol = strdup (setlocale (LC_NUMERIC, NULL)); + char *ol = xstrdup (setlocale (LC_NUMERIC, NULL)); setlocale (LC_NUMERIC, ""); #if HAVE_NL_LANGINFO