Changeset d783e48

Timestamp:

2006-03-31T08:53:53Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e27661d

Parents:

755ae5b

Message:

irc_vawrite() does charset conversion now. Next step: Do it for incoming IRC
traffic, and get rid of most other iconv() calls.

File:

• irc.c (modified) (1 diff)

irc.c

@@ -563 +563 @@
 {
         int size;
-        char line[IRC_MAX_LINE];
-        
+        char line[IRC_MAX_LINE+1], *cs;
+                
         if( irc->quit )
                 return;
-
-        g_vsnprintf( line, IRC_MAX_LINE - 3, format, params );
-
+        
+        line[IRC_MAX_LINE] = 0;
+        g_vsnprintf( line, IRC_MAX_LINE - 2, format, params );
+        
         strip_newlines( line );
+        if( ( cs = set_getstr( irc, "charset" ) ) )
+        {
+                char conv[IRC_MAX_LINE+1];
+                
+                conv[IRC_MAX_LINE] = 0;
+                if( do_iconv( "UTF-8", cs, line, conv, 0, IRC_MAX_LINE - 2 ) != -1 )
+                        strcpy( line, conv );
+        }
         strcat( line, "\r\n" );
-
+        
         if( irc->sendbuffer != NULL ) {
                 size = strlen( irc->sendbuffer ) + strlen( line );