Changeset c5bc47b for irc.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • irc.c

    r0c41177 rc5bc47b  
    407407                        }
    408408                       
    409                         if( lines[i] )
    410                         {
    411                                 if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
    412                                         continue;
     409                        if( lines[i] && ( cmd = irc_parse_line( lines[i] ) ) )
     410                        {
    413411                                irc_exec( irc, cmd );
    414412                                g_free( cmd );
     
    485483        if( line[0] == ':' )
    486484        {
    487                 for( i = 0; line[i] != ' '; i ++ );
     485                for( i = 0; line[i] && line[i] != ' '; i ++ );
    488486                line = line + i;
    489487        }
     
    781779        irc_reply( irc,   3, ":%s", IRCD_INFO );
    782780        irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES );
    783         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 );
     781        irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=%s CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee "
     782                             "CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server",
     783                             CTYPES, CMODES, MAX_NICK_LENGTH - 1 );
    784784        irc_motd( irc );
    785785        irc->umode[0] = '\0';
     
    10221022        user_t *u = NULL;
    10231023       
    1024         if( *nick == '#' || *nick == '&' )
     1024        if( strchr( CTYPES, *nick ) )
    10251025        {
    10261026                if( !( c = irc_chat_by_channel( irc, nick ) ) )
Note: See TracChangeset for help on using the changeset viewer.