- size_t hash ;
- char *key = alloca (strlen (tocode) + strlen (fromcode) + 2);
-
- strcpy (key, tocode);
- strcat (key, "\n"); /* hopefully no encoding names contain '\n' */
- strcat (key, fromcode);
-
- hash = hsh_hash_string (key);
-
- node = hmapx_first_with_hash (&map, hash);
-
- if (!node)
+ struct converter *converter;
+
+ hash = hash_string (tocode, hash_string (fromcode, 0));
+ HMAPX_FOR_EACH_WITH_HASH (converter, node, hash, &map)
+ if (!strcmp (tocode, converter->tocode)
+ && !strcmp (fromcode, converter->fromcode))
+ return converter->conv;
+
+ converter = xmalloc (sizeof *converter);
+ converter->tocode = xstrdup (tocode);
+ 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 */
+ if ( (iconv_t) -1 == converter->conv && 0 != strcmp (tocode, fromcode))