Changeset e27661d for irc.c

Timestamp:

2006-03-31T17:55:47Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7d31002

Parents:

d783e48

Message:

Finished the iconv() fix. Instead of doing it every time something goes from
or to the IM-modules, it's now just done with everything that goes between
BitlBee and the user. Incomparably more efficient/reliable. Plus some more
cleanups. It compiles, can't test it for real yet. ;-)

File:

• irc.c (modified) (6 diffs)

irc.c

@@ -346 +346 @@
 void irc_process( irc_t *irc )
 {
-        char **lines, *temp, **cmd;
+        char **lines, *temp, **cmd, *cs;
         int i;
 
@@ -355 +355 @@
                 for( i = 0; *lines[i] != '\0'; i ++ )
                 {
+                        /* [WvG] Because irc_tokenize splits at every newline, the lines[] list
+                            should end with an empty string. This is why this actually works.
+                            Took me a while to figure out, Maurits. :-P */
                         if( lines[i+1] == NULL )
                         {
@@ -362 +365 @@
                                 i ++;
                                 break;
-                        }                       
+                        }
+                        
+                        if( ( cs = set_getstr( irc, "charset" ) ) )
+                        {
+                                char conv[IRC_MAX_LINE+1];
+                                
+                                conv[IRC_MAX_LINE] = 0;
+                                if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) != -1 )
+                                        strcpy( lines[i], conv );
+                        }
                         
                         if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
@@ -388 +400 @@
 }
 
+/* Splits a long string into separate lines. The array is NULL-terminated and, unless the string
+   contains an incomplete line at the end, ends with an empty string. */
 char **irc_tokenize( char *buffer )
 {
@@ -428 +442 @@
 }
 
+/* Split an IRC-style line into little parts/arguments. */
 char **irc_parse_line( char *line )
 {
@@ -487 +502 @@
 }
 
+/* Converts such an array back into a command string. Mainly used for the IPC code right now. */
 char *irc_build_line( char **cmd )
 {