#include <libintl.h>
#include <iconv.h>
#include <errno.h>
+#include <relocatable.h>
#include "assertion.h"
#include "hmapx.h"
#include "hash-functions.h"
+#include "pool.h"
#include "i18n.h"
size_t hash;
struct hmapx_node *node;
struct converter *converter;
+ assert (fromcode);
hash = hash_string (tocode, hash_string (fromcode, 0));
HMAPX_FOR_EACH_WITH_HASH (converter, node, hash, &map)
converter->fromcode = xstrdup (fromcode);
converter->conv = iconv_open (tocode, fromcode);
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.
+char *
+recode_string (const char *to, const char *from,
+ const char *text, int length)
+{
+ return recode_string_pool (to, from, text, length, NULL);
+}
+
+
+/* Return a string based on TEXT which must be encoded using FROM.
+ The returned string will be encoded in TO.
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.
*/
char *
-recode_string (const char *to, const char *from,
- const char *text, int length)
+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 ( outbufferlength > length)
break;
- outbuf = xmalloc(outbufferlength);
+ outbuf = pool_malloc (pool, outbufferlength);
op = outbuf;
outbytes = outbufferlength;
case E2BIG:
free (outbuf);
outbufferlength <<= 1;
- outbuf = xmalloc (outbufferlength);
+ outbuf = pool_malloc (pool, outbufferlength);
op = outbuf;
outbytes = outbufferlength;
inbytes = length;
if (outbytes == 0 )
{
char *const oldaddr = outbuf;
- outbuf = xrealloc (outbuf, outbufferlength + 1);
+ outbuf = pool_realloc (pool, outbuf, outbufferlength + 1);
op += (outbuf - oldaddr) ;
}
{
#if ENABLE_NLS
setlocale (LC_CTYPE, "");
-#if HAVE_LC_MESSAGES
+#ifdef LC_MESSAGES
setlocale (LC_MESSAGES, "");
#endif
#if HAVE_LC_PAPER
setlocale (LC_PAPER, "");
#endif
- bindtextdomain (PACKAGE, locale_dir);
+ bindtextdomain (PACKAGE, relocate(locale_dir));
textdomain (PACKAGE);
#endif /* ENABLE_NLS */