Changeset fc0cf92

Timestamp:

2008-01-13T00:15:12Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

07ff8a2

Parents:

59f527b6

Message:

Different handling of charset mismatches before login time. Ignoring a
USER command because of encoding issues isn't too great, so let's simply
replace them. The information isn't really used anywhere anyway.

File:

• irc.c (modified) (2 diffs)

irc.c

@@ -325 +325 @@
                                 if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) == -1 )
                                 {
+                                        /* GLib can do strange things if things are not in the expected charset,
+                                           so let's be a little bit paranoid here: */
                                         if( irc->status & USTATUS_LOGGED_IN )
+                                        {
                                                 irc_usermsg( irc, "Error: Charset mismatch detected. The charset "
                                                                   "setting is currently set to %s, so please make "
@@ -333 +336 @@
                                                                   "`help set charset' for more information. Your "
                                                                   "message was ignored.", cs );
-                                        *conv = 0;
+                                                *conv = 0;
+                                        }
+                                        else
+                                        {
+                                                irc_write( irc, ":%s NOTICE AUTH :%s", irc->myhost,
+                                                           "Warning: invalid (non-UTF8) characters received at login time." );
+                                                
+                                                strncpy( conv, lines[i], IRC_MAX_LINE );
+                                                for( temp = conv; *temp; temp ++ )
+                                                        if( *temp & 0x80 )
+                                                                *temp = '?';
+                                        }
                                 }
                                 lines[i] = conv;