X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-channel.c;h=94a8a4d723db07661fdcff9bb794dffe9654f6f7;hp=233e1731fa0e8b8124f0581e2dcb84429c5dbbc6;hb=fdfc27265ef27e445de89217d08f9a57219355df;hpb=8aac36680265124067994391e7efef4e241a0ffd

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 233e1731..94a8a4d7 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -244,7 +244,7 @@ join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan,
 	IRC_WriteStrChannelPrefix(Client, chan, target, false,
 				  "JOIN :%s",  channame);
 
-	/* syncronize channel modes */
+	/* synchronize channel modes */
 	if (modes[1]) {
 		IRC_WriteStrChannelPrefix(Client, chan, target, false,
 					  "MODE %s +%s %s", channame,
@@ -301,9 +301,9 @@ join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan,
  *
  * See RFC 2812, 3.2.1 "Join message"; RFC 2813, 4.2.1 "Join message".
  *
- * @param Client	The client from which this command has been received
- * @param Req		Request structure with prefix and all parameters
- * @returns		CONNECTED or DISCONNECTED
+ * @param Client The client from which this command has been received
+ * @param Req Request structure with prefix and all parameters
+ * @returns CONNECTED or DISCONNECTED
  */
 GLOBAL bool
 IRC_JOIN( CLIENT *Client, REQUEST *Req )
@@ -312,8 +312,8 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 	CLIENT *target;
 	CHANNEL *chan;
 
-	assert( Client != NULL );
-	assert( Req != NULL );
+	assert (Client != NULL);
+	assert (Req != NULL);
 
 	/* Bad number of arguments? */
 	if (Req->argc < 1 || Req->argc > 2)
@@ -327,7 +327,8 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 		target = Client;
 
 	if (!target)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix);
+		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+					  Client_ID(Client), Req->prefix);
 
 	/* Is argument "0"? */
 	if (Req->argc == 1 && !strncmp("0", Req->argv[0], 2))
@@ -359,8 +360,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 
 		chan = Channel_Search(channame);
 		if (!chan && Conf_PredefChannelsOnly) {
-			 /* channel must be created, but server does not allow this */
-			IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame);
+			 /* channel must be created, but forbidden by config */
+			IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG,
+					   Client_ID(Client), channame);
 			break;
 		}
 
@@ -399,7 +401,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 
 		/* Join channel (and create channel if it doesn't exist) */
 		if (!Channel_Join(target, channame))
-			break;
+			goto join_next;
 
 		if (!chan) { /* channel is new; it has been created above */
 			chan = Channel_Search(channame);
@@ -418,6 +420,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 		if (!join_send_topic(Client, target, chan, channame))
 			break; /* write error */
 
+	join_next:
 		/* next channel? */
 		channame = strtok_r(NULL, ",", &lastchan);
 		if (channame && key)
@@ -589,9 +592,9 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
  * This implementation handles the local case as well as the forwarding of the
  * LIST command to other servers in the IRC network.
  *
- * @param Client	The client from which this command has been received
- * @param Req		Request structure with prefix and all parameters
- * @returns		CONNECTED or DISCONNECTED
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_LIST( CLIENT *Client, REQUEST *Req )
@@ -600,78 +603,76 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
 	CHANNEL *chan;
 	CLIENT *from, *target;
 
-	assert( Client != NULL );
-	assert( Req != NULL );
+	assert(Client != NULL);
+	assert(Req != NULL);
 
 	/* Bad number of prameters? */
-	if( Req->argc > 2 )
-		return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
-			Client_ID( Client ), Req->command );
+	if (Req->argc > 2)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
 
-	if( Req->argc > 0 )
-		pattern = strtok( Req->argv[0], "," );
+	if (Req->argc > 0)
+		pattern = strtok(Req->argv[0], ",");
 	else
 		pattern = "*";
 
 	/* Get sender from prefix, if any */
-	if( Client_Type( Client ) == CLIENT_SERVER )
-		from = Client_Search( Req->prefix );
+	if (Client_Type(Client) == CLIENT_SERVER)
+		from = Client_Search(Req->prefix);
 	else
 		from = Client;
 
-	if( ! from )
-		return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG,
-				Client_ID( Client ), Req->prefix );
+	if (!from)
+		return IRC_WriteStrClient(Client, ERR_NOSUCHSERVER_MSG,
+					  Client_ID(Client), Req->prefix);
 
-	if( Req->argc == 2 )
-	{
+	if (Req->argc == 2) {
 		/* Forward to other server? */
-		target = Client_Search( Req->argv[1] );
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER ))
-			return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG,
-					Client_ID( Client ), Req->argv[1] );
+		target = Client_Search(Req->argv[1]);
+		if (! target || Client_Type(target) != CLIENT_SERVER)
+			return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
+						  Client_ID(Client),
+						  Req->argv[1]);
 
-		if( target != Client_ThisServer( ))
-		{
+		if (target != Client_ThisServer()) {
 			/* Target is indeed an other server, forward it! */
-			return IRC_WriteStrClientPrefix( target, from,
-					"LIST %s :%s", Client_ID( from ),
-					Req->argv[1] );
+			return IRC_WriteStrClientPrefix(target, from,
+							"LIST %s :%s",
+							Client_ID(from),
+							Req->argv[1]);
 		}
 	}
 
-	while( pattern )
-	{
+	while (pattern) {
 		/* Loop through all the channels */
-		chan = Channel_First( );
-		while( chan )
-		{
+		if (Req->argc > 0)
+			ngt_LowerStr(pattern);
+		chan = Channel_First();
+		while (chan) {
 			/* Check search pattern */
-			if( Match( pattern, Channel_Name( chan )))
-			{
+			if (MatchCaseInsensitive(pattern, Channel_Name(chan))) {
 				/* Gotcha! */
-				if( ! strchr( Channel_Modes( chan ), 's' ) ||
-				    Channel_IsMemberOf( chan, from ))
-				{
-					if( ! IRC_WriteStrClient( from,
-					    RPL_LIST_MSG, Client_ID( from ),
-					    Channel_Name( chan ),
-					    Channel_MemberCount( chan ),
-					    Channel_Topic( chan )))
+				if (!strchr(Channel_Modes(chan), 's')
+				    || Channel_IsMemberOf(chan, from)) {
+					if (!IRC_WriteStrClient(from,
+					     RPL_LIST_MSG, Client_ID(from),
+					     Channel_Name(chan),
+					     Channel_MemberCount(chan),
+					     Channel_Topic( chan )))
 						return DISCONNECTED;
 				}
 			}
-			chan = Channel_Next( chan );
+			chan = Channel_Next(chan);
 		}
 
 		/* Get next name ... */
-		if( Req->argc > 0 )
-			pattern = strtok( NULL, "," );
+		if(Req->argc > 0)
+			pattern = strtok(NULL, ",");
 		else
 			pattern = NULL;
 	}
 
-	return IRC_WriteStrClient( from, RPL_LISTEND_MSG, Client_ID( from ));
+	return IRC_WriteStrClient(from, RPL_LISTEND_MSG, Client_ID(from));
 } /* IRC_LIST */