Changeset b75671d for nick.c

Timestamp:

2015-06-17T22:47:26Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b441614

Parents:

d832164 (diff), 2f99f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into parson

File:

• nick.c (modified) (2 diffs)

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;
                 }
 
@@ -368 +376 @@
 
         if (tab['A'] == 0) {
+                /* initialize table so nonchars are mapped to themselves */
+                for (i = 0; i < sizeof(tab); i++) {
+                        tab[i] = i;
+                }
+                /* replace uppercase chars with lowercase chars */
                 for (i = 0; nick_lc_chars[i]; i++) {
                         tab[(int) nick_uc_chars[i]] = nick_lc_chars[i];
-                        tab[(int) nick_lc_chars[i]] = nick_lc_chars[i];
                 }
         }