X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommand_parse.h;h=10dbef58d6106072afd63983c91189bd835f716a;hb=b6a5e2bd143cdd2fc610f79c87729d2e211da7ff;hp=a8a14497e88808d6a001dd229c52f9d865b9576e;hpb=ffbd1eebf0b82bf40482879f410f58874030a695;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/command_parse.h b/include/command_parse.h index a8a14497e..10dbef58d 100644 --- a/include/command_parse.h +++ b/include/command_parse.h @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -26,10 +26,6 @@ typedef std::map SharedObjectList; class CoreExport CommandParser : public classbase { private: - /** The creator of this class - */ - InspIRCd* ServerInstance; - /** Parameter buffer */ std::vector para; @@ -47,54 +43,25 @@ class CoreExport CommandParser : public classbase */ bool ProcessCommand(User *user, std::string &cmd); - /** Finds the init_command symbol in a .so file - * @param v A function pointer to be initialized - * @param h A valid shared object handle - * @param name The filename being loaded, used for error reporting - * @return True if the symbol could be found - */ - bool FindSym(void** v, void* h, const std::string &name); - - /** A list of core-implemented modes and their shared object handles - */ - SharedObjectList RFCCommands; - - /** Load a command from a shared object on disk. - * @param name The shared object to load (without path) - * @return NULL on success, pointer to dlerrr() error message on failure - */ - const char* LoadCommand(const char* name); - /** Removes a command if the sources match. Used as a helper for * safe hash_map delete while iter in RemoveCommands(const char* source). */ - void RemoveCommand(nspace::hash_map::iterator safei, const char* source); + void RemoveCommand(nspace::hash_map::iterator safei, Module* source); public: /** Command list, a hash_map of command names to Command* */ - Commandable cmdlist; - - /** Reload a core command. - * This will only reload commands implemented by the core, - * to reload a modular command, you must reload that module. - * @param cmd The command to reload. This will cause the shared - * object which implements this command to be closed, and then reloaded. - * @return True if the command was reloaded, false if it could not be found - * or another error occured - */ - bool ReloadCommand(std::string cmd, User* user); + Commandtable cmdlist; /** Default constructor. * @param Instance The creator of this class */ - CommandParser(InspIRCd* Instance); + CommandParser(); /** 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 @@ -119,7 +86,7 @@ class CoreExport CommandParser : public classbase * function will return true, otherwise it will return false. */ 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. * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once, @@ -179,47 +146,33 @@ class CoreExport CommandParser : public classbase void DoLines(User* current, bool one_only = false); /** Remove all commands relating to module 'source'. - * @param source A module name which has introduced new commands + * @param source A module which has introduced new commands */ - void RemoveCommands(const char* source); + void RemoveCommands(Module* source); /** Add a new command to the commands hash * @param f The new Command to add to the list - * @param so_handle The handle to the shared object where the command can be found. - * Only core commands loaded via cmd_*.so files should set this parameter to anything - * meaningful. Module authors should leave this parameter at its default of NULL. * @return True if the command was added */ - bool CreateCommand(Command *f, void* so_handle = NULL); - - /** Insert the default RFC1459 commands into the command hash. - * Ignore any already loaded commands. - * @param user User to spool errors to, or if NULL, when an error occurs spool the errors to - * stdout then exit with EXIT_STATUS_HANDLER. - */ - void SetupCommandTable(User* user); + bool CreateCommand(Command *f); /** Translate nicknames in a string into UIDs, based on the TranslationType given. * @param to The translation type to use for the process. * @param source The input string * @param dest The output string, it is safe to pass source and dest as the same variable only for translation type TR_TEXT. - * @return returns the number of substitutions made. Will always be 0 or 1 for TR_TEXT and 0..n for other types. + * @return returns the number of substitutions made. Will always be 0 or 1 */ int TranslateUIDs(TranslateType to, const std::string &source, std::string &dest); -}; -/** Command handler class for the RELOAD command. - * A command cant really reload itself, so this has to be in here. - */ -class cmd_reload : public Command -{ - public: - /** Standard constructor + /** Translate nicknames in a list of strings into UIDs, based on the TranslateTypes given. + * @param to The translation types to use for the process. If this list is too short, TR_TEXT is assumed for the rest. + * @param source The strings to translate + * @param dest The output string + * @param prefix_final True if the final source argument should have a colon prepended (if it could contain a space) + * @param custom_translator Used to translate the parameter if the TR_CUSTOM type is found in to + * @return returns the number of substitutions made. */ - cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD","o",1) { syntax = ""; } - /** Handle RELOAD - */ - CmdResult Handle(const std::vector& parameters, User *user); + int TranslateUIDs(const std::vector to, const std::vector &source, std::string &dest, bool prefix_final = false, Command* custom_translator = NULL); }; /** A lookup table of values for multiplier characters used by @@ -235,9 +188,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, @@ -250,4 +203,3 @@ const int duration_multi[] = }; #endif -