X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommand_parse.h;h=c3d67af23906c447f45fa704eb862416d02083da;hb=754f0130893bacb2b69a32c3de9ed1b3da9659cd;hp=6682bc4fbb2bd45f579592332be1268557038e99;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/command_parse.h b/include/command_parse.h
index 6682bc4fb..c3d67af23 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -29,6 +29,9 @@
  */
 class CoreExport CommandParser
 {
+ public:
+ 	typedef TR1NS::unordered_map<std::string, Command*> CommandMap;
+
  private:
 	/** Process a command from a user.
 	 * @param user The user to parse the command for
@@ -36,26 +39,33 @@ class CoreExport CommandParser
 	 */
 	void ProcessCommand(LocalUser* user, std::string& cmd);
 
- public:
 	/** Command list, a hash_map of command names to Command*
 	 */
-	Commandtable cmdlist;
+	CommandMap cmdlist;
 
+ public:
 	/** Default constructor.
 	 */
 	CommandParser();
 
+	/** Get a command name -> Command* map containing all client to server commands
+	 * @return A map of command handlers keyed by command names
+	 */
+	const CommandMap& GetCommands() const { return cmdlist; }
+
 	/** Calls the handler for a given command.
 	 * @param commandname The command to find. This should be in uppercase.
 	 * @param parameters Parameter list
 	 * @param user The user to call the handler on behalf of
+	 * @param cmd If non-NULL and the command was executed it is set to the command handler,
+	 * otherwise it isn't written to.
 	 * @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
 	 * and called, but the command did not complete successfully, and it will return CMD_INVALID if the
 	 * 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 std::vector<std::string>& parameters, User *user);
+	CmdResult CallHandler(const std::string& commandname, const std::vector<std::string>& parameters, User* user, Command** cmd = NULL);
 
 	/** Get the handler function for a command.
 	 * @param commandname The command required. Always use uppercase for this parameter.
@@ -75,7 +85,7 @@ class CoreExport CommandParser
 	 * With one list it is much simpler, and is used in NAMES, WHOIS, PRIVMSG etc.
 	 *
 	 * If there is only one list and there are duplicates in it, then the command handler is only called for
-	 * unique items. Entries are compared using "irc comparision" (see irc::string).
+	 * unique items. Entries are compared using "irc comparison".
 	 * If the usemax parameter is true (the default) the function only parses until it reaches
 	 * ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
 	 *