X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=1cc518ff3cb363f4930c800a55b737bf317e49b3;hb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;hp=c0459712e71480dba9503aaa9260a28ac115f4c6;hpb=537fdeb3702c011e05d7826a8d556a7beeba2605;p=pspp diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c index c0459712e7..1cc518ff3c 100644 --- a/src/libpspp/i18n.c +++ b/src/libpspp/i18n.c @@ -24,9 +24,11 @@ #include #include #include +#include #include "assertion.h" #include "hmapx.h" #include "hash-functions.h" +#include "pool.h" #include "i18n.h" @@ -39,6 +41,13 @@ #include #endif +struct converter + { + char *tocode; + char *fromcode; + iconv_t conv; + }; + static char *default_encoding; static struct hmapx map; @@ -46,51 +55,65 @@ 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 converters 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 converter for `%s' to `%s': %s\n", + fromcode, tocode, strerror (err)); } - return conv; + return converter->conv; } -/* Return a string based on TEXT converted according to HOW. - 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. -*/ + +/* Similar to recode_string_pool, but allocates the returned value on the heap instead of + in a pool. It is the caller's responsibility to free the returned value. */ char * recode_string (const char *to, const char *from, const char *text, int length) +{ + return recode_string_pool (to, from, text, length, NULL); +} + + +/* +Converts the string TEXT, which should be encoded in FROM-encoding, to a +dynamically allocated string in TO-encoding. Any characters which cannot +be converted will be represented by '?'. + +LENGTH should be the length of the string or -1, if null terminated. + +The returned string will be allocated on POOL. + +This function's behaviour differs from that of g_convert_with_fallback provided +by GLib. The GLib function will fail (returns NULL) if any part of the input +string is not valid in the declared input encoding. This function however perseveres +even in the presence of badly encoded input. +*/ +char * +recode_string_pool (const char *to, const char *from, + const char *text, int length, struct pool *pool) { char *outbuf = 0; size_t outbufferlength; @@ -109,7 +132,6 @@ recode_string (const char *to, const char *from, if ( length == -1 ) length = strlen(text); - if (to == NULL) to = default_encoding; @@ -120,7 +142,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; @@ -129,6 +151,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, @@ -152,9 +177,9 @@ recode_string (const char *to, const char *from, } /* Fall through */ case E2BIG: - free (outbuf); + pool_free (pool, outbuf); outbufferlength <<= 1; - outbuf = xmalloc (outbufferlength); + outbuf = pool_malloc (pool, outbufferlength); op = outbuf; outbytes = outbufferlength; inbytes = length; @@ -162,6 +187,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; } @@ -171,7 +197,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) ; } @@ -187,18 +213,18 @@ i18n_init (void) { #if ENABLE_NLS setlocale (LC_CTYPE, ""); -#if HAVE_LC_MESSAGES +#ifdef LC_MESSAGES setlocale (LC_MESSAGES, ""); #endif #if HAVE_LC_PAPER setlocale (LC_PAPER, ""); #endif - bindtextdomain (PACKAGE, locale_dir); + bindtextdomain (PACKAGE, relocate(locale_dir)); textdomain (PACKAGE); #endif /* ENABLE_NLS */ assert (default_encoding == NULL); - default_encoding = strdup (locale_charset ()); + default_encoding = xstrdup (locale_charset ()); hmapx_init (&map); } @@ -214,7 +240,7 @@ void set_default_encoding (const char *enc) { free (default_encoding); - default_encoding = strdup (enc); + default_encoding = xstrdup (enc); } @@ -228,13 +254,13 @@ set_encoding_from_locale (const char *loc) bool ok = true; char *c_encoding; char *loc_encoding; - char *tmp = strdup (setlocale (LC_CTYPE, NULL)); + char *tmp = xstrdup (setlocale (LC_CTYPE, NULL)); setlocale (LC_CTYPE, "C"); - c_encoding = strdup (locale_charset ()); + c_encoding = xstrdup (locale_charset ()); setlocale (LC_CTYPE, loc); - loc_encoding = strdup (locale_charset ()); + loc_encoding = xstrdup (locale_charset ()); if ( 0 == strcmp (loc_encoding, c_encoding)) @@ -264,9 +290,15 @@ 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) + { + free (cvtr->tocode); + free (cvtr->fromcode); + iconv_close (cvtr->conv); + free (cvtr); + } hmapx_destroy (&map); @@ -297,7 +329,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