X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommand_parse.h;h=b0babac712e63e45f762955ffc9d5cf7effd58a3;hb=2be4fff3e371b8add4fa6f471414e1f88418875f;hp=d5c7049db70eaa544e0eebf702c5b910ec96b7bd;hpb=6856c87ae51d655870607c6e74e0eed6d338283a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/command_parse.h b/include/command_parse.h index d5c7049db..b0babac71 100644 --- a/include/command_parse.h +++ b/include/command_parse.h @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -14,15 +14,6 @@ #ifndef __COMMAND_PARSE_H #define __COMMAND_PARSE_H -#include -#include "users.h" -#include "ctables.h" -#include "typedefs.h" - -/** Required forward declaration - */ -class InspIRCd; - /** A list of dll/so files containing the command handlers for the core */ typedef std::map SharedObjectList; @@ -48,7 +39,7 @@ class CoreExport CommandParser : public classbase * @param parameters The input string * @return The number of parameters parsed into command_p */ - int ProcessParameters(char **command_p,char *parameters); + int ProcessParameters(std::vector& command_p, char* parameters); /** Process a command from a user. * @param user The user to parse the command for @@ -83,7 +74,7 @@ class CoreExport CommandParser : public classbase public: /** Command list, a hash_map of command names to Command* */ - Commandable cmdlist; + Commandtable cmdlist; /** Reload a core command. * This will only reload commands implemented by the core, @@ -93,7 +84,7 @@ class CoreExport CommandParser : public classbase * @return True if the command was reloaded, false if it could not be found * or another error occured */ - bool ReloadCommand(const char* cmd, User* user); + bool ReloadCommand(std::string cmd, User* user); /** Default constructor. * @param Instance The creator of this class @@ -102,8 +93,7 @@ class CoreExport CommandParser : public classbase /** Calls the handler for a given command. * @param commandname The command to find. This should be in uppercase. - * @param parameters Parameter list as an array of array of char (that's not a typo). - * @param pcnt The number of items in the parameters list + * @param parameters Parameter list * @param user The user to call the handler on behalf of * @return This method will return CMD_SUCCESS if the command handler was found and called, * and the command completeld successfully. It will return CMD_FAILURE if the command handler was found @@ -111,7 +101,7 @@ class CoreExport CommandParser : public classbase * command simply did not exist at all or the wrong number of parameters were given, or the user * was not privilaged enough to execute the command. */ - CmdResult CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user); + CmdResult CallHandler(const std::string &commandname, const std::vector& parameters, User *user); /** Get the handler function for a command. * @param commandname The command required. Always use uppercase for this parameter. @@ -127,7 +117,7 @@ class CoreExport CommandParser : public classbase * equal to or greater than the minimum number of parameters to the given command, then this * function will return true, otherwise it will return false. */ - bool IsValidCommand(const std::string &commandname, int pcnt, User * user); + bool IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user); /** LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list. * There are two overriden versions of this method, one of which takes two potential lists and the other takes one. @@ -150,7 +140,7 @@ class CoreExport CommandParser : public classbase * @return This function will return 1 when there are no more parameters to process. When this occurs, its * caller should return without doing anything, otherwise it should continue into its main section of code. */ - int LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra); + int LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere, unsigned int extra); /** LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list. * There are two overriden versions of this method, one of which takes two potential lists and the other takes one. @@ -173,7 +163,7 @@ class CoreExport CommandParser : public classbase * @return This function will return 1 when there are no more parameters to process. When this occurs, its * caller should return without doing anything, otherwise it should continue into its main section of code. */ - int LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere); + int LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere); /** Take a raw input buffer from a recvq, and process it on behalf of a user. * @param buffer The buffer line to process @@ -189,9 +179,8 @@ class CoreExport CommandParser : public classbase /** Remove all commands relating to module 'source'. * @param source A module name which has introduced new commands - * @return True This function returns true if commands were removed */ - bool RemoveCommands(const char* source); + void RemoveCommands(const char* source); /** Add a new command to the commands hash * @param f The new Command to add to the list @@ -226,10 +215,10 @@ class cmd_reload : public Command public: /** Standard constructor */ - cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD",'o',1) { syntax = ""; } + cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD","o",1) { syntax = ""; } /** Handle RELOAD */ - CmdResult Handle(const char** parameters, int pcnt, User *user); + CmdResult Handle(const std::vector& parameters, User *user); }; /** A lookup table of values for multiplier characters used by @@ -245,9 +234,9 @@ const int duration_multi[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 86400, 1, 1, 1, 3600, 1, 1, 1, 1, 60, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 604800, 1, 31536000, 1, 1, 1, 1, 1, 1, 1, 1, + 604800, 1, 31557600, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 86400, 1, 1, 1, 3600, 1, 1, 1, 1, 60, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 604800, 1, 31536000, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 604800, 1, 31557600, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,