X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_restart.cpp;h=c985c17171a03de093c448067f39fbe11c45c751;hb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;hp=80f607890c3c46bf12e2ad72d4e1c306b5821336;hpb=24ac504f4b6dbcca3cb3ab91d3cbb40cc7a9ff33;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index 80f607890..c985c1717 100644
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -2,12 +2,9 @@
  *       | 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.
  *
@@ -16,23 +13,26 @@
 
 #include "configreader.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_restart.h"
 
-extern ServerConfig* Config;;
 
-void cmd_restart::Handle (char **parameters, int pcnt, userrec *user)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_restart(Instance);
+}
+
+CmdResult cmd_restart::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	char *argv[32];
-	log(DEFAULT,"Restart: %s",user->nick);
-	if (!strcmp(parameters[0],Config->restartpass))
+	ServerInstance->Log(DEFAULT,"Restart: %s",user->nick);
+	if (!strcmp(parameters[0],ServerInstance->Config->restartpass))
 	{
-		WriteOpers("*** RESTART command from %s!%s@%s, restarting server.",user->nick,user->ident,user->host);
+		ServerInstance->WriteOpers("*** RESTART command from %s!%s@%s, restarting server.",user->nick,user->ident,user->host);
 
-		argv[0] = Config->MyExecutable;
+		argv[0] = ServerInstance->Config->MyExecutable;
 		argv[1] = "-wait";
-		if (Config->nofork)
+		if (ServerInstance->Config->nofork)
 		{
 			argv[2] = "-nofork";
 		}
@@ -43,7 +43,7 @@ void cmd_restart::Handle (char **parameters, int pcnt, userrec *user)
 		argv[3] = NULL;
 		
 		// close ALL file descriptors
-		send_error("Server restarting.");
+		ServerInstance->SendError("Server restarting.");
 		sleep(1);
 		for (int i = 0; i < MAX_DESCRIPTORS; i++)
 		{
@@ -52,12 +52,16 @@ void cmd_restart::Handle (char **parameters, int pcnt, userrec *user)
 		}
 		sleep(2);
 		
-		execv(Config->MyExecutable,argv);
+		execv(ServerInstance->Config->MyExecutable,argv);
 
 		exit(0);
 	}
 	else
 	{
-		WriteOpers("*** Failed RESTART Command from %s!%s@%s.",user->nick,user->ident,user->host);
+		ServerInstance->WriteOpers("*** Failed RESTART Command from %s!%s@%s.",user->nick,user->ident,user->host);
+		return CMD_FAILURE;
 	}
+
+	return CMD_SUCCESS;
 }
+