X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=1463a4eecf667e43dd8fcbbedfa35f0d527ad4d4;hb=d4fdb8d1a601d45340fc29f0af38f0aef151fb0b;hp=a2c0af0f94e8f5a6d0188a16c994c131fe02605d;hpb=bea461dcf5d18e97e76facc5b1faf9ca86be7646;p=pspp
diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index a2c0af0f94..1463a4eecf 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -1,59 +1,83 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include
#include
+#include
#include
#include
#include
#include
#include
+#include "assertion.h"
+#include "hmapx.h"
+#include "hash-functions.h"
#include "i18n.h"
#include
#include "xstrndup.h"
+#if HAVE_NL_LANGINFO
+#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
+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);
+
+ strcpy (key, tocode);
+ strcat (key, "\n"); /* hopefully no encoding names contain '\n' */
+ strcat (key, 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)
+ 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
{
- const int err = errno;
- fprintf (stderr,
- "Warning: cannot create a convertor for \"%s\" to \"%s\": %s\n",
- fromcode, tocode, strerror (err));
+ conv = hmapx_node_data (node);
}
-
+
return conv;
}
@@ -62,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;
@@ -70,23 +95,26 @@ 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 = '?';
- if ( text == NULL )
+ if ( text == NULL )
return NULL;
- if ( length == -1 )
+ 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)
+ if ( outbufferlength > length)
break;
outbuf = xmalloc(outbufferlength);
@@ -94,20 +122,24 @@ recode_string(enum conv_id how, const char *text, int length)
outbytes = outbufferlength;
inbytes = length;
-
+
+
+ conv = create_iconv (to, from);
+
do {
- result = iconv(convertor[how], &text, &inbytes,
+ const char *ip = text;
+ result = iconv (conv, (ICONV_CONST char **) &text, &inbytes,
&op, &outbytes);
- if ( -1 == result )
+ if ( -1 == result )
{
int the_error = errno;
- switch ( the_error)
+ switch (the_error)
{
case EILSEQ:
case EINVAL:
- if ( outbytes > 0 )
+ if ( outbytes > 0 )
{
*op++ = fallbackchar;
outbytes--;
@@ -117,26 +149,27 @@ recode_string(enum conv_id how, const char *text, int length)
}
/* Fall through */
case E2BIG:
- free(outbuf);
+ free (outbuf);
outbufferlength <<= 1;
- outbuf = xmalloc(outbufferlength);
+ outbuf = xmalloc (outbufferlength);
op = outbuf;
outbytes = outbufferlength;
inbytes = length;
+ text = ip;
break;
default:
/* should never happen */
+ NOT_REACHED ();
break;
}
-
}
} while ( -1 == result );
- if (outbytes == 0 )
+ if (outbytes == 0 )
{
char *const oldaddr = outbuf;
- outbuf = xrealloc(outbuf, outbufferlength + 1);
-
+ outbuf = xrealloc (outbuf, outbufferlength + 1);
+
op += (outbuf - oldaddr) ;
}
@@ -146,64 +179,57 @@ 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)
+void
+i18n_init (void)
{
- 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);
+ free (default_encoding);
+ default_encoding = strdup (locale_charset ());
- 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);
+ hmapx_init (&map);
}
+
void
-i18n_init(void)
+i18n_done (void)
{
- assert ( ! locale) ;
- locale = strdup(setlocale(LC_CTYPE, NULL));
+ struct hmapx_node *node;
+ iconv_t conv;
+ HMAPX_FOR_EACH (conv, node, &map)
+ iconv_close (conv);
- setlocale(LC_CTYPE, locale);
- charset = locale_charset();
+ hmapx_destroy (&map);
- convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset);
- convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset);
+ free (default_encoding);
+ default_encoding = NULL;
}
-void
-i18n_done(void)
-{
- int i;
- free(locale);
- locale = 0;
- for(i = 0 ; i < n_CONV; ++i )
- {
- if ( (iconv_t) -1 == convertor[i] )
- continue;
- iconv_close(convertor[i]);
- }
+
+/* Return the system local's idea of the
+ decimal seperator character */
+char
+get_system_decimal (void)
+{
+ char radix_char;
+
+ char *ol = strdup (setlocale (LC_NUMERIC, NULL));
+ setlocale (LC_NUMERIC, "");
+
+#if HAVE_NL_LANGINFO
+ radix_char = nl_langinfo (RADIXCHAR)[0];
+#else
+ {
+ 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);
+ free (ol);
+ return radix_char;
}