Add "x" prefix to calls to plain malloc(), calloc(), strdup(), realloc().

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

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index a07949f3352bbcc4b314b566cc0be4d5c03f4997..a4e9b63f755ed8e6abd6b611567c03e1d02b5fea 100644 (file)
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -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);
+
+  hash = hsh_hash_string (key);
 
-  /* 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))
+  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;
@@ -140,9 +168,6 @@ recode_string (const char *to, const char *from,
       }
   } while ( -1 == result );
 
-
-  iconv_close (conv);
-
   if (outbytes == 0 )
     {
       char *const oldaddr = outbuf;
@@ -157,25 +182,113 @@ recode_string (const char *to, const char *from,
 }
 
 
+void
+i18n_init (void)
+{
+#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 = xstrdup (locale_charset ());
+
+  hmapx_init (&map);
+}
+
 
+const char *
+get_default_encoding (void)
+{
+  return default_encoding;
+}
 
 void
-i18n_init (void)
+set_default_encoding (const char *enc)
 {
   free (default_encoding);
-  default_encoding = strdup (locale_charset ());
+  default_encoding = xstrdup (enc);
 }
 
 
+/* Attempts to set the encoding from a locale name
+   returns true if successfull.
+   This function does not (should not!) alter the current locale.
+*/
+bool
+set_encoding_from_locale (const char *loc)
+{
+  bool ok = true;
+  char *c_encoding;
+  char *loc_encoding;
+  char *tmp = xstrdup (setlocale (LC_CTYPE, NULL));
+
+  setlocale (LC_CTYPE, "C");
+  c_encoding = xstrdup (locale_charset ());
+
+  setlocale (LC_CTYPE, loc);
+  loc_encoding = xstrdup (locale_charset ());
+
+
+  if ( 0 == strcmp (loc_encoding, c_encoding))
+    {
+      ok = false;
+    }
+
+
+  setlocale (LC_CTYPE, tmp);
+
+  free (tmp);
+
+  if (ok)
+    {
+      free (default_encoding);
+      default_encoding = loc_encoding;
+    }
+  else
+    free (loc_encoding);
+
+  free (c_encoding);
+
+  return ok;
+}
+
 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;
 }
 
 
 
+bool
+valid_encoding (const char *enc)
+{
+  iconv_t conv = iconv_open ("UTF8", enc);
+
+  if ( conv == (iconv_t) -1)
+    return false;
+
+  iconv_close (conv);
+
+  return true;
+}
+
 
 /* Return the system local's idea of the
    decimal seperator character */
@@ -184,7 +297,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