Changeset 9779c18 for irc.c

Timestamp:

2006-06-03T20:20:43Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

5973412

Parents:

a15c097 (diff), fb62f81f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

[merge] Wilmer

File:

• irc.c (modified) (23 diffs)

irc.c

@@ -55 +55 @@
         irc->fd = fd;
         irc->io_channel = g_io_channel_unix_new( fd );
-#ifdef GLIB2
         g_io_channel_set_encoding (irc->io_channel, NULL, NULL);
         g_io_channel_set_buffered (irc->io_channel, FALSE);
         g_io_channel_set_flags( irc->io_channel, G_IO_FLAG_NONBLOCK, NULL );
-#else
-        fcntl( irc->fd, F_SETFL, O_NONBLOCK);
-#endif
         irc->r_watch_source_id = g_io_add_watch( irc->io_channel, G_IO_IN | G_IO_ERR | G_IO_HUP, bitlbee_io_current_client_read, irc );
         
@@ -199 +195 @@
 }
 
-static gboolean irc_free_userhash( gpointer key, gpointer value, gpointer data )
+static gboolean irc_free_hashkey( gpointer key, gpointer value, gpointer data )
 {
         g_free( key );
@@ -233 +229 @@
         
         for (account = irc->accounts; account; account = account->next) {
-                if (account->gc)
-                        account_offline(account->gc);
-                else if (account->reconnect)
-                        g_source_remove(account->reconnect);
+                if (account->gc) {
+                        account->gc->wants_to_die = TRUE;
+                        signoff(account->gc);
+                } else if (account->reconnect) {
+                        cancel_auto_reconnect(account);
+                }
         }
         
@@ -285 +283 @@
         }
         
-        g_hash_table_foreach_remove(irc->userhash, irc_free_userhash, NULL);
+        g_hash_table_foreach_remove(irc->userhash, irc_free_hashkey, NULL);
         g_hash_table_destroy(irc->userhash);
         
-        g_hash_table_foreach_remove(irc->watches, irc_free_userhash, NULL);
+        g_hash_table_foreach_remove(irc->watches, irc_free_hashkey, NULL);
         g_hash_table_destroy(irc->watches);
         
@@ -346 +344 @@
 void irc_process( irc_t *irc )
 {
-        char **lines, *temp, **cmd;
+        char **lines, *temp, **cmd, *cs;
         int i;
 
@@ -355 +353 @@
                 for( i = 0; *lines[i] != '\0'; i ++ )
                 {
+                        char conv[IRC_MAX_LINE+1];
+                        
+                        /* [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" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                        {
+                                conv[IRC_MAX_LINE] = 0;
+                                if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) != -1 )
+                                        lines[i] = conv;
+                        }
                         
                         if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
@@ -388 +398 @@
 }
 
+/* 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 +440 @@
 }
 
+/* Split an IRC-style line into little parts/arguments. */
 char **irc_parse_line( char *line )
 {
@@ -487 +500 @@
 }
 
+/* Converts such an array back into a command string. Mainly used for the IPC code right now. */
 char *irc_build_line( char **cmd )
 {
@@ -539 +553 @@
         
         u = user_find( irc, irc->mynick );
-        if( u ) is_private = u->is_private;
+        is_private = u->is_private;
         
         va_start( params, format );
@@ -563 +577 @@
 {
         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" ) ) && ( 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->sendbuffer != NULL ) {
                 size = strlen( irc->sendbuffer ) + strlen( line );
@@ -803 +826 @@
                         irc_reply( irc, 332, "%s :BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!", channel, c->title );
                 else
-                        irc_reply( irc, 331, "%s :No topic for this channel" );
+                        irc_reply( irc, 331, "%s :No topic for this channel", channel );
         }
 }
@@ -859 +882 @@
         if( g_hash_table_lookup( irc->watches, nick ) )
         {
-                irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "logged online" );
+                irc_reply( irc, 600, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged online" );
         }
         g_free( nick );
@@ -876 +899 @@
 void irc_kill( irc_t *irc, user_t *u )
 {
-        char *nick;
-        
-        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, "Leaving..." );
+        char *nick, *s;
+        char reason[64];
+        
+        if( u->gc && u->gc->flags & OPT_LOGGING_OUT )
+        {
+                if( u->gc->user->proto_opt[0][0] )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    u->gc->user->proto_opt[0] );
+                else if( ( s = strchr( u->gc->username, '@' ) ) )
+                        g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost,
+                                    s + 1 );
+                else
+                        g_snprintf( reason, sizeof( reason ), "%s %s.%s", irc->myhost,
+                                    u->gc->prpl->name, irc->myhost );
+                
+                /* proto_opt might contain garbage after the : */
+                if( ( s = strchr( reason, ':' ) ) )
+                        *s = 0;
+        }
+        else
+        {
+                strcpy( reason, "Leaving..." );
+        }
+        
+        irc_write( irc, ":%s!%s@%s QUIT :%s", u->nick, u->user, u->host, reason );
         
         nick = g_strdup( u->nick );
@@ -884 +929 @@
         if( g_hash_table_lookup( irc->watches, nick ) )
         {
-                irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "logged offline" );
+                irc_reply( irc, 601, "%s %s %s %d :%s", u->nick, u->user, u->host, (int) time( NULL ), "logged offline" );
         }
         g_free( nick );
@@ -984 +1029 @@
         else if( c && c->gc && c->gc->prpl )
         {
-                return( serv_send_chat( irc, c->gc, c->id, s ) );
+                return( bim_chat_msg( c->gc, c->id, s ) );
         }
         
@@ -994 +1039 @@
         user_t *u = data;
         
+        /* Shouldn't happen, but just to be sure. */
+        if( u->sendbuf_len < 2 )
+                return FALSE;
+        
         u->sendbuf[u->sendbuf_len-2] = 0; /* Cut off the last newline */
-        serv_send_im( u->gc->irc, u, u->sendbuf, u->sendbuf_flags );
+        bim_buddy_msg( u->gc, u->handle, u->sendbuf, u->sendbuf_flags );
         
         g_free( u->sendbuf );
@@ -1003 +1052 @@
         u->sendbuf_flags = 0;
         
-        return( FALSE );
+        return FALSE;
 }
 
@@ -1016 +1065 @@
                 if( u->sendbuf_len > 0 && u->sendbuf_flags != flags)
                 {
-                        //Flush the buffer
+                        /* Flush the buffer */
                         g_source_remove( u->sendbuf_timer );
                         buddy_send_handler_delayed( u );
@@ -1024 +1073 @@
                 {
                         u->sendbuf_len = strlen( msg ) + 2;
-                        u->sendbuf = g_new (char, u->sendbuf_len );
+                        u->sendbuf = g_new( char, u->sendbuf_len );
                         u->sendbuf[0] = 0;
                         u->sendbuf_flags = flags;
@@ -1031 +1080 @@
                 {
                         u->sendbuf_len += strlen( msg ) + 1;
-                        u->sendbuf = g_renew ( char, u->sendbuf, u->sendbuf_len );
+                        u->sendbuf = g_renew( char, u->sendbuf, u->sendbuf_len );
                 }
                 
@@ -1047 +1096 @@
         else
         {
-                serv_send_im( irc, u, msg, flags );
+                bim_buddy_msg( u->gc, u->handle, msg, flags );
         }
 }