X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-channel.c;h=7160afda85f78db29c7ce054b83ba032b104b318;hb=e07fab17b1185ad18889da786cc4d3b55418e813;hp=8d6dce0975a2f52c4beab987e6e71524e65c211e;hpb=c2f60abe55b5a8d320a27df0ce41790fa1141081;p=ngircd-alex.git

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 8d6dce09..7160afda 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-channel.c,v 1.6 2002/05/27 13:09:26 alex Exp $
+ * $Id: irc-channel.c,v 1.10 2002/06/26 15:44:15 alex Exp $
  *
  * irc-channel.c: IRC-Channel-Befehle
  */
@@ -27,6 +27,7 @@
 #include "channel.h"
 #include "lists.h"
 #include "log.h"
+#include "match.h"
 #include "messages.h"
 #include "parse.h"
 #include "irc.h"
@@ -62,9 +63,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 	channame = strtok( Req->argv[0], "," );
 	while( channame )
 	{
-		/* wird der Channel neu angelegt? */
-		flags = NULL;
+		chan = flags = NULL;
 
+		/* wird der Channel neu angelegt? */
 		if( Channel_Search( channame )) is_new_chan = FALSE;
 		else is_new_chan = TRUE;
 
@@ -73,7 +74,11 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 		{
 			/* Channel-Flags extrahieren */
 			flags = strchr( channame, 0x7 );
-			if( flags ) *flags++ = '\0';
+			if( flags )
+			{
+				*flags = '\0';
+				flags++;
+			}
 		}
 
 		/* Lokaler Client? */
@@ -95,6 +100,11 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 				if( Lists_CheckBanned( target, chan ))
 				{
 					/* Client ist gebanned: */
+					IRC_WriteStrClient( Client, ERR_BANNEDFROMCHAN_MSG, Client_ID( Client ), channame );
+
+					/* naechsten Namen ermitteln */
+					channame = strtok( NULL, "," );
+					continue;
 				}
 
 				/* Ist der Channel "invite-only"? */
@@ -104,6 +114,11 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
 					if( ! Lists_CheckInvited( target, chan ))
 					{
 						/* Client wurde nicht invited: */
+						IRC_WriteStrClient( Client, ERR_INVITEONLYCHAN_MSG, Client_ID( Client ), channame );
+
+						/* naechsten Namen ermitteln */
+						channame = strtok( NULL, "," );
+						continue;
 					}
 				}
 			}
@@ -224,7 +239,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
 
 	/* Welcher Channel? */
 	chan = Channel_Search( Req->argv[0] );
-	if( ! chan ) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
+	if( ! chan ) return IRC_WriteStrClient( from, ERR_NOSUCHCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
 
 	/* Ist der User Mitglied in dem Channel? */
 	if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
@@ -279,9 +294,8 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
 		chan = Channel_First( );
 		while( chan )
 		{
-			/* Passt die Suchmaske auf diesen Channel? Bisher werden hier
-			 * "regular expressions" aber noch nicht unterstuetzt ... */
-			if(( strcasecmp( pattern, Channel_Name( chan )) == 0 ) || ( strcmp( pattern, "*" ) == 0 ))
+			/* Passt die Suchmaske auf diesen Channel? */
+			if( Match( pattern, Channel_Name( chan )))
 			{
 				/* Treffer! */
 				if( ! IRC_WriteStrClient( Client, RPL_LIST_MSG, Client_ID( Client), Channel_Name( chan ), Channel_MemberCount( chan ), Channel_Topic( chan ))) return DISCONNECTED;