X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=1cc518ff3cb363f4930c800a55b737bf317e49b3;hb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;hp=80a0ed35dd57a388f622146482e56fddca9b7211;hpb=cb586666724d5fcbdb658ce471b85484f0a7babe;p=pspp diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c index 80a0ed35dd..1cc518ff3c 100644 --- a/src/libpspp/i18n.c +++ b/src/libpspp/i18n.c @@ -42,9 +42,9 @@ #endif struct converter - { - const char *tocode; - const char *fromcode; + { + char *tocode; + char *fromcode; iconv_t conv; }; @@ -79,13 +79,16 @@ create_iconv (const char* tocode, const char* fromcode) const int err = errno; fprintf (stderr, "Warning: " - "cannot create a converter for \"%s\" to \"%s\": %s\n", + "cannot create a converter for `%s' to `%s': %s\n", fromcode, tocode, strerror (err)); } return converter->conv; } + +/* 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) @@ -94,10 +97,19 @@ recode_string (const char *to, const char *from, } -/* 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. +/* +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, @@ -165,7 +177,7 @@ recode_string_pool (const char *to, const char *from, } /* Fall through */ case E2BIG: - free (outbuf); + pool_free (pool, outbuf); outbufferlength <<= 1; outbuf = pool_malloc (pool, outbufferlength); op = outbuf; @@ -279,8 +291,11 @@ i18n_done (void) { 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); }