X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=c214fb55b0a0147514949e03311be172099276dc;hb=d0371553a98cd169353bf6d211e375e5ffc3a3bd;hp=23254ea3bb0a705381e87d5ff2124c84fd5e4223;hpb=de8b8d4a303120d3f490c50e25f1d46581530bd2;p=pspp

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 23254ea3bb..c214fb55b0 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -1,29 +1,29 @@
-/* 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>
 #include <iconv.h>
 #include <errno.h>
+#include "assertion.h"
 
 #include "i18n.h"
 
@@ -39,21 +39,21 @@ static iconv_t convertor[n_CONV];
 
 
 /* A wrapper around iconv_open */
-static iconv_t 
+static iconv_t
 create_iconv (const char* tocode, const char* fromcode)
 {
   iconv_t conv = iconv_open (tocode, 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)
     {
       const int err = errno;
-      fprintf (stderr, 
+      fprintf (stderr,
 	"Warning: cannot create a convertor for \"%s\" to \"%s\": %s\n",
 	fromcode, tocode, strerror (err));
     }
-   
+
   return conv;
 }
 
@@ -74,19 +74,19 @@ recode_string (enum conv_id how,  const char *text, int length)
   /* FIXME: Need to ensure that this char is valid in the target encoding */
   const char fallbackchar = '?';
 
-  if ( text == NULL ) 
+  if ( text == NULL )
     return NULL;
 
-  if ( length == -1 ) 
+  if ( length == -1 )
      length = strlen(text);
 
   assert (how < n_CONV);
 
-  if (convertor[how] == (iconv_t) -1) 
+  if (convertor[how] == (iconv_t) -1)
     return xstrndup (text, length);
 
   for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 )
-    if ( outbufferlength > length) 
+    if ( outbufferlength > length)
       break;
 
   outbuf = xmalloc(outbufferlength);
@@ -94,12 +94,13 @@ recode_string (enum conv_id how,  const char *text, int length)
 
   outbytes = outbufferlength;
   inbytes = length;
-  
+
   do {
-    result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes, 
+    const char *ip = text;
+    result = iconv (convertor[how], (ICONV_CONST char **) &text, &inbytes,
 		   &op, &outbytes);
 
-    if ( -1 == result ) 
+    if ( -1 == result )
       {
 	int the_error = errno;
 
@@ -107,7 +108,7 @@ recode_string (enum conv_id how,  const char *text, int length)
 	  {
 	  case EILSEQ:
 	  case EINVAL:
-	    if ( outbytes > 0 ) 
+	    if ( outbytes > 0 )
 	      {
 		*op++ = fallbackchar;
 		outbytes--;
@@ -123,19 +124,21 @@ recode_string (enum conv_id how,  const char *text, int length)
 	    op = outbuf;
 	    outbytes = outbufferlength;
 	    inbytes = length;
+	    text = ip;
 	    break;
 	  default:
 	    /* should never happen */
+	    NOT_REACHED ();
 	    break;
 	  }
       }
   } while ( -1 == result );
 
-  if (outbytes == 0 ) 
+  if (outbytes == 0 )
     {
       char *const oldaddr = outbuf;
       outbuf = xrealloc (outbuf, outbufferlength + 1);
-      
+
       op += (outbuf - oldaddr) ;
     }
 
@@ -154,7 +157,7 @@ get_pspp_locale (void)
 }
 
 /* Set the PSPP locale */
-void 
+void
 set_pspp_locale (const char *l)
 {
   char *current_locale;
@@ -166,7 +169,7 @@ set_pspp_locale (const char *l)
   current_locale = setlocale (LC_CTYPE, 0);
   current_charset = locale_charset ();
   setlocale (LC_CTYPE, locale);
-  
+
   charset = locale_charset ();
   setlocale (LC_CTYPE, current_locale);
 
@@ -175,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
@@ -186,21 +192,22 @@ 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");
 }
 
 
-void 
+void
 i18n_done (void)
 {
   int i;
   free (locale);
   locale = 0;
 
-  for(i = 0 ; i < n_CONV; ++i ) 
+  for(i = 0 ; i < n_CONV; ++i )
     {
-      if ( (iconv_t) -1 == convertor[i] ) 
+      if ( (iconv_t) -1 == convertor[i] )
 	continue;
       iconv_close (convertor[i]);
     }