X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/3fe908250a691b033542815437696b2c29d9f1c0..8097430a810ac1535fe5304f74991b16ff58b064:/modules/m_set.c

diff --git a/modules/m_set.c b/modules/m_set.c
index 3f336c1..88e079a 100644
--- a/modules/m_set.c
+++ b/modules/m_set.c
@@ -28,8 +28,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
@@ -56,7 +55,7 @@ DECLARE_MODULE_AV1(set, NULL, NULL, set_clist, NULL, NULL, "$Revision: 3406 $");
 struct SetStruct
 {
 	const char *name;
-	void (*handler) ();
+	void (*handler)(struct Client *source_p, const char *chararg, int intarg);
 	int wants_char;		/* 1 if it expects (char *, [int]) */
 	int wants_int;		/* 1 if it expects ([char *], int) */
 
@@ -65,18 +64,19 @@ struct SetStruct
 };
 
 
-static void quote_adminstring(struct Client *, const char *);
-static void quote_autoconn(struct Client *, char *, int);
-static void quote_autoconnall(struct Client *, int);
-static void quote_floodcount(struct Client *, int);
-static void quote_identtimeout(struct Client *, int);
-static void quote_max(struct Client *, int);
-static void quote_operstring(struct Client *, const char *);
-static void quote_spamnum(struct Client *, int);
-static void quote_spamtime(struct Client *, int);
-static void quote_splitmode(struct Client *, char *);
-static void quote_splitnum(struct Client *, int);
-static void quote_splitusers(struct Client *, int);
+static void quote_adminstring(struct Client *, const char *, int);
+static void quote_autoconn(struct Client *, const char *, int);
+static void quote_autoconnall(struct Client *, const char *, int);
+static void quote_floodcount(struct Client *, const char *, int);
+static void quote_identtimeout(struct Client *, const char *, int);
+static void quote_max(struct Client *, const char *, int);
+static void quote_operstring(struct Client *, const char *, int);
+static void quote_spamnum(struct Client *, const char *, int);
+static void quote_spamtime(struct Client *, const char *, int);
+static void quote_splitmode(struct Client *, const char *, int);
+static void quote_splitnum(struct Client *, const char *, int);
+static void quote_splitusers(struct Client *, const char *, int);
+
 static void list_quote_commands(struct Client *);
 
 
@@ -105,7 +105,7 @@ static struct SetStruct set_cmd_table[] = {
 	{"SPLITNUM", 	quote_splitnum, 	0,	1	},
 	{"SPLITUSERS", 	quote_splitusers, 	0,	1	},
 	/* -------------------------------------------------------- */
-	{(char *) 0, (void (*)()) 0, 0, 0}
+	{(char *) 0, (void (*)(struct Client *, const char *, int)) 0, 0, 0}
 };
 
 
@@ -144,14 +144,14 @@ list_quote_commands(struct Client *source_p)
 
 /* SET AUTOCONN */
 static void
-quote_autoconn(struct Client *source_p, char *arg, int newval)
+quote_autoconn(struct Client *source_p, const char *arg, int newval)
 {
 	set_server_conf_autoconn(source_p, arg, newval);
 }
 
 /* SET AUTOCONNALL */
 static void
-quote_autoconnall(struct Client *source_p, int newval)
+quote_autoconnall(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval >= 0)
 	{
@@ -170,7 +170,7 @@ quote_autoconnall(struct Client *source_p, int newval)
 
 /* SET FLOODCOUNT */
 static void
-quote_floodcount(struct Client *source_p, int newval)
+quote_floodcount(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval >= 0)
 	{
@@ -188,7 +188,7 @@ quote_floodcount(struct Client *source_p, int newval)
 
 /* SET IDENTTIMEOUT */
 static void
-quote_identtimeout(struct Client *source_p, int newval)
+quote_identtimeout(struct Client *source_p, const char *arg, int newval)
 {
 	if(!IsOperAdmin(source_p))
 	{
@@ -211,16 +211,16 @@ quote_identtimeout(struct Client *source_p, int newval)
 
 /* SET MAX */
 static void
-quote_max(struct Client *source_p, int newval)
+quote_max(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval > 0)
 	{
-		if(newval > maxconnections - MAX_BUFFER)
-		{
-			sendto_one_notice(source_p,
-					  ":You cannot set MAXCLIENTS to > %d",
-					  maxconnections - MAX_BUFFER);
-			return;
+		if(newval > maxconnections - MAX_BUFFER)
+		{
+			sendto_one_notice(source_p,
+					  ":You cannot set MAXCLIENTS to > %d",
+					  maxconnections - MAX_BUFFER);
+			return;
 		}
 
 		if(newval < 32)
@@ -249,7 +249,7 @@ quote_max(struct Client *source_p, int newval)
 
 /* SET OPERSTRING */
 static void
-quote_operstring(struct Client *source_p, const char *arg)
+quote_operstring(struct Client *source_p, const char *arg, int newval)
 {
 	if(EmptyString(arg))
 	{
@@ -257,7 +257,7 @@ quote_operstring(struct Client *source_p, const char *arg)
 	}
 	else
 	{
-		strlcpy(GlobalSetOptions.operstring, arg,
+		rb_strlcpy(GlobalSetOptions.operstring, arg,
 			sizeof(GlobalSetOptions.operstring));
 		
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -268,7 +268,7 @@ quote_operstring(struct Client *source_p, const char *arg)
 
 /* SET ADMINSTRING */
 static void
-quote_adminstring(struct Client *source_p, const char *arg)
+quote_adminstring(struct Client *source_p, const char *arg, int newval)
 {
 	if(EmptyString(arg))
 	{
@@ -276,7 +276,7 @@ quote_adminstring(struct Client *source_p, const char *arg)
 	}
 	else
 	{
-		strlcpy(GlobalSetOptions.adminstring, arg,
+		rb_strlcpy(GlobalSetOptions.adminstring, arg,
 			sizeof(GlobalSetOptions.adminstring));
 		
 		sendto_realops_snomask(SNO_GENERAL, L_ALL,
@@ -287,7 +287,7 @@ quote_adminstring(struct Client *source_p, const char *arg)
 
 /* SET SPAMNUM */
 static void
-quote_spamnum(struct Client *source_p, int newval)
+quote_spamnum(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval > 0)
 	{
@@ -317,7 +317,7 @@ quote_spamnum(struct Client *source_p, int newval)
 
 /* SET SPAMTIME */
 static void
-quote_spamtime(struct Client *source_p, int newval)
+quote_spamtime(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval > 0)
 	{
@@ -357,7 +357,7 @@ static const char *splitmode_status[] = {
 
 /* SET SPLITMODE */
 static void
-quote_splitmode(struct Client *source_p, char *charval)
+quote_splitmode(struct Client *source_p, const char *charval, int intval)
 {
 	if(charval)
 	{
@@ -417,7 +417,7 @@ quote_splitmode(struct Client *source_p, char *charval)
 
 /* SET SPLITNUM */
 static void
-quote_splitnum(struct Client *source_p, int newval)
+quote_splitnum(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval >= 0)
 	{
@@ -434,7 +434,7 @@ quote_splitnum(struct Client *source_p, int newval)
 
 /* SET SPLITUSERS */
 static void
-quote_splitusers(struct Client *source_p, int newval)
+quote_splitusers(struct Client *source_p, const char *arg, int newval)
 {
 	if(newval >= 0)
 	{
@@ -535,24 +535,8 @@ mo_set(struct Client *client_p, struct Client *source_p, int parc, const char *p
 				else
 					newval = -1;
 
-				if(set_cmd_table[i].wants_char)
-				{
-					if(set_cmd_table[i].wants_int)
-						set_cmd_table[i].handler(source_p, arg, newval);
-					else
-						set_cmd_table[i].handler(source_p, arg);
-					return 0;
-				}
-				else
-				{
-					if(set_cmd_table[i].wants_int)
-						set_cmd_table[i].handler(source_p, newval);
-					else
-						/* Just in case someone actually wants a
-						 * set function that takes no args.. *shrug* */
-						set_cmd_table[i].handler(source_p);
-					return 0;
-				}
+				set_cmd_table[i].handler(source_p, arg, newval);
+				return 0;
 			}
 		}