Remove the -Dssize_t declaration now its typedeffed.

[user/henk/code/inspircd.git] / include / command_parse.h

diff --git a/include/command_parse.h b/include/command_parse.h
index f1d9d1b1c7b3e7e9cd11cc839aba61babeb2cba0..10dbef58d6106072afd63983c91189bd835f716a 100644 (file)
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -26,10 +26,6 @@ typedef std::map<std::string, void*> SharedObjectList;
 class CoreExport CommandParser : public classbase
 {
  private:
-       /** The creator of this class
-        */
-       InspIRCd* ServerInstance;
-
        /** Parameter buffer
         */
        std::vector<std::string> para;
@@ -47,28 +43,10 @@ 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<std::string,Command*>::iterator safei, const char* source);
+       void RemoveCommand(nspace::hash_map<std::string,Command*>::iterator safei, Module* source);
 
 
  public:
@@ -76,20 +54,10 @@ class CoreExport CommandParser : public classbase
         */
        Commandtable 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);
-
        /** 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.
@@ -178,46 +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.
-        */
-       void SetupCommandTable();
+       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);
 
-       int TranslateUIDs(const std::deque<TranslateType> to, const std::deque<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 CommandReload : public Command
-{
- public:
-       /** Standard constructor
-        */
-       CommandReload (InspIRCd* Instance) : Command(Instance,"RELOAD","o",1) { syntax = "<core-command>"; }
-       /** Handle RELOAD
+       /** 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.
         */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+       int TranslateUIDs(const std::vector<TranslateType> to, const std::vector<std::string> &source, std::string &dest, bool prefix_final = false, Command* custom_translator = NULL);
 };
 
 /** A lookup table of values for multiplier characters used by