Changeset c5bc47b for irc.c

Timestamp:

2009-10-17T17:24:52Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c48a033

Parents:

0c41177 (diff), 2e44b1f (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:

Merging BitlBee 1.2.4.

File:

• irc.c (modified) (4 diffs)

irc.c

@@ -407 +407 @@
                         }
                         
-                        if( lines[i] )
-                        {
-                                if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
-                                        continue;
+                        if( lines[i] && ( cmd = irc_parse_line( lines[i] ) ) )
+                        {
                                 irc_exec( irc, cmd );
                                 g_free( cmd );
@@ -485 +483 @@
         if( line[0] == ':' )
         {
-                for( i = 0; line[i] != ' '; i ++ );
+                for( i = 0; line[i] && line[i] != ' '; i ++ );
                 line = line + i;
         }
@@ -781 +779 @@
         irc_reply( irc,   3, ":%s", IRCD_INFO );
         irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES );
-        irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=#& CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server", CMODES, MAX_NICK_LENGTH - 1 );
+        irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=%s CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee "
+                             "CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server",
+                             CTYPES, CMODES, MAX_NICK_LENGTH - 1 );
         irc_motd( irc );
         irc->umode[0] = '\0';
@@ -1022 +1022 @@
         user_t *u = NULL;
         
-        if( *nick == '#' || *nick == '&' )
+        if( strchr( CTYPES, *nick ) )
         {
                 if( !( c = irc_chat_by_channel( irc, nick ) ) )