This fixes a deletion error here, we were using new[] and not using delete[], but...

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

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index a957c0257c44f5abbcf0aae67db574c59b85fed9..6025ea2b573a8d00dcdf22ec8c002bfc91ba92a9 100644 (file)
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -2,52 +2,44 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "cmd_die.h"
+#include "commands/cmd_die.h"
+#include "exitcodes.h"
 
-extern ServerConfig* Config;
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_die(Instance);
+}
 
-void cmd_die::Handle (char **parameters, int pcnt, userrec *user)
+/** Handle /DIE
+ */
+CmdResult cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       log(DEBUG,"die: %s",user->nick);
-       if (!strcmp(parameters[0],Config->diepass))
+       if (!strcmp(parameters[0],ServerInstance->Config->diepass))
        {
-               WriteOpers("*** DIE command from %s!%s@%s, terminating...",user->nick,user->ident,user->host);
-               sleep(Config->DieDelay);
-               Exit(ERROR);
+               std::string diebuf = std::string("*** DIE command from ") + user->nick + "!" + user->ident + "@" + user->dhost + ". Terminating in " + ConvToStr(ServerInstance->Config->DieDelay) + " seconds.";
+               ServerInstance->Log(SPARSE, diebuf);
+               ServerInstance->SendError(diebuf);
+               
+               if (ServerInstance->Config->DieDelay)
+                       sleep(ServerInstance->Config->DieDelay);
+
+               ServerInstance->Exit(EXIT_STATUS_DIE);
        }
        else
        {
-               WriteOpers("*** 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;
 }
-
-