X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=db851217c80be27ae129a9c6252824929af51785;hb=97e2b765b9b3cb25c85c5a6b0727d66e481411b1;hp=e77abfe5b810fc2efff3d4cb35ba98c7776876e6;hpb=37802756c76db95313a42db5938bb9a560f35055;p=pspp
diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index e77abfe5b8..db851217c8 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -1,24 +1,23 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 2006 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include
#include
+#include
#include
#include
#include
@@ -31,6 +30,10 @@
#include
#include "xstrndup.h"
+#if HAVE_NL_LANGINFO
+#include
+#endif
+
static char *locale = 0;
static const char *charset;
@@ -47,7 +50,7 @@ create_iconv (const char* tocode, const char* 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)
+ if ( (iconv_t) -1 == conv && 0 != strcmp (tocode, fromcode))
{
const int err = errno;
fprintf (stderr,
@@ -97,7 +100,7 @@ recode_string (enum conv_id how, const char *text, int length)
inbytes = length;
do {
- char *ip = text;
+ const char *ip = text;
result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes,
&op, &outbytes);
@@ -179,6 +182,9 @@ set_pspp_locale (const char *l)
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
@@ -190,8 +196,9 @@ i18n_init (void)
setlocale (LC_CTYPE, locale);
charset = locale_charset ();
- convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", 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");
}
@@ -210,3 +217,32 @@ i18n_done (void)
}
}
+
+
+
+/* Return the system local's idea of the
+ decimal seperator character */
+char
+get_system_decimal (void)
+{
+ char radix_char;
+
+ char *ol = 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);
+ return radix_char;
+}
+