#include <langinfo.h>
#endif
-
-static char *locale = 0;
-static const char *charset;
-
-
-static iconv_t convertor[n_CONV];
+static char *default_encoding;
/* A wrapper around iconv_open */
The returned string must be freed when no longer required.
*/
char *
-recode_string (enum conv_id how, const char *text, int length)
+recode_string (const char *to, const char *from,
+ const char *text, int length)
{
char *outbuf = 0;
size_t outbufferlength;
char *op ;
size_t inbytes = 0;
size_t outbytes ;
+ iconv_t conv ;
/* FIXME: Need to ensure that this char is valid in the target encoding */
const char fallbackchar = '?';
if ( length == -1 )
length = strlen(text);
- assert (how < n_CONV);
- if (convertor[how] == (iconv_t) -1)
+ if (to == NULL)
+ to = default_encoding;
+
+ if (from == NULL)
+ from = default_encoding;
+
+ if ( 0 == strcmp (to, from))
return xstrndup (text, length);
for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 )
outbytes = outbufferlength;
inbytes = length;
+
+ conv = create_iconv (to, from);
+
do {
const char *ip = text;
- result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes,
+ result = iconv (conv, (ICONV_CONST char **) &text, &inbytes,
&op, &outbytes);
if ( -1 == result )
}
} while ( -1 == result );
+
+ iconv_close (conv);
+
if (outbytes == 0 )
{
char *const oldaddr = outbuf;
}
-/* Returns the current PSPP locale */
-const char *
-get_pspp_locale (void)
-{
- assert (locale);
- return locale;
-}
-/* Set the PSPP locale */
-void
-set_pspp_locale (const char *l)
-{
- char *current_locale;
- const char *current_charset;
-
- free(locale);
- locale = strdup(l);
-
- current_locale = setlocale (LC_CTYPE, 0);
- current_charset = locale_charset ();
- setlocale (LC_CTYPE, locale);
-
- charset = locale_charset ();
- setlocale (LC_CTYPE, current_locale);
-
- iconv_close (convertor[CONV_PSPP_TO_UTF8]);
- convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset);
-
- iconv_close (convertor[CONV_SYSTEM_TO_PSPP]);
- convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, current_charset);
-
- iconv_close (convertor[CONV_UTF8_TO_PSPP]);
- convertor[CONV_UTF8_TO_PSPP] = create_iconv (charset, "UTF-8");
-}
void
i18n_init (void)
{
- assert (!locale) ;
- locale = strdup (setlocale (LC_CTYPE, NULL));
-
- setlocale (LC_CTYPE, locale);
- charset = locale_charset ();
-
- convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset);
- convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset);
- convertor[CONV_UTF8_TO_PSPP] = create_iconv (charset, "UTF-8");
+ free (default_encoding);
+ default_encoding = strdup (locale_charset ());
}
void
i18n_done (void)
{
- int i;
- free (locale);
- locale = 0;
-
- for(i = 0 ; i < n_CONV; ++i )
- {
- if ( (iconv_t) -1 == convertor[i] )
- continue;
- iconv_close (convertor[i]);
- }
+ free (default_encoding);
+ default_encoding = NULL;
}
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;
}