Merge commit 'origin/stable'

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

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index bda2676c86788eabcfa24a937f7802cbe19c955d..f8e5e396e865efe267155f29f02aa29fb024649f 100644 (file)
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -35,8 +35,8 @@
 #endif
 
 
-static char *locale = 0;
-static const char *charset;
+static char *locale;
+static char *charset;
 
 
 static iconv_t convertor[n_CONV];
@@ -165,16 +165,17 @@ void
 set_pspp_locale (const char *l)
 {
   char *current_locale;
-  const char *current_charset;
+  char *current_charset;
 
   free(locale);
   locale = strdup(l);
 
-  current_locale = setlocale (LC_CTYPE, 0);
-  current_charset = locale_charset ();
+  current_locale = strdup (setlocale (LC_CTYPE, 0));
+  current_charset = strdup (locale_charset ());
   setlocale (LC_CTYPE, locale);
 
-  charset = locale_charset ();
+  free (charset);
+  charset = strdup (locale_charset ());
   setlocale (LC_CTYPE, current_locale);
 
   iconv_close (convertor[CONV_PSPP_TO_UTF8]);
@@ -185,6 +186,9 @@ set_pspp_locale (const char *l)
 
   iconv_close (convertor[CONV_UTF8_TO_PSPP]);
   convertor[CONV_UTF8_TO_PSPP] = create_iconv (charset, "UTF-8");
+
+  free (current_locale);
+  free (current_charset);
 }
 
 void
@@ -194,7 +198,9 @@ i18n_init (void)
   locale = strdup (setlocale (LC_CTYPE, NULL));
 
   setlocale (LC_CTYPE, locale);
-  charset = locale_charset ();
+
+  free (charset);
+  charset = strdup (locale_charset ());
 
   convertor[CONV_PSPP_TO_UTF8]   = create_iconv ("UTF-8", charset);
   convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset);
@@ -225,24 +231,25 @@ i18n_done (void)
 char
 get_system_decimal (void)
 {
-  char *radix_char = NULL;
+  char radix_char;
 
-  char *ol = setlocale (LC_NUMERIC, NULL);
+  char *ol = strdup (setlocale (LC_NUMERIC, NULL));
   setlocale (LC_NUMERIC, "");
 
 #if HAVE_NL_LANGINFO
-  radix_char = nl_langinfo (RADIXCHAR);
+  radix_char = nl_langinfo (RADIXCHAR)[0];
 #else
   {
-    char *buf = xmalloc (10);
-    snprintf (buf, 10, "%f", 2.5);
-    radix_char = &buf[1];
+    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);
-  return *radix_char;
+  free (ol);
+  return radix_char;
 }