Changed os_sgline to use new command API.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1954 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 207 insertions, 157 deletions

diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index 085e54b70..3c72d2711 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -15,78 +15,31 @@
 
 #include "module.h"
 
-int sgline_view_callback(SList * slist, int number, void *item,
-						 va_list args);
-int sgline_view(int number, SXLine * sx, User * u, int *sent_header);
-int sgline_list_callback(SList * slist, int number, void *item,
-						 va_list args);
-int sgline_list(int number, SXLine * sx, User * u, int *sent_header);
-int do_sgline(User * u);
+void myOperServHelp(User *u);
+int sgline_view_callback(SList *slist, int number, void *item, va_list args);
+int sgline_list_callback(SList *slist, int number, void *item, va_list args);
+int sgline_view(int number, SXLine *sx, User *u, int *sent_header);
+int sgline_list(int number, SXLine *sx, User *u, int *sent_header);
 
-void myOperServHelp(User * u);
-
-class OSSGLine : public Module
+class CommandOSSGLine : public Command
 {
- public:
-	OSSGLine(const std::string &modname, const std::string &creator) : Module(modname, creator)
+ private:
+	CommandResult OnAdd(User *u, std::vector<std::string> &params)
 	{
-		Command *c;
-
-		this->SetAuthor("Anope");
-		this->SetVersion("$Id$");
-		this->SetType(CORE);
-
-		c = createCommand("SGLINE", do_sgline, is_services_oper,
-		OPER_HELP_SGLINE, -1, -1, -1, -1);
-		this->AddCommand(OPERSERV, c, MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
-
-		if (!ircd->sgline)
-			throw ModuleException("Your IRCd does not support SGLine");
-	}
-};
-
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User * u)
-{
-	if (is_services_oper(u)) {
-		notice_lang(s_OperServ, u, OPER_HELP_CMD_SGLINE);
-	}
-}
-
-/**
- * The /os sgline command.
- * @param u The user who issued the command
- * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing.
- **/
-int do_sgline(User * u)
-{
-	char *cmd = strtok(NULL, " ");
-
-	if (!cmd)
-		cmd = "";
-
-	if (!stricmp(cmd, "ADD")) {
-		int deleted = 0;
-		char *expiry, *mask, *reason;
+		int deleted = 0, last_param = 2;
+		const char *param;
+		char rest[BUFSIZE];
 		time_t expires;
 
-		mask = strtok(NULL, ":");
-		if (mask && *mask == '+') {
-			expiry = mask;
-			mask = strchr(expiry, ' ');
-			if (mask) {
-				*mask = 0;
-				mask++;
-			}
-		} else {
-			expiry = NULL;
+		param = params.size() > 1 ? params[1].c_str() : NULL;
+		if (param && *param == '+')
+		{
+			expiry = param;
+			param = params.size() > 2 ? params[2].c_str() : NULL;
+			last_param = 3;
 		}
+		else
+			expiry = NULL;
 
 		expires = expiry ? dotime(expiry) : SGLineExpiry;
 		/* If the expiry given does not contain a final letter, it's in days,
@@ -95,104 +48,129 @@ int do_sgline(User * u)
 		if (expiry && isdigit(expiry[strlen(expiry) - 1]))
 			expires *= 86400;
 		/* Do not allow less than a minute expiry time */
-		if (expires != 0 && expires < 60) {
+		if (expires && expires < 60)
+		{
 			notice_lang(s_OperServ, u, BAD_EXPIRY_TIME);
 			return MOD_CONT;
-		} else if (expires > 0) {
+		}
+		else if (expires > 0)
 			expires += time(NULL);
+
+		if (!param)
+		{
+			this->OnSyntaxError(u);
+			return MOD_CONT;
 		}
+		snprintf(rest, sizeof(rest), "%s%s%s", param, params.size() > last_param ? " " : "", params.size() > last_param ? param[last_param].c_str() : "");
+
+		sepstream sep(rest, ':');
+		std::string mask;
+		sep.GetToken(mask);
+		std::string reason = sep.GetRemaining();
 
-		if (mask && (reason = strtok(NULL, ""))) {
+		if (!mask.empty() && !reason.empty()) {
 			/* Clean up the last character of the mask if it is a space
 			 * See bug #761
 			 */
-			size_t masklen = strlen(mask);
+			unsigned masklen = mask.size();
 			if (mask[masklen - 1] == ' ')
-				mask[masklen - 1] = '\0';
+				mask.erase(masklen - 1);
+
+			const char cmask = mask.c_str();
 
 			/* We first do some sanity check on the proposed mask. */
 
-			if (mask && strspn(mask, "*?") == strlen(mask)) {
-				notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, mask);
+			if (!mask.empty() && strspn(cmask, "*?") == strlen(cmask)) {
+				notice_lang(s_OperServ, u, USERHOST_MASK_TOO_WIDE, cmask);
 				return MOD_CONT;
 			}
 
-			deleted = add_sgline(u, mask, u->nick, expires, reason);
+			deleted = add_sgline(u, cmask, u->nick, expires, reason.c_str());
 			if (deleted < 0)
 				return MOD_CONT;
 			else if (deleted)
-				notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL,
-							deleted);
-			notice_lang(s_OperServ, u, OPER_SGLINE_ADDED, mask);
+				notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL, deleted);
+			notice_lang(s_OperServ, u, OPER_SGLINE_ADDED, cmask);
 
-			if (WallOSSGLine) {
+			if (WallOSSGLine)
+			{
 				char buf[128];
 
-				if (!expires) {
+				if (!expires)
 					strcpy(buf, "does not expire");
-				} else {
+				else
+				{
 					int wall_expiry = expires - time(NULL);
 					char *s = NULL;
 
-					if (wall_expiry >= 86400) {
+					if (wall_expiry >= 86400)
+					{
 						wall_expiry /= 86400;
 						s = "day";
-					} else if (wall_expiry >= 3600) {
+					}
+					else if (wall_expiry >= 3600)
+					{
 						wall_expiry /= 3600;
 						s = "hour";
-					} else if (wall_expiry >= 60) {
+					}
+					else if (wall_expiry >= 60)
+					{
 						wall_expiry /= 60;
 						s = "minute";
 					}
 
-					snprintf(buf, sizeof(buf), "expires in %d %s%s",
-							 wall_expiry, s,
-							 (wall_expiry == 1) ? "" : "s");
+					snprintf(buf, sizeof(buf), "expires in %d %s%s", wall_expiry, s, wall_expiry == 1 ? "" : "s");
 				}
 
-				ircdproto->SendGlobops(s_OperServ,
-								 "%s added an SGLINE for %s (%s)", u->nick,
-								 mask, buf);
+				ircdproto->SendGlobops(s_OperServ, "%s added an SGLINE for %s (%s)", u->nick, cmask, buf);
 			}
 
 			if (readonly)
 				notice_lang(s_OperServ, u, READ_ONLY_MODE);
 
-		} else {
-			syntax_error(s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX);
 		}
+		else
+			this->OnSyntaxError(u);
 
-	} else if (!stricmp(cmd, "DEL")) {
+		return MOD_CONT;
+	}
 
-		char *mask;
+	CommandResult OnDel(User *u, std::vector<std::string> &params)
+	{
+		const char *mask;
 		int res = 0;
 
-		mask = strtok(NULL, "");
+		mask = params.size() > 1 ? params[1].c_str() : NULL;
 
-		if (!mask) {
-			syntax_error(s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX);
+		if (!mask)
+		{
+			this->OnSyntaxError(u);
 			return MOD_CONT;
 		}
 
-		if (sglines.count == 0) {
+		if (!sglines.count)
+		{
 			notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY);
 			return MOD_CONT;
 		}
 
-		if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
+		if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask))
+		{
 			/* Deleting a range */
 			res = slist_delete_range(&sglines, mask, NULL);
-			if (res == 0) {
+			if (!res)
+			{
 				notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
 				return MOD_CONT;
-			} else if (res == 1) {
-				notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_ONE);
-			} else {
-				notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL,
-							res);
 			}
-		} else {
-			if ((res = slist_indexof(&sglines, mask)) == -1) {
+			else if (res == 1)
+				notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_ONE);
+			else
+				notice_lang(s_OperServ, u, OPER_SGLINE_DELETED_SEVERAL, res);
+		}
+		else {
+			if ((res = slist_indexof(&sglines, mask)) == -1)
+			{
 				notice_lang(s_OperServ, u, OPER_SGLINE_NOT_FOUND, mask);
 				return MOD_CONT;
 			}
@@ -204,89 +182,167 @@ int do_sgline(User * u)
 		if (readonly)
 			notice_lang(s_OperServ, u, READ_ONLY_MODE);
 
-	} else if (!stricmp(cmd, "LIST")) {
-		char *mask;
+		return MOD_CONT;
+	}
+
+	CommandResult OnList(User *u, std::vector<std::string> &params)
+	{
+		const char *mask;
 		int res, sent_header = 0;
 
-		if (sglines.count == 0) {
+		if (!sglines.count) {
 			notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY);
 			return MOD_CONT;
 		}
 
-		mask = strtok(NULL, "");
+		mask = params.size() > 1 ? params[1].c_str() : NULL;
 
-		if (!mask || (isdigit(*mask)
-					  && strspn(mask, "1234567890,-") == strlen(mask))) {
-			res =
-				slist_enum(&sglines, mask, &sgline_list_callback, u,
-						   &sent_header);
-			if (res == 0) {
+		if (!mask || (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)))
+		{
+			res = slist_enum(&sglines, mask, &sgline_list_callback, u, &sent_header);
+			if (!res)
+			{
 				notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
 				return MOD_CONT;
 			}
-		} else {
+		}
+		else
+		{
 			int i;
 			char *amask;
 
-			for (i = 0; i < sglines.count; i++) {
+			for (i = 0; i < sglines.count; ++i)
+			{
 				amask = (static_cast<SXLine *>(sglines.list[i]))->mask;
-				if (!stricmp(mask, amask)
-					|| match_wild_nocase(mask, amask))
+				if (!stricmp(mask, amask) || match_wild_nocase(mask, amask))
 					sgline_list(i + 1, static_cast<SXLine *>(sglines.list[i]), u, &sent_header);
 			}
 
 			if (!sent_header)
 				notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
-			else {
+			else
 				notice_lang(s_OperServ, u, END_OF_ANY_LIST, "SGLine");
-			}
 		}
-	} else if (!stricmp(cmd, "VIEW")) {
-		char *mask;
+
+		return MOD_CONT;
+	}
+
+	CommandResult OnView(User *u, std::vector<std::string> &params)
+	{
+		const char *mask;
 		int res, sent_header = 0;
 
-		if (sglines.count == 0) {
+		if (!sglines.count)
+		{
 			notice_lang(s_OperServ, u, OPER_SGLINE_LIST_EMPTY);
 			return MOD_CONT;
 		}
 
-		mask = strtok(NULL, "");
+		mask = params.size() > 1 ? params[1].c_str() : NULL;
 
-		if (!mask || (isdigit(*mask)
-					  && strspn(mask, "1234567890,-") == strlen(mask))) {
-			res =
-				slist_enum(&sglines, mask, &sgline_view_callback, u,
-						   &sent_header);
-			if (res == 0) {
+		if (!mask || (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)))
+		{
+			res = slist_enum(&sglines, mask, &sgline_view_callback, u, &sent_header);
+			if (!res)
+			{
 				notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
 				return MOD_CONT;
 			}
-		} else {
+		}
+		else
+		{
 			int i;
 			char *amask;
 
-			for (i = 0; i < sglines.count; i++) {
+			for (i = 0; i < sglines.count; ++i)
+			{
 				amask = (static_cast<SXLine *>(sglines.list[i]))->mask;
-				if (!stricmp(mask, amask)
-					|| match_wild_nocase(mask, amask))
+				if (!stricmp(mask, amask) || match_wild_nocase(mask, amask))
 					sgline_view(i + 1, static_cast<SXLine *>(sglines.list[i]), u, &sent_header);
 			}
 
 			if (!sent_header)
 				notice_lang(s_OperServ, u, OPER_SGLINE_NO_MATCH);
 		}
-	} else if (!stricmp(cmd, "CLEAR")) {
+
+		return MOD_CONT;
+	}
+
+	CommandResult OnClear(User *u, std::vector<std::string> &params)
+	{
 		slist_clear(&sglines, 1);
 		notice_lang(s_OperServ, u, OPER_SGLINE_CLEAR);
-	} else {
+	}
+ public:
+	CommandOSSGLine() : Command("SGLINE", 1, 3)
+	{
+	}
+
+	CommandResult Execute(User *u, std::vector<std::string> &params)
+	{
+		const char *cmd = params[0].c_str();
+
+		if (!stricmp(cmd, "ADD"))
+			return this->OnAdd(u, params);
+		else if (!stricmp(cmd, "DEL"))
+			return this->OnDel(u, params);
+		else if (!stricmp(cmd, "LIST"))
+			return this->OnList(u, params);
+		else if (!stricmp(cmd, "VIEW"))
+			return this->OnView(u, params);
+		else if (!stricmp(cmd, "CLEAR"))
+			return this->OnClear(u, params);
+		else
+			this->OnSyntaxError(u);
+		return MOD_CONT;
+	}
+
+	bool OnHelp(User *u, const std::string &subcommand)
+	{
+		if (!is_services_oper(u))
+			return false;
+
+		notice_lang(s_OperServ, u, OPER_HELP_SGLINE);
+		return true;
+	}
+
+	void OnSyntaxError(User *u)
+	{
 		syntax_error(s_OperServ, u, "SGLINE", OPER_SGLINE_SYNTAX);
 	}
-	return MOD_CONT;
+};
+
+class OSSGLine : public Module
+{
+ public:
+	OSSGLine(const std::string &modname, const std::string &creator) : Module(modname, creator)
+	{
+
+		this->SetAuthor("Anope");
+		this->SetVersion("$Id$");
+		this->SetType(CORE);
+
+		this->AddCommand(OPERSERV, new CommandOSSGLine(), MOD_UNIQUE);
+
+		this->SetOperHelp(myOperServHelp);
+
+		if (!ircd->sgline)
+			throw ModuleException("Your IRCd does not support SGLine");
+	}
+};
+
+/**
+ * Add the help response to anopes /os help output.
+ * @param u The user who is requesting help
+ **/
+void myOperServHelp(User *u)
+{
+	if (is_services_oper(u))
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_SGLINE);
 }
 
 /* Lists an SGLINE entry, prefixing it with the header if needed */
-
-int sgline_view(int number, SXLine * sx, User * u, int *sent_header)
+int sgline_view(int number, SXLine *sx, User *u, int *sent_header)
 {
 	char timebuf[32], expirebuf[256];
 	struct tm tm;
@@ -294,25 +350,22 @@ int sgline_view(int number, SXLine * sx, User * u, int *sent_header)
 	if (!sx)
 		return 0;
 
-	if (!*sent_header) {
+	if (!*sent_header)
+	{
 		notice_lang(s_OperServ, u, OPER_SGLINE_VIEW_HEADER);
 		*sent_header = 1;
 	}
 
 	tm = *localtime(&sx->seton);
-	strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT,
-				  &tm);
+	strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm);
 	expire_left(u->na, expirebuf, sizeof(expirebuf), sx->expires);
-	notice_lang(s_OperServ, u, OPER_SGLINE_VIEW_FORMAT, number, sx->mask,
-				sx->by, timebuf, expirebuf, sx->reason);
+	notice_lang(s_OperServ, u, OPER_SGLINE_VIEW_FORMAT, number, sx->mask, sx->by, timebuf, expirebuf, sx->reason);
 
 	return 1;
 }
 
 /* Callback for enumeration purposes */
-
-int sgline_view_callback(SList * slist, int number, void *item,
-						 va_list args)
+int sgline_view_callback(SList *slist, int number, void *item, va_list args)
 {
 	User *u = va_arg(args, User *);
 	int *sent_header = va_arg(args, int *);
@@ -321,27 +374,24 @@ int sgline_view_callback(SList * slist, int number, void *item,
 }
 
 /* Lists an SGLINE entry, prefixing it with the header if needed */
-
-int sgline_list(int number, SXLine * sx, User * u, int *sent_header)
+int sgline_list(int number, SXLine *sx, User *u, int *sent_header)
 {
 	if (!sx)
 		return 0;
 
-	if (!*sent_header) {
+	if (!*sent_header)
+	{
 		notice_lang(s_OperServ, u, OPER_SGLINE_LIST_HEADER);
 		*sent_header = 1;
 	}
 
-	notice_lang(s_OperServ, u, OPER_SGLINE_LIST_FORMAT, number, sx->mask,
-				sx->reason);
+	notice_lang(s_OperServ, u, OPER_SGLINE_LIST_FORMAT, number, sx->mask, sx->reason);
 
 	return 1;
 }
 
 /* Callback for enumeration purposes */
-
-int sgline_list_callback(SList * slist, int number, void *item,
-						 va_list args)
+int sgline_list_callback(SList *slist, int number, void *item, va_list args)
 {
 	User *u = va_arg(args, User *);
 	int *sent_header = va_arg(args, int *);