Update copyright notice

[empserver] / src / lib / commands / shut.c

diff --git a/src/lib/commands/shut.c b/src/lib/commands/shut.c
index c72304d73cd444ad77191a20f068cafd98fdb1e6..ec4786379492858a5554da24374d78a061437ae4 100644 (file)
--- a/src/lib/commands/shut.c
+++ b/src/lib/commands/shut.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2018, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,15 +25,17 @@
  *  ---
  *
  *  shut.c: Shut down the server with a warning.
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
+ *     Markus Armbruster, 2007-2008
  */
 
 #include <config.h>
 
 #include "commands.h"
 #include "empthread.h"
+#include "game.h"
 #include "server.h"
 
 int
@@ -43,49 +44,38 @@ shut(void)
     int shutdown_minutes;
     int shutdown_was_pending;
     char buf[1024];
-    char msgbuf[100];
-    struct natstr *us;
     char *p;
 
     shutdown_minutes =
        onearg(player->argp[1],
-              "Time until shutdown in minutes (0 to abort shutdown sequence)? ");
-    if (shutdown_minutes < 0)
+              "Time until shutdown in minutes (-1 to abort shutdown sequence)? ");
+    if (player->aborted)
        return RET_SYN;
-    if (!updates_disabled())
-       if (!(p = getstarg(player->argp[2], "Disable update [y]? ", buf))
-           || *p != 'n')
+    if (!updates_disabled()) {
+       p = getstarg(player->argp[2], "Disable update [y]? ", buf);
+       if (!p)
+           return RET_SYN;
+       if (*p != 'n')
            disa();
+    }
+
+    shutdown_was_pending = shutdown_initiate(shutdown_minutes);
+    if (shutdown_was_pending < 0)
+       return RET_FAIL;
 
-    shutdown_was_pending = shutdown_pending;
-    shutdown_pending = shutdown_minutes + !!shutdown_minutes;
-    msgbuf[0] = '\0';
-    if (shutdown_was_pending) {
-       if (shutdown_minutes) {
-           sprintf(msgbuf,
-                   ": The shutdown time has been changed to %d minutes!",
-                   shutdown_minutes);
-       } else {
-           sprintf(msgbuf, ": The server shutdown has been cancelled!");
+    if (shutdown_minutes >= 0) {
+       if (shutdown_was_pending)
+           pr("The shutdown time has been changed to %d minutes!\n",
+              shutdown_minutes);
+       else
+           pr("Shutdown sequence begun.\n");
+    } else {
+       if (shutdown_was_pending)
+           pr("The server shutdown has been cancelled!\n");
+       else {
+           pr("No shutdown to abort\n");
+           return RET_FAIL;
        }
-    } else if (shutdown_minutes) {
-       pr("Shutdown sequence begun.\n");
-       logerror("Shutdown sequence begun");
-       empth_create(PP_SHUTDOWN, shutdown_sequence, (50 * 1024),
-                    0, "shutdownSeq", "Counts down server shutdown", 0);
-    }
-    us = getnatp(player->cnum);
-    if (msgbuf[0]) {
-       sendmessage(us, 0, msgbuf, 1);
-       pr("%s\n", msgbuf + 2);
-       logerror("%s", msgbuf + 2);
-    }
-    if (shutdown_minutes) {
-       sprintf(msgbuf, ": The server will shut down in %d minutes!",
-               shutdown_minutes);
-       sendmessage(us, 0, msgbuf, 1);
-       pr("%s\n", msgbuf + 2);
-       logerror("%s", msgbuf + 2);
     }
     return RET_OK;
 }