From cf4ae7799165c567c9fb7aa6a1e7f4b95e161aad Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Thu, 5 Oct 2006 18:30:47 +0000 Subject: [PATCH] fix Channel_Join() [from HEAD] --- src/ngircd/irc-channel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 7e21c130..efa0cf1e 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-channel.c,v 1.35 2006/03/16 20:14:16 fw Exp $"; +static char UNUSED id[] = "$Id: irc-channel.c,v 1.35.2.1 2006/10/05 18:30:47 fw Exp $"; #include "imp.h" #include @@ -123,7 +123,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame ); /* Try next name, if any */ - channame = strtok( NULL, "," ); + channame = strchr(channame, ','); continue; } @@ -145,7 +145,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) IRC_WriteStrClient( Client, ERR_BADCHANNELKEY_MSG, Client_ID( Client ), channame ); /* Try next name, if any */ - channame = strtok( NULL, "," ); + channame = strchr(channame, ','); continue; } @@ -156,7 +156,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) IRC_WriteStrClient( Client, ERR_CHANNELISFULL_MSG, Client_ID( Client ), channame ); /* Try next name, if any */ - channame = strtok( NULL, "," ); + channame = strchr(channame, ','); continue; } } @@ -176,7 +176,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) if( ! Channel_Join( target, channame )) { /* naechsten Namen ermitteln */ - channame = strtok( NULL, "," ); + channame = strchr(channame, ','); continue; } if( ! chan ) chan = Channel_Search( channame );