1) Fix for nickname overruled with new cullList stuff -- we have to change their...

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

diff --git a/src/cmd_die.cpp b/src/cmd_die.cpp
index b0a826b6db7bb7151990e35c7422763af0575699..d9aecb4be4dc4490614268954a037c2d44191887 100644 (file)
--- a/src/cmd_die.cpp
+++ b/src/cmd_die.cpp
@@ -2,41 +2,38 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.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.
  *
  * ---------------------------------------------------
  */
 
-#include <unistd.h>
-#include <string>
-#include <vector>
 #include "configreader.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_die.h"
+#include "exitcodes.h"
 
-extern InspIRCd* ServerInstance;
-extern std::vector<userrec*> all_opers;
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_die(Instance);
+}
 
-void cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
+/** Handle /DIE
+ */
+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;
                        
@@ -47,12 +44,16 @@ void cmd_die::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                }
                
-               sleep(ServerInstance->Config->DieDelay);
-               InspIRCd::Exit(ERROR);
+               if (ServerInstance->Config->DieDelay)
+                       sleep(ServerInstance->Config->DieDelay);
+
+               InspIRCd::Exit(EXIT_STATUS_DIE);
        }
        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;
 }