X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=1463a4eecf667e43dd8fcbbedfa35f0d527ad4d4;hb=d4fdb8d1a601d45340fc29f0af38f0aef151fb0b;hp=bda2676c86788eabcfa24a937f7802cbe19c955d;hpb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;p=pspp diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c index bda2676c86..1463a4eecf 100644 --- a/src/libpspp/i18n.c +++ b/src/libpspp/i18n.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2009 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,6 +24,8 @@ #include #include #include "assertion.h" +#include "hmapx.h" +#include "hash-functions.h" #include "i18n.h" @@ -34,28 +36,46 @@ #include #endif - -static char *locale = 0; -static const char *charset; - - -static iconv_t convertor[n_CONV]; - +static char *default_encoding; +static struct hmapx map; /* A wrapper around iconv_open */ static iconv_t create_iconv (const char* tocode, const char* fromcode) { - iconv_t conv = iconv_open (tocode, fromcode); + iconv_t conv; + struct hmapx_node *node; + size_t hash ; + char *key = alloca (strlen (tocode) + strlen (fromcode) + 2); - /* 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)) + 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) { - const int err = errno; - fprintf (stderr, - "Warning: cannot create a convertor for \"%s\" to \"%s\": %s\n", - fromcode, tocode, strerror (err)); + 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 + { + conv = hmapx_node_data (node); } return conv; @@ -66,7 +86,8 @@ create_iconv (const char* tocode, const char* fromcode) The returned string must be freed when no longer required. */ char * -recode_string (enum conv_id how, const char *text, int length) +recode_string (const char *to, const char *from, + const char *text, int length) { char *outbuf = 0; size_t outbufferlength; @@ -74,6 +95,7 @@ recode_string (enum conv_id how, const char *text, int length) char *op ; size_t inbytes = 0; size_t outbytes ; + iconv_t conv ; /* FIXME: Need to ensure that this char is valid in the target encoding */ const char fallbackchar = '?'; @@ -84,10 +106,12 @@ recode_string (enum conv_id how, const char *text, int length) if ( length == -1 ) length = strlen(text); - assert (how < n_CONV); - if (convertor[how] == (iconv_t) -1) - return xstrndup (text, length); + if (to == NULL) + to = default_encoding; + + if (from == NULL) + from = default_encoding; for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 ) if ( outbufferlength > length) @@ -99,9 +123,12 @@ recode_string (enum conv_id how, const char *text, int length) outbytes = outbufferlength; inbytes = length; + + conv = create_iconv (to, from); + do { const char *ip = text; - result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes, + result = iconv (conv, (ICONV_CONST char **) &text, &inbytes, &op, &outbytes); if ( -1 == result ) @@ -152,69 +179,28 @@ recode_string (enum conv_id how, const char *text, int length) } -/* Returns the current PSPP locale */ -const char * -get_pspp_locale (void) -{ - assert (locale); - return locale; -} - -/* Set the PSPP locale */ -void -set_pspp_locale (const char *l) -{ - char *current_locale; - const char *current_charset; - - free(locale); - locale = strdup(l); - - current_locale = setlocale (LC_CTYPE, 0); - current_charset = locale_charset (); - setlocale (LC_CTYPE, locale); - - charset = locale_charset (); - setlocale (LC_CTYPE, current_locale); - - iconv_close (convertor[CONV_PSPP_TO_UTF8]); - convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset); - - iconv_close (convertor[CONV_SYSTEM_TO_PSPP]); - convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, current_charset); - - iconv_close (convertor[CONV_UTF8_TO_PSPP]); - convertor[CONV_UTF8_TO_PSPP] = create_iconv (charset, "UTF-8"); -} - void i18n_init (void) { - assert (!locale) ; - locale = strdup (setlocale (LC_CTYPE, NULL)); - - setlocale (LC_CTYPE, locale); - charset = locale_charset (); + free (default_encoding); + default_encoding = strdup (locale_charset ()); - convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset); - convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset); - convertor[CONV_UTF8_TO_PSPP] = create_iconv (charset, "UTF-8"); + hmapx_init (&map); } void i18n_done (void) { - int i; - free (locale); - locale = 0; + struct hmapx_node *node; + iconv_t conv; + HMAPX_FOR_EACH (conv, node, &map) + iconv_close (conv); - for(i = 0 ; i < n_CONV; ++i ) - { - if ( (iconv_t) -1 == convertor[i] ) - continue; - iconv_close (convertor[i]); - } + hmapx_destroy (&map); + + free (default_encoding); + default_encoding = NULL; } @@ -225,24 +211,25 @@ i18n_done (void) char get_system_decimal (void) { - char *radix_char = NULL; + char radix_char; - char *ol = setlocale (LC_NUMERIC, NULL); + char *ol = strdup (setlocale (LC_NUMERIC, NULL)); setlocale (LC_NUMERIC, ""); #if HAVE_NL_LANGINFO - radix_char = nl_langinfo (RADIXCHAR); + radix_char = nl_langinfo (RADIXCHAR)[0]; #else { - char *buf = xmalloc (10); - snprintf (buf, 10, "%f", 2.5); - radix_char = &buf[1]; + char buf[10]; + snprintf (buf, sizeof buf, "%f", 2.5); + radix_char = buf[1]; } #endif /* We MUST leave LC_NUMERIC untouched, since it would otherwise interfere with data_{in,out} */ setlocale (LC_NUMERIC, ol); - return *radix_char; + free (ol); + return radix_char; }