Use the remote channel's capitalization on a losing TS merge

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

diff --git a/src/commands/cmd_restart.cpp b/src/commands/cmd_restart.cpp
index e83f3f381d5614a6b8402ae2898b3b7ee1b6ce86..d47cfb23d5ebd65d46d52ee4a5073a2a862de92d 100644 (file)
--- a/src/commands/cmd_restart.cpp
+++ b/src/commands/cmd_restart.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -37,23 +37,16 @@ CmdResult CommandRestart::Handle (const std::vector<std::string>& parameters, Us
        {
                ServerInstance->SNO->WriteGlobalSno('a', "RESTART command from %s!%s@%s, restarting server.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
 
-               try
-               {
-                       ServerInstance->Restart("Server restarting.");
-               }
-               catch (...)
-               {
-                       /* We dont actually get here unless theres some fatal and unrecoverable error. */
-                       exit(0);
-               }
+               ServerInstance->SendError("Server restarting.");
+               execv(ServerInstance->Config->cmdline.argv[0], ServerInstance->Config->cmdline.argv);
+               ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART - could not execute '%s' (%s)",
+                       ServerInstance->Config->cmdline.argv[0], strerror(errno));
        }
        else
        {
                ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART Command from %s!%s@%s.", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
-               return CMD_FAILURE;
        }
-
-       return CMD_SUCCESS;
+       return CMD_FAILURE;
 }