X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=06c67d947928122ec8e75f665a4e6f9b62d9df45;hb=fb1c27ed0cbc16d151d182dd3f2be5eb3189a045;hp=74ec1f1fdeb18c0116c95d8e30b6e12cd57381e6;hpb=dd2e61b4a4e0f5605588a9d7249ea5d9bd70287a;p=pspp diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c index 74ec1f1fde..06c67d9479 100644 --- a/src/libpspp/i18n.c +++ b/src/libpspp/i18n.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,9 +24,11 @@ #include #include #include +#include #include "assertion.h" #include "hmapx.h" #include "hash-functions.h" +#include "pool.h" #include "i18n.h" @@ -40,9 +42,9 @@ #endif struct converter - { - const char *tocode; - const char *fromcode; + { + char *tocode; + char *fromcode; iconv_t conv; }; @@ -56,8 +58,9 @@ create_iconv (const char* tocode, const char* fromcode) size_t hash; struct hmapx_node *node; struct converter *converter; + assert (fromcode); - hash = hsh_hash_string (tocode) ^ hsh_hash_string (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)) @@ -68,28 +71,48 @@ create_iconv (const char* tocode, const char* fromcode) 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 */ + as the converters have not yet been set up */ if ( (iconv_t) -1 == converter->conv && 0 != strcmp (tocode, fromcode)) { const int err = errno; fprintf (stderr, "Warning: " - "cannot create a convertor for \"%s\" to \"%s\": %s\n", + "cannot create a converter for `%s' to `%s': %s\n", fromcode, tocode, strerror (err)); } 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; @@ -108,26 +131,32 @@ recode_string (const char *to, const char *from, if ( length == -1 ) length = strlen(text); - if (to == NULL) to = default_encoding; if (from == NULL) from = default_encoding; + conv = create_iconv (to, from); + + if ( (iconv_t) -1 == conv ) + return xstrdup (text); + + /* Put the converter into the initial shift state, in case there was any + state information left over from its last usage. */ + iconv (conv, NULL, 0, NULL, 0); + for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 ) if ( outbufferlength > length) break; - outbuf = xmalloc(outbufferlength); + outbuf = pool_malloc (pool, outbufferlength); op = outbuf; outbytes = outbufferlength; inbytes = length; - conv = create_iconv (to, from); - do { const char *ip = text; result = iconv (conv, (ICONV_CONST char **) &text, &inbytes, @@ -151,9 +180,10 @@ recode_string (const char *to, const char *from, } /* Fall through */ case E2BIG: - free (outbuf); + iconv (conv, NULL, 0, NULL, 0); + pool_free (pool, outbuf); outbufferlength <<= 1; - outbuf = xmalloc (outbufferlength); + outbuf = pool_malloc (pool, outbufferlength); op = outbuf; outbytes = outbufferlength; inbytes = length; @@ -161,6 +191,8 @@ 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; } @@ -170,7 +202,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) ; } @@ -186,13 +218,13 @@ 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 */ @@ -263,9 +295,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);