Make create_iconv() properly distinguish converters by name.

[pspp-builds.git] / src / libpspp / i18n.c

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index c0459712e71480dba9503aaa9260a28ac115f4c6..74ec1f1fdeb18c0116c95d8e30b6e12cd57381e6 100644 (file)
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -39,6 +39,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 +53,34 @@ 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;
+
+  hash = hsh_hash_string (tocode) ^ hsh_hash_string (fromcode);
+  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 = 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.
@@ -198,7 +197,7 @@ i18n_init (void)
 #endif /* ENABLE_NLS */
 
   assert (default_encoding == NULL);
-  default_encoding = strdup (locale_charset ());
+  default_encoding = xstrdup (locale_charset ());
 
   hmapx_init (&map);
 }
@@ -214,7 +213,7 @@ void
 set_default_encoding (const char *enc)
 {
   free (default_encoding);
-  default_encoding = strdup (enc);
+  default_encoding = xstrdup (enc);
 }
 
 
@@ -228,13 +227,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))
@@ -297,7 +296,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