Split up spanningtree some more, the filenames should be more intuitive so that devel...

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

diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index f7820187cadf2134cfab60063fb8f3130f247695..b9afd7c9db4f315e429ae2180da93b89dc279972 100644 (file)
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -2,104 +2,46 @@
  *       | 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>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_restart.h"
+#include "commands/cmd_restart.h"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_restart(Instance);
+}
 
-void cmd_restart::Handle (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);
-       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[1] = "-wait";
-               if (Config->nofork)
-               {
-                       argv[2] = "-nofork";
-               }
-               else
+               try
                {
-                       argv[2] = NULL;
+                       ServerInstance->Restart("Server restarting.");
                }
-               argv[3] = NULL;
-               
-               // close ALL file descriptors
-               send_error("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(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;
+}