Annotations

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

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index 366173758e9f1a5f9b8e408648397d756ddb9e84..06b8b79e86deb61a3aac0bf765c9100a08fcadf1 100644 (file)
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -14,29 +14,28 @@
  * ---------------------------------------------------
  */
 
-#include <unistd.h>
-#include <string>
-#include <vector>
 #include "configreader.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_die.h"
 
-extern InspIRCd* ServerInstance;
-extern std::vector<userrec*> all_opers;
 
-void cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_die(Instance);
+}
+
+CmdResult cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (!strcmp(parameters[0],ServerInstance->Config->diepass))
        {
-               log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, ServerInstance->Config->DieDelay);
+               ServerInstance->Log(SPARSE, "/DIE command from %s!%s@%s, terminating in %d seconds...", user->nick, user->ident, user->host, ServerInstance->Config->DieDelay);
                
                /* This would just be WriteOpers(), but as we just sleep() and then die then the write buffers never get flushed.
                 * so we iterate the oper list, writing the message and immediately trying to flush their write buffer.
                 */
                
-               for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+               for (std::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
                {
                        userrec* a = *i;
                        
@@ -48,11 +47,13 @@ void cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
                }
                
                sleep(ServerInstance->Config->DieDelay);
-               Exit(ERROR);
+               InspIRCd::Exit(ERROR);
        }
        else
        {
-               log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);
+               ServerInstance->Log(SPARSE, "Failed /DIE command from %s!%s@%s", user->nick, user->ident, user->host);
                ServerInstance->WriteOpers("*** Failed DIE Command from %s!%s@%s.",user->nick,user->ident,user->host);
+               return CMD_FAILURE;
        }
+       return CMD_SUCCESS;
 }