Changeset e27661d

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. ;-)

Files:

• bitlbee.h (modified) (2 diffs)
• irc.c (modified) (6 diffs)
• protocols/nogaim.c (modified) (9 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• util.c (modified) (2 diffs)
• util.h (added)

bitlbee.h

@@ -111 +111 @@
 #include "query.h"
 #include "sock.h"
+#include "util.h"
 
 typedef struct global {
@@ -133 +134 @@
 void root_command( irc_t *irc, char *command[] );
 void bitlbee_shutdown( gpointer data );
-double gettime( void );
-G_MODULE_EXPORT void http_encode( char *s );
-G_MODULE_EXPORT void http_decode( char *s );
-G_MODULE_EXPORT char *strip_newlines(char *source);
 
 extern global_t global;

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 )
 {

protocols/nogaim.c

@@ -37 +37 @@
 #include "nogaim.h"
 #include <ctype.h>
-#include <iconv.h>
 
 static char *proto_away_alias[8][5] =
@@ -306 +305 @@
 {
         va_list params;
-        char text[1024], buf[1024], *acc_id;
-        char *msg;
+        char *text;
         account_t *a;
         
         va_start( params, format );
-        g_vsnprintf( text, sizeof( text ), format, params );
+        text = g_strdup_vprintf( format, params );
         va_end( params );
 
-        if( g_strncasecmp( set_getstr( gc->irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( "UTF8", set_getstr( gc->irc, "charset" ), text, buf, 0, 1024 ) != -1 )
-                msg = buf;
-        else
-                msg = text;
-        
         if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
             ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
-                strip_html( msg );
+                strip_html( text );
         
         /* Try to find a different connection on the same protocol. */
@@ -329 +321 @@
                         break;
         
-        /* If we found one, add the screenname to the acc_id. */
+        /* If we found one, include the screenname in the message. */
         if( a )
-                acc_id = g_strdup_printf( "%s(%s)", gc->prpl->name, gc->username );
+                irc_usermsg( gc->irc, "%s(%s) - %s", gc->prpl->name, gc->username, text );
         else
-                acc_id = g_strdup( gc->prpl->name );
-        
-        irc_usermsg( gc->irc, "%s - %s", acc_id, msg );
-        
-        g_free( acc_id );
+                irc_usermsg( gc->irc, "%s - %s", gc->prpl->name, text );
+        
+        g_free( text );
 }
 
@@ -559 +549 @@
 {
         user_t *u = user_findhandle( gc, handle );
-        char *name, buf[1024];
         
         if( !u ) return;
         
-        /* Convert all UTF-8 */
-        if( g_strncasecmp( set_getstr( gc->irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( "UTF-8", set_getstr( gc->irc, "charset" ), realname, buf, 0, sizeof( buf ) ) != -1 )
-                name = buf;
-        else
-                name = realname;
-        
-        if( g_strcasecmp( u->realname, name ) != 0 )
+        if( g_strcasecmp( u->realname, realname ) != 0 )
         {
                 if( u->realname != u->nick ) g_free( u->realname );
                 
-                u->realname = g_strdup( name );
+                u->realname = g_strdup( realname );
                 
                 if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( gc->irc, "display_namechanges" ) )
@@ -680 +662 @@
         irc_t *irc = gc->irc;
         user_t *u;
-        char buf[8192];
         
         u = user_findhandle( gc, handle );
@@ -722 +703 @@
                 strip_html( msg );
 
-        if( g_strncasecmp( set_getstr( irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( "UTF-8", set_getstr( irc, "charset" ), msg, buf, 0, 8192 ) != -1 )
-                msg = buf;
-        
         while( strlen( msg ) > 425 )
         {
@@ -822 +799 @@
         struct conversation *c;
         user_t *u;
-        char buf[8192];
         
         /* Gaim sends own messages through this too. IRC doesn't want this, so kill them */
@@ -834 +810 @@
             ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
                 strip_html( msg );
-        
-        if( g_strncasecmp( set_getstr( gc->irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( "UTF-8", set_getstr( gc->irc, "charset" ), msg, buf, 0, 8192 ) != -1 )
-                msg = buf;
         
         if( c && u )
@@ -1053 +1025 @@
 int serv_send_im( irc_t *irc, user_t *u, char *msg, int flags )
 {
-        char buf[8192];
-        
-        if( g_strncasecmp( set_getstr( irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( set_getstr( irc, "charset" ), "UTF-8", msg, buf, 0, 8192 ) != -1 )
+        char *buf = NULL;
+        int st;
+        
+        if( ( u->gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        {
+                buf = escape_html( msg );
                 msg = buf;
-
-        if( ( u->gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
-        {
-                char *html;
-                
-                html = escape_html( msg );
-                strncpy( buf, html, 8192 );
-                g_free( html );
-                
+        }
+        
+        st = ((struct gaim_connection *)u->gc)->prpl->send_im( u->gc, u->handle, msg, strlen( msg ), flags );
+        g_free( buf );
+        
+        return st;
+}
+
+int serv_send_chat( irc_t *irc, struct gaim_connection *gc, int id, char *msg )
+{
+        char *buf = NULL;
+        int st;
+        
+        if( ( gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) )
+        {
+                buf = escape_html( msg );
                 msg = buf;
         }
         
-        return( ((struct gaim_connection *)u->gc)->prpl->send_im( u->gc, u->handle, msg, strlen( msg ), flags ) );
-}
-
-int serv_send_chat( irc_t *irc, struct gaim_connection *gc, int id, char *msg )
-{
-        char buf[8192];
-        
-        if( g_strncasecmp( set_getstr( irc, "charset" ), "none", 4 ) != 0 &&
-            do_iconv( set_getstr( irc, "charset" ), "UTF-8", msg, buf, 0, 8192 ) != -1 )
-                msg = buf;
-
-        if( gc->flags & OPT_CONN_HTML) {
-                char * html = escape_html(msg);
-                strncpy(buf, html, 8192);
-                g_free(html);
-        }
-        
-        return( gc->prpl->chat_send( gc, id, msg ) );
-}
-
-/* Convert from one charset to another.
-   
-   from_cs, to_cs: Source and destination charsets
-   src, dst: Source and destination strings
-   size: Size if src. 0 == use strlen(). strlen() is not reliable for UNICODE/UTF16 strings though.
-   maxbuf: Maximum number of bytes to write to dst
-   
-   Returns the number of bytes written to maxbuf or -1 on an error.
-*/
-signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf )
-{
-        iconv_t cd;
-        size_t res;
-        size_t inbytesleft, outbytesleft;
-        char *inbuf = src;
-        char *outbuf = dst;
-        
-        cd = iconv_open( to_cs, from_cs );
-        if( cd == (iconv_t) -1 )
-                return( -1 );
-        
-        inbytesleft = size ? size : strlen( src );
-        outbytesleft = maxbuf - 1;
-        res = iconv( cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft );
-        *outbuf = '\0';
-        iconv_close( cd );
-        
-        if( res == (size_t) -1 )
-                return( -1 );
-        else
-                return( outbuf - dst );
-}
-
-char *set_eval_charset( irc_t *irc, set_t *set, char *value )
-{
-        iconv_t cd;
-
-        if ( g_strncasecmp( value, "none", 4 ) == 0 )
-                return( value );
-
-        cd = iconv_open( "UTF-8", value );
-        if( cd == (iconv_t) -1 )
-                return( NULL );
-
-        iconv_close( cd );
-        return( value );
-}
+        st = gc->prpl->chat_send( gc, id, msg );
+        g_free( buf );
+        
+        return st;
+}

protocols/nogaim.h

@@ -207 +207 @@
 int serv_send_chat(irc_t *irc, struct gaim_connection *gc, int id, char *msg );
 
-G_MODULE_EXPORT signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf );
-char *set_eval_charset( irc_t *irc, set_t *set, char *value );
-
 void nogaim_init();
 int proto_away( struct gaim_connection *gc, char *away );
@@ -258 +255 @@
 G_MODULE_EXPORT void serv_got_chat_left( struct gaim_connection *gc, int id );
 
-/* util.c */
-G_MODULE_EXPORT void strip_linefeed( gchar *text );
-G_MODULE_EXPORT char *add_cr( char *text );
-G_MODULE_EXPORT char *tobase64( const char *text );
-G_MODULE_EXPORT char *normalize( const char *s );
-G_MODULE_EXPORT time_t get_time( int year, int month, int day, int hour, int min, int sec );
-G_MODULE_EXPORT void strip_html( char *msg );
-G_MODULE_EXPORT char *escape_html( const char *html );
-G_MODULE_EXPORT void info_string_append(GString *str, char *newline, char *name, char *value);
-G_MODULE_EXPORT char *ipv6_wrap( char *src );
-G_MODULE_EXPORT char *ipv6_unwrap( char *src );
-
 /* prefs.c */
 G_MODULE_EXPORT void build_block_list();

util.c

@@ -39 +39 @@
 #include <glib.h>
 #include <time.h>
+#include <iconv.h>
 
 void strip_linefeed(gchar *text)
@@ -445 +446 @@
 }
 #endif
+
+/* Convert from one charset to another.
+   
+   from_cs, to_cs: Source and destination charsets
+   src, dst: Source and destination strings
+   size: Size if src. 0 == use strlen(). strlen() is not reliable for UNICODE/UTF16 strings though.
+   maxbuf: Maximum number of bytes to write to dst
+   
+   Returns the number of bytes written to maxbuf or -1 on an error.
+*/
+signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf )
+{
+        iconv_t cd;
+        size_t res;
+        size_t inbytesleft, outbytesleft;
+        char *inbuf = src;
+        char *outbuf = dst;
+        
+        cd = iconv_open( to_cs, from_cs );
+        if( cd == (iconv_t) -1 )
+                return( -1 );
+        
+        inbytesleft = size ? size : strlen( src );
+        outbytesleft = maxbuf - 1;
+        res = iconv( cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft );
+        *outbuf = '\0';
+        iconv_close( cd );
+        
+        if( res == (size_t) -1 )
+                return( -1 );
+        else
+                return( outbuf - dst );
+}
+
+char *set_eval_charset( irc_t *irc, set_t *set, char *value )
+{
+        iconv_t cd;
+
+        if ( g_strncasecmp( value, "none", 4 ) == 0 )
+                return( value );
+
+        cd = iconv_open( "UTF-8", value );
+        if( cd == (iconv_t) -1 )
+                return( NULL );
+
+        iconv_close( cd );
+        return( value );
+}