Backport improved NAMES code into m_spy

[user/henk/code/inspircd.git] / src / cmd_version.cpp

diff --git a/src/cmd_version.cpp b/src/cmd_version.cpp
index 8e80e3778bd3e28e5220558801bd4387f2d31d5f..311659e5901a7e1436d5b2de369b34f32ba96a94 100644 (file)
--- a/src/cmd_version.cpp
+++ b/src/cmd_version.cpp
@@ -14,52 +14,26 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_version.h"
+#include "commands/cmd_version.h"
+
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 
-void cmd_version::Handle (char **parameters, int pcnt, userrec *user)
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_version(Instance);
+}
+
+CmdResult cmd_version::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       std::stringstream out(Config->data005);
+       std::stringstream out(ServerInstance->Config->data005);
        std::string token = "";
        std::string line5 = "";
        int token_counter = 0;
 
-       WriteServ(user->fd,"351 %s :%s",user->nick,ServerInstance->GetVersionString().c_str());
+       user->WriteServ("351 %s :%s",user->nick,ServerInstance->GetVersionString().c_str());
 
        while (!out.eof())
        {
@@ -69,11 +43,11 @@ void cmd_version::Handle (char **parameters, int pcnt, userrec *user)
 
                if ((token_counter >= 13) || (out.eof() == true))
                {
-                       WriteServ(user->fd,"005 %s %s:are supported by this server",user->nick,line5.c_str());
+                       user->WriteServ("005 %s %s:are supported by this server",user->nick,line5.c_str());
                        line5 = "";
                        token_counter = 0;
                }
        }
-}
-
 
+       return CMD_SUCCESS;
+}