X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-macros.h;h=abb93f012b0811712a4e65bca0ce0aa7692764ce;hp=bd63ec495f7253f8b20dd9a006e794b1158d7626;hb=139f5961a078dfd23a469d98c3942f42595854aa;hpb=65359ff8f722efdf24700ce05011afc0fef28924

diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h
index bd63ec49..abb93f01 100644
--- a/src/ngircd/irc-macros.h
+++ b/src/ngircd/irc-macros.h
@@ -17,6 +17,19 @@
  * Macros for functions that handle IRC commands.
  */
 
+/**
+ * Make sure that number of passed parameters is equal to Count.
+ *
+ * If there are not exactly Count parameters, send an error to the client and
+ * return from the function.
+ */
+#define _IRC_ARGC_EQ_OR_RETURN_(Client, Req, Count) \
+if (Req->argc != Count) { \
+	IRC_SetPenalty(Client, 2); \
+	return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+				  Client_ID(Client), Req->command); \
+}
+
 /**
  * Make sure that number of passed parameters is less or equal than Max.
  *
@@ -24,9 +37,11 @@
  * return from the function.
  */
 #define _IRC_ARGC_LE_OR_RETURN_(Client, Req, Max) \
-if (Req->argc > Max) \
+if (Req->argc > Max) { \
+	IRC_SetPenalty(Client, 2); \
 	return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
-				  Client_ID(Client), Req->command);
+				  Client_ID(Client), Req->command); \
+}
 
 /**
  * Make sure that number of passed parameters is greater or equal than Min.
@@ -35,9 +50,24 @@ if (Req->argc > Max) \
  * return from the function.
  */
 #define _IRC_ARGC_GE_OR_RETURN_(Client, Req, Min) \
-if (Req->argc < Min) \
+if (Req->argc < Min) { \
+	IRC_SetPenalty(Client, 2); \
+	return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+				  Client_ID(Client), Req->command); \
+}
+
+/**
+ * Make sure that number of passed parameters is in between Min and Max.
+ *
+ * If there aren't at least Min parameters or if there are more than Max
+ * parameters, send an error to the client and return from the function.
+ */
+#define _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, Min, Max) \
+if (Req->argc < Min || Req->argc > Max) { \
+	IRC_SetPenalty(Client, 2); \
 	return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
-				  Client_ID(Client), Req->command);
+				  Client_ID(Client), Req->command); \
+}
 
 /**
  * Get sender of an IRC command.