Update copyright notice

[empserver] / src / lib / player / dispatch.c

diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c
index 8cda8f596ec6a55b2f6aec4d97faa5371839d0ac..cb0e72aadc450c7060b595b69842fea16cf1a853 100644 (file)
--- a/src/lib/player/dispatch.c
+++ b/src/lib/player/dispatch.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, 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,61 +14,71 @@
  *  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/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  dispatch.c: Actually execute the command given
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2007-2014
  */
 
-#include "prototypes.h"
-#include "misc.h"
-#include "player.h"
+#include <config.h>
+
+#include "chance.h"
 #include "com.h"
+#include "empio.h"
+#include "file.h"
+#include "journal.h"
 #include "match.h"
+#include "misc.h"
 #include "nat.h"
-#include "file.h"
-#include "proto.h"
-#include "empio.h"
 #include "optlist.h"
-#include "subs.h"
-#include "common.h"
+#include "player.h"
+#include "prototypes.h"
 #include "server.h"
 
+/*
+ * Last command's PRNG seed.
+ * Only used when running_test_suite.
+ */
+int test_suite_prng_seed;
+
+/*
+ * Execute command named by player->argp[0].
+ * @buf is the raw UTF-8 command line.  It should have been passed to
+ * parse() to set up player->argp.
+ * If @redir is not null, it's the command's redirection, in UTF-8.
+ * Return -1 if the command is not unique or doesn't exist, else 0.
+ */
 int
-dispatch(s_char *buf, s_char *redir)
+dispatch(char *buf, char *redir)
 {
     struct natstr *np;
     struct cmndstr *command;
     int cmd;
 
-    cmd = comtch(player->argp[0], player_coms,
-                player->ncomstat, player->god);
+    cmd = comtch(player->argp[0], player_coms, player->nstat);
     if (cmd < 0) {
        if (cmd == M_NOTUNIQUE)
-           pr("\"%s\" is ambiguous -- ", buf);
+           pr("Command \"%s\" is ambiguous -- ", player->argp[0]);
        else if (cmd == M_IGNORE)
            return 0;
-       else {
-           pr("\"%s\" is not a legal command ", buf);
-           if (player->nstat != player->ncomstat)
-               pr("now ");
-           pr("\n");
-       }
+       else
+           pr("\"%s\" is not a legal command\n", player->argp[0]);
        return -1;
     }
     command = &player_coms[cmd];
+
     np = getnatp(player->cnum);
     if (np->nat_btu < command->c_cost && command->c_cost > 0) {
        if (player->god || opt_BLITZ)
@@ -78,19 +88,32 @@ dispatch(s_char *buf, s_char *redir)
            return 0;
        }
     }
-    if (command->c_addr == 0) {
+    if (!command->c_addr) {
        pr("Command not implemented\n");
        return 0;
     }
-    if (update_pending) {
-       pr("Update in progress...command failed\n");
-       return 0;
-    }
+    player->may_sleep = command->c_flags & C_MOD
+       ? PLAYER_SLEEP_ON_INPUT : PLAYER_SLEEP_FREELY;
+    player->command = command;
+    empth_rwlock_rdlock(update_lock);
+
+    /*
+     * When running the test suite, reseed PRNG for each command with
+     * a counter, to keep results stable even when the number of PRNs
+     * consumed changes.
+     * Tests can adjust the counter with "__cmd added ...", to
+     * keep the results stable when commands are inserted or deleted.
+     */
+    test_suite_prng_seed += !(command->c_permit & TESTING);
+    if (running_test_suite)
+       seed_prng(test_suite_prng_seed);
+
     if (redir) {
        prredir(redir);
-       pr("%s\n", buf);
+       uprnf(buf);
+       pr("\n");
     }
-    player->command = command;
+    journal_command(command->c_form);
     switch (command->c_addr()) {
     case RET_OK:
        player->btused += command->c_cost;
@@ -103,9 +126,14 @@ dispatch(s_char *buf, s_char *redir)
        pr("Usage: %s\n", command->c_form);
        break;
     default:
-       logerror("%s: returned bad value", command->c_form);
+       CANT_REACH();
        break;
     }
-    player->command = 0;
+
+    empth_rwlock_unlock(update_lock);
+    player->command = NULL;
+    if (player->may_sleep != PLAYER_SLEEP_NEVER || !io_eof(player->iop))
+       player->may_sleep = PLAYER_SLEEP_FREELY;
+    /* else we're being kicked out */
     return 0;
 }