#include <localcharset.h>
#include "xstrndup.h"
+#if HAVE_NL_LANGINFO
+#include <langinfo.h>
+#endif
-static char *locale = 0;
-static const char *charset;
+
+static char *locale;
+static char *charset;
static iconv_t convertor[n_CONV];
/* 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)
+ if ( (iconv_t) -1 == conv && 0 != strcmp (tocode, fromcode))
{
const int err = errno;
fprintf (stderr,
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]);
iconv_close (convertor[CONV_UTF8_TO_PSPP]);
convertor[CONV_UTF8_TO_PSPP] = create_iconv (charset, "UTF-8");
+
+ free (current_locale);
+ free (current_charset);
}
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);
}
}
+
+
+
+/* Return the system local's idea of the
+ decimal seperator character */
+char
+get_system_decimal (void)
+{
+ char radix_char;
+
+ char *ol = strdup (setlocale (LC_NUMERIC, NULL));
+ setlocale (LC_NUMERIC, "");
+
+#if HAVE_NL_LANGINFO
+ radix_char = nl_langinfo (RADIXCHAR)[0];
+#else
+ {
+ 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);
+ free (ol);
+ return radix_char;
+}
+