Changeset 3a27896

Timestamp:

2015-06-04T17:13:22Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

56c8a4f

Parents:

1cef55f

git-author:

dequis <dx@…> (01-06-15 04:57:33)

git-committer:

dequis <dx@…> (04-06-15 17:13:22)

Message:

nick_gen: retry g_convert_with_fallback without TRANSLIT if it fails

Based on patch from trac ticket #1152. Quoting:

NetBSD's implementation of iconv does not appear to support TRANSLIT.
This means g_convert_with_fallback() called with TRANSLIT will always fail

Removed the log_message part of the patch since that's daemon level logging
and it's unlikely to fail twice anyway (even if it did, it wouldn't crash)

File:

• nick.c (modified) (1 diff)

nick.c

@@ -186 +186 @@
                    LC_CTYPE being set to something other than C/POSIX. */
                 if (!(irc && irc->status & IRC_UTF8_NICKS)) {
-                        part = asc = g_convert_with_fallback(part, -1, "ASCII//TRANSLIT",
-                                                             "UTF-8", "", NULL, NULL, NULL);
+                        asc = g_convert_with_fallback(part, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, NULL, NULL);
+
+                        if (!asc) {
+                                /* If above failed, try again without //TRANSLIT.
+                                   //TRANSLIT is a GNU iconv special and is not POSIX.
+                                   Other platforms may not support it. */
+                                asc = g_convert_with_fallback(part, -1, "ASCII", "UTF-8", "", NULL, NULL, NULL);
+                        }
+
+                        part = asc;
                 }