/* 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
#include "assertion.h"
#include "hmapx.h"
#include "hash-functions.h"
+#include "pool.h"
#include "i18n.h"
#endif
struct converter
- {
- const char *tocode;
- const char *fromcode;
+ {
+ char *tocode;
+ char *fromcode;
iconv_t conv;
};
hmapx_insert (&map, converter, hash);
/* I don't think it's safe to translate this string or to use messaging
- as the convertors have not yet been set up */
+ as the converters have not yet been set up */
if ( (iconv_t) -1 == converter->conv && 0 != strcmp (tocode, fromcode))
{
const int err = errno;
fprintf (stderr,
"Warning: "
- "cannot create a convertor for \"%s\" to \"%s\": %s\n",
+ "cannot create a converter for `%s' to `%s': %s\n",
fromcode, tocode, strerror (err));
}
return converter->conv;
}
-/* Return a string based on TEXT converted according to HOW.
- If length is not -1, then it must be the number of bytes in TEXT.
- The returned string must be freed when no longer required.
-*/
+
+/* 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)
+{
+ return recode_string_pool (to, from, text, length, NULL);
+}
+
+
+/* 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)
{
char *outbuf = 0;
size_t outbufferlength;
if ( length == -1 )
length = strlen(text);
-
if (to == NULL)
to = default_encoding;
if (from == NULL)
from = default_encoding;
+ conv = create_iconv (to, from);
+
+ if ( (iconv_t) -1 == conv )
+ return xstrdup (text);
+
for ( outbufferlength = 1 ; outbufferlength != 0; outbufferlength <<= 1 )
if ( outbufferlength > length)
break;
- outbuf = xmalloc(outbufferlength);
+ 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,
}
/* Fall through */
case E2BIG:
- free (outbuf);
+ pool_free (pool, outbuf);
outbufferlength <<= 1;
- outbuf = xmalloc (outbufferlength);
+ outbuf = pool_malloc (pool, outbufferlength);
op = outbuf;
outbytes = outbufferlength;
inbytes = length;
break;
default:
/* should never happen */
- fprintf (stderr, "Character conversion error: %s\n", strerror (the_error));
+ fprintf (stderr, "Character conversion error: %s\n",
+ strerror (the_error));
NOT_REACHED ();
break;
}
if (outbytes == 0 )
{
char *const oldaddr = outbuf;
- outbuf = xrealloc (outbuf, outbufferlength + 1);
+ outbuf = pool_realloc (pool, outbuf, outbufferlength + 1);
op += (outbuf - oldaddr) ;
}
{
struct hmapx_node *node;
struct converter *cvtr;
+
HMAPX_FOR_EACH (cvtr, node, &map)
{
+ free (cvtr->tocode);
+ free (cvtr->fromcode);
iconv_close (cvtr->conv);
free (cvtr);
}