X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=60189ff76eb6e983c0958af83916a4bd1fe57469;hb=16ca75fe99859fdec9f214a0fb9c1a3ef58c8442;hp=c0459712e71480dba9503aaa9260a28ac115f4c6;hpb=d6ede2e8f16079edae2e308583f8af4f7e9daddd;p=pspp-builds.git

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index c0459712..60189ff7 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -24,6 +24,7 @@
 #include <libintl.h>
 #include <iconv.h>
 #include <errno.h>
+#include <relocatable.h>
 #include "assertion.h"
 #include "hmapx.h"
 #include "hash-functions.h"
@@ -39,6 +40,13 @@
 #include <langinfo.h>
 #endif
 
+struct converter
+  {
+    const char *tocode;
+    const char *fromcode;
+    iconv_t conv;
+  };
+
 static char *default_encoding;
 static struct hmapx map;
 
@@ -46,42 +54,35 @@ 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)
+  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 = 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);
+      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;
 }
 
 /* Return a string based on TEXT converted according to HOW.
@@ -129,6 +130,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,
@@ -162,6 +166,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;
 	  }
@@ -187,18 +192,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 +219,7 @@ void
 set_default_encoding (const char *enc)
 {
   free (default_encoding);
-  default_encoding = strdup (enc);
+  default_encoding = xstrdup (enc);
 }
 
 
@@ -228,13 +233,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 +269,12 @@ 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);
 
@@ -297,7 +305,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