X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_restart.cpp;h=b9afd7c9db4f315e429ae2180da93b89dc279972;hb=f087d825a88760d251b8f80b5d50bc98b40fa2ae;hp=c72a164955cb3df7a6278b4caa24656e02f4edc7;hpb=12737ab4ad61a0d8a908c8a21594c7012e21eb3c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index c72a16495..b9afd7c9d 100644
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -2,62 +2,46 @@
  *       | 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 "configreader.h"
-#include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 #include "commands/cmd_restart.h"
 
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_restart(Instance);
+}
 
-
-void cmd_restart::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_restart::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	char *argv[32];
-	log(DEFAULT,"Restart: %s",user->nick);
+	ServerInstance->Log(DEFAULT,"Restart: %s",user->nick);
 	if (!strcmp(parameters[0],ServerInstance->Config->restartpass))
 	{
 		ServerInstance->WriteOpers("*** RESTART command from %s!%s@%s, restarting server.",user->nick,user->ident,user->host);
 
-		argv[0] = ServerInstance->Config->MyExecutable;
-		argv[1] = "-wait";
-		if (ServerInstance->Config->nofork)
-		{
-			argv[2] = "-nofork";
-		}
-		else
+		try
 		{
-			argv[2] = NULL;
+			ServerInstance->Restart("Server restarting.");
 		}
-		argv[3] = NULL;
-		
-		// close ALL file descriptors
-		ServerInstance->SendError("Server restarting.");
-		sleep(1);
-		for (int i = 0; i < MAX_DESCRIPTORS; i++)
+		catch (...)
 		{
-			shutdown(i,2);
-    			close(i);
+			/* We dont actually get here unless theres some fatal and unrecoverable error. */
+			exit(0);
 		}
-		sleep(2);
-		
-		execv(ServerInstance->Config->MyExecutable,argv);
-
-		exit(0);
 	}
 	else
 	{
 		ServerInstance->WriteOpers("*** Failed RESTART Command from %s!%s@%s.",user->nick,user->ident,user->host);
+		return CMD_FAILURE;
 	}
+
+	return CMD_SUCCESS;
 }
+