X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=c0deb119c0f3faa9c277ba0f3f931e856bd534e7;hb=7f7e4dc8457c408269e94307d9545fd504891afc;hp=1cc518ff3cb363f4930c800a55b737bf317e49b3;hpb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;p=pspp
diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 1cc518ff3c..c0deb119c0 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009, 2010 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
@@ -15,31 +15,29 @@
along with this program. If not, see . */
#include
-#include
+
+#include "libpspp/i18n.h"
+
#include
+#include
+#include
+#include
+#include
#include
-#include
#include
+#include
#include
-#include
-#include
-#include
-#include
-#include "assertion.h"
-#include "hmapx.h"
-#include "hash-functions.h"
-#include "pool.h"
-
-#include "i18n.h"
-
-#include "version.h"
-#include
-#include "xstrndup.h"
+#include "libpspp/assertion.h"
+#include "libpspp/hmapx.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/pool.h"
+#include "libpspp/version.h"
-#if HAVE_NL_LANGINFO
-#include
-#endif
+#include "gl/localcharset.h"
+#include "gl/xalloc.h"
+#include "gl/relocatable.h"
+#include "gl/xstrndup.h"
struct converter
{
@@ -87,8 +85,9 @@ create_iconv (const char* tocode, const char* fromcode)
}
-/* Similar to recode_string_pool, but allocates the returned value on the heap instead of
- in a pool. It is the caller's responsibility to free the returned value. */
+/* Similar to recode_string_pool, but allocates the returned value on the heap
+ instead of in a pool. It is the caller's responsibility to free the
+ returned value. */
char *
recode_string (const char *to, const char *from,
const char *text, int length)
@@ -97,35 +96,78 @@ recode_string (const char *to, const char *from,
}
-/*
-Converts the string TEXT, which should be encoded in FROM-encoding, to a
-dynamically allocated string in TO-encoding. Any characters which cannot
-be converted will be represented by '?'.
+/* Uses CONV to convert the INBYTES starting at IP into the OUTBYTES starting
+ at OP, and appends a null terminator to the output.
-LENGTH should be the length of the string or -1, if null terminated.
+ Returns true if successful, false if the output buffer is too small. */
+static bool
+try_recode (iconv_t conv,
+ const char *ip, size_t inbytes,
+ char *op, size_t outbytes)
+{
+ /* FIXME: Need to ensure that this char is valid in the target encoding */
+ const char fallbackchar = '?';
-The returned string will be allocated on POOL.
+ /* Put the converter into the initial shift state, in case there was any
+ state information left over from its last usage. */
+ iconv (conv, NULL, 0, NULL, 0);
-This function's behaviour differs from that of g_convert_with_fallback provided
-by GLib. The GLib function will fail (returns NULL) if any part of the input
-string is not valid in the declared input encoding. This function however perseveres
-even in the presence of badly encoded input.
-*/
+ while (iconv (conv, (ICONV_CONST char **) &ip, &inbytes,
+ &op, &outbytes) == -1)
+ switch (errno)
+ {
+ case EINVAL:
+ if (outbytes < 2)
+ return false;
+ *op++ = fallbackchar;
+ *op++ = '\0';
+ return true;
+
+ case EILSEQ:
+ if (outbytes == 0)
+ return false;
+ *op++ = fallbackchar;
+ outbytes--;
+ ip++;
+ inbytes--;
+ break;
+
+ case E2BIG:
+ return false;
+
+ default:
+ /* should never happen */
+ fprintf (stderr, "Character conversion error: %s\n", strerror (errno));
+ NOT_REACHED ();
+ break;
+ }
+
+ if (outbytes == 0)
+ return false;
+
+ *op = '\0';
+ return true;
+}
+
+/* Converts the string TEXT, which should be encoded in FROM-encoding, to a
+ dynamically allocated string in TO-encoding. Any characters which cannot be
+ converted will be represented by '?'.
+
+ LENGTH should be the length of the string or -1, if null terminated.
+
+ The returned string will be allocated on POOL.
+
+ This function's behaviour differs from that of g_convert_with_fallback
+ provided by GLib. The GLib function will fail (returns NULL) if any part of
+ the input string is not valid in the declared input encoding. This function
+ however perseveres even in the presence of badly encoded input. */
char *
recode_string_pool (const char *to, const char *from,
- const char *text, int length, struct pool *pool)
+ const char *text, int length, struct pool *pool)
{
- char *outbuf = 0;
size_t outbufferlength;
- size_t result;
- 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 ( text == NULL )
return NULL;
@@ -138,76 +180,23 @@ recode_string_pool (const char *to, const char *from,
if (from == NULL)
from = default_encoding;
- for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 )
- if ( outbufferlength > length)
- break;
-
- outbuf = pool_malloc (pool, outbufferlength);
- op = outbuf;
-
- outbytes = outbufferlength;
- inbytes = length;
-
-
conv = create_iconv (to, from);
if ( (iconv_t) -1 == conv )
- return xstrdup (text);
-
- do {
- const char *ip = text;
- result = iconv (conv, (ICONV_CONST char **) &text, &inbytes,
- &op, &outbytes);
+ return xstrdup (text);
- if ( -1 == result )
+ for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 )
+ if ( outbufferlength > length)
{
- int the_error = errno;
-
- switch (the_error)
- {
- case EILSEQ:
- case EINVAL:
- if ( outbytes > 0 )
- {
- *op++ = fallbackchar;
- outbytes--;
- text++;
- inbytes--;
- break;
- }
- /* Fall through */
- case E2BIG:
- pool_free (pool, outbuf);
- outbufferlength <<= 1;
- outbuf = pool_malloc (pool, outbufferlength);
- op = outbuf;
- outbytes = outbufferlength;
- inbytes = length;
- text = ip;
- break;
- default:
- /* should never happen */
- fprintf (stderr, "Character conversion error: %s\n", strerror (the_error));
- NOT_REACHED ();
- break;
- }
+ char *output = pool_malloc (pool, outbufferlength);
+ if (try_recode (conv, text, length, output, outbufferlength))
+ return output;
+ pool_free (pool, output);
}
- } while ( -1 == result );
-
- if (outbytes == 0 )
- {
- char *const oldaddr = outbuf;
- outbuf = pool_realloc (pool, outbuf, outbufferlength + 1);
-
- op += (outbuf - oldaddr) ;
- }
- *op = '\0';
-
- return outbuf;
+ NOT_REACHED ();
}
-
void
i18n_init (void)
{
@@ -311,7 +300,7 @@ i18n_done (void)
bool
valid_encoding (const char *enc)
{
- iconv_t conv = iconv_open ("UTF8", enc);
+ iconv_t conv = iconv_open (UTF8, enc);
if ( conv == (iconv_t) -1)
return false;