X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=c214fb55b0a0147514949e03311be172099276dc;hb=436b01ace5b84c27963f6130dca0e69fe15f9a17;hp=e77abfe5b810fc2efff3d4cb35ba98c7776876e6;hpb=37802756c76db95313a42db5938bb9a560f35055;p=pspp-builds.git

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index e77abfe5..c214fb55 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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include <xalloc.h>
 #include <assert.h>
+#include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -97,7 +96,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 +178,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 +192,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");
 }