Refactor locale initialisation.

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

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 674a9a27022b44bedb51c8883a8d203cfe0be3c8..36215b700c574ee6d9ef69acadc1e684cbde99e5 100644 (file)
--- 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
@@ -21,12 +21,17 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <libintl.h>
 #include <iconv.h>
 #include <errno.h>
 #include "assertion.h"
+#include "hmapx.h"
+#include "hash-functions.h"
 
 #include "i18n.h"
 
+#include "version.h"
+
 #include <localcharset.h>
 #include "xstrndup.h"
 
@@ -35,22 +40,45 @@
 #endif
 
 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);
+
+  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 && 0 != strcmp (tocode, 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;
@@ -88,12 +116,6 @@ recode_string (const char *to, const char *from,
   if (from == NULL)
     from = default_encoding;
 
-
-  fprintf (stderr, "from: %s; to %s\n", from, to);
-
-  if ( 0 == strcmp (to, from))
-    return xstrndup (text, length);
-
   for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 )
     if ( outbufferlength > length)
       break;
@@ -146,9 +168,6 @@ recode_string (const char *to, const char *from,
       }
   } while ( -1 == result );
 
-
-  iconv_close (conv);
-
   if (outbytes == 0 )
     {
       char *const oldaddr = outbuf;
@@ -163,19 +182,38 @@ recode_string (const char *to, const char *from,
 }
 
 
-
-
 void
 i18n_init (void)
 {
-  free (default_encoding);
+#if ENABLE_NLS
+  setlocale (LC_CTYPE, "");
+#if HAVE_LC_MESSAGES
+  setlocale (LC_MESSAGES, "");
+#endif
+#if HAVE_LC_PAPER
+  setlocale (LC_PAPER, "");
+#endif
+  bindtextdomain (PACKAGE, locale_dir);
+  textdomain (PACKAGE);
+#endif /* ENABLE_NLS */
+
+  assert (default_encoding == NULL);
   default_encoding = strdup (locale_charset ());
+
+  hmapx_init (&map);
 }
 
 
 void
 i18n_done (void)
 {
+  struct hmapx_node *node;
+  iconv_t conv;
+  HMAPX_FOR_EACH (conv, node, &map)
+    iconv_close (conv);
+
+  hmapx_destroy (&map);
+
   free (default_encoding);
   default_encoding = NULL;
 }