Changeset f9756bd

Timestamp:

2008-03-30T21:26:16Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ddba0ae

Parents:

5ecf96b

Message:

Changed charset handling: irc_t keeps two iconv structures, which are just
used for every line sent and received, so now there's no need to use
g_iconv_open() every time a message comes in/out. Also, fixed a small
memory leak that was there for a long time but somehow never caught my
attention.

Files:

• irc.c (modified) (13 diffs)
• irc.h (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• set.c (modified) (1 diff)
• set.h (modified) (1 diff)

irc.c

@@ -42 +42 @@
 }
 
+static char *set_eval_charset( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
+        GIConv ic, oc;
+
+        if( g_strcasecmp( value, "none" ) == 0 )
+                value = g_strdup( "utf-8" );
+
+        if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 )
+        {
+                return NULL;
+        }
+        if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 )
+        {
+                g_iconv_close( ic );
+                return NULL;
+        }
+        
+        if( irc->iconv != (GIConv) -1 )
+                g_iconv_close( irc->iconv );
+        if( irc->oconv != (GIConv) -1 )
+                g_iconv_close( irc->oconv );
+        
+        irc->iconv = ic;
+        irc->oconv = oc;
+
+        return value;
+}
+
 irc_t *irc_new( int fd )
 {
@@ -64 +93 @@
         irc->mynick = g_strdup( ROOT_NICK );
         irc->channel = g_strdup( ROOT_CHAN );
+        
+        irc->iconv = (GIConv) -1;
+        irc->oconv = (GIConv) -1;
         
         if( global.conf->hostname )
@@ -127 +159 @@
         conf_loaddefaults( irc );
         
+        /* Evaluator sets the iconv/oconv structures. */
+        set_eval_charset( set_find( &irc->set, "charset" ), set_getstr( &irc->set, "charset" ) );
+        
         return( irc );
 }
@@ -265 +300 @@
         g_hash_table_destroy(irc->watches);
         
+        if( irc->iconv != (GIConv) -1 )
+                g_iconv_close( irc->iconv );
+        if( irc->oconv != (GIConv) -1 )
+                g_iconv_close( irc->oconv );
+        
+        g_free( irc->last_target );
+        
         g_free(irc);
         
@@ -286 +328 @@
 void irc_process( irc_t *irc )
 {
-        char **lines, *temp, **cmd, *cs;
+        char **lines, *temp, **cmd;
         int i;
 
@@ -295 +337 @@
                 for( i = 0; *lines[i] != '\0'; i ++ )
                 {
-                        char conv[IRC_MAX_LINE+1];
+                        char *conv = NULL;
                         
                         /* [WvG] If the last line isn't empty, it's an incomplete line and we
@@ -308 +350 @@
                         }
                         
-                        if( ( cs = set_getstr( &irc->set, "charset" ) ) && g_strcasecmp( cs, "none" ) != 0 )
-                        {
-                                conv[IRC_MAX_LINE] = 0;
-                                if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) == -1 )
+                        if( irc->iconv != (GIConv) -1 )
+                        {
+                                gsize bytes_read, bytes_written;
+                                
+                                conv = g_convert_with_iconv( lines[i], -1, irc->iconv,
+                                                             &bytes_read, &bytes_written, NULL );
+                                
+                                if( conv == NULL || bytes_read != strlen( lines[i] ) )
                                 {
                                         /* GLib can do strange things if things are not in the expected charset,
@@ -323 +369 @@
                                                                   "expect by changing the charset setting. See "
                                                                   "`help set charset' for more information. Your "
-                                                                  "message was ignored.", cs );
-                                                *conv = 0;
+                                                                  "message was ignored.",
+                                                                  set_getstr( &irc->set, "charset" ) );
+                                                
+                                                g_free( conv );
+                                                conv = NULL;
                                         }
                                         else
@@ -331 +380 @@
                                                            "Warning: invalid characters received at login time." );
                                                 
-                                                strncpy( conv, lines[i], IRC_MAX_LINE );
+                                                conv = g_strdup( lines[i] );
                                                 for( temp = conv; *temp; temp ++ )
                                                         if( *temp & 0x80 )
@@ -340 +389 @@
                         }
                         
-                        if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
-                                continue;
-                        irc_exec( irc, cmd );
+                        if( lines[i] )
+                        {
+                                if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
+                                        continue;
+                                irc_exec( irc, cmd );
+                                g_free( cmd );
+                        }
                         
-                        g_free( cmd );
+                        g_free( conv );
                         
                         /* Shouldn't really happen, but just in case... */
@@ -536 +589 @@
 
         return;
-
 }
 
@@ -542 +594 @@
 {
         int size;
-        char line[IRC_MAX_LINE+1], *cs;
+        char line[IRC_MAX_LINE+1];
                 
         /* Don't try to write anything new anymore when shutting down. */
@@ -548 +600 @@
                 return;
         
-        line[IRC_MAX_LINE] = 0;
+        memset( line, 0, sizeof( line ) );
         g_vsnprintf( line, IRC_MAX_LINE - 2, format, params );
-        
         strip_newlines( line );
-        if( ( cs = set_getstr( &irc->set, "charset" ) ) &&
-            g_strcasecmp( cs, "none" ) != 0 && g_strcasecmp( cs, "utf-8" ) != 0 )
-        {
-                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->oconv != (GIConv) -1 )
+        {
+                gsize bytes_read, bytes_written;
+                char *conv;
+                
+                conv = g_convert_with_iconv( line, -1, irc->oconv,
+                                             &bytes_read, &bytes_written, NULL );
+
+                if( bytes_read == strlen( line ) )
+                        strncpy( line, conv, IRC_MAX_LINE - 2 );
+                
+                g_free( conv );
+        }
+        g_strlcat( line, "\r\n", IRC_MAX_LINE + 1 );
         
         if( irc->sendbuffer != NULL )

irc.h

@@ -61 +61 @@
         char *sendbuffer;
         char *readbuffer;
+        GIConv iconv, oconv;
 
         int sentbytes;

irc_commands.c

@@ -278 +278 @@
                         if( cmd[1] != irc->last_target )
                         {
-                                if( irc->last_target )
-                                        g_free( irc->last_target );
+                                g_free( irc->last_target );
                                 irc->last_target = g_strdup( cmd[1] );
                         }

set.c

@@ -230 +230 @@
         return value;
 }
-
-char *set_eval_charset( set_t *set, char *value )
-{
-        GIConv cd;
-
-        if( g_strcasecmp( value, "none" ) == 0 )
-                return value;
-
-        cd = g_iconv_open( "UTF-8", value );
-        if( cd == (GIConv) -1 )
-                return NULL;
-
-        g_iconv_close( cd );
-        return value;
-}

set.h

@@ -97 +97 @@
 char *set_eval_to_char( set_t *set, char *value );
 char *set_eval_ops( set_t *set, char *value );
-char *set_eval_charset( set_t *set, char *value );
 
 #endif /* __SET_H__ */