Revert "Simplify execute(): use getstarg() instead of getstring()"

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

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 4666d179ed7465ad20cc960623c775cb66471ac3..eb87f78838c067bffdf2bb8a25da1ac65d0ca01d 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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/>.
  *
  *  ---
  *
@@ -29,8 +28,8 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2008
- *     Ron Koenderink, 2004-2007
+ *     Markus Armbruster, 2004-2011
+ *     Ron Koenderink, 2004-2009
  */
 
 #include <config.h>
@@ -70,7 +69,7 @@ player_main(struct player *p)
        return;
     }
     natp = getnatp(player->cnum);
-    if (!may_play_now(natp, player->curup, 0))
+    if (!may_play_now(natp, player->curup))
        return;
     if (natp->nat_stat != STAT_VIS
        && natp->nat_last_login
@@ -116,16 +115,18 @@ player_main(struct player *p)
 static int
 command(void)
 {
+    struct natstr *natp = getnatp(player->cnum);
     char *redir;               /* UTF-8 */
     char scanspace[1024];
     time_t now;
 
+    prprompt(natp->nat_timeused / 60, natp->nat_btu);
     if (getcommand(player->combuf) < 0)
-       return 0;
+       return player->aborted;
 
     now = time(NULL);
     update_timeused(now);
-    if (!may_play_now(getnatp(player->cnum), now, 1))
+    if (!player->god && !may_play_now(natp, now))
        return 0;
 
     if (parse(player->combuf, scanspace, player->argp, player->comtail,
@@ -173,7 +174,7 @@ status(void)
 
     time(&player->curup);
     update_timeused(player->curup);
-    if (!may_play_now(natp, player->curup, 0))
+    if (!may_play_now(natp, player->curup))
        return 0;
     if (player->btused) {
        natp->nat_btu -= player->btused;
@@ -203,6 +204,36 @@ status(void)
     return 1;
 }
 
+/* Is ARG one of the player's last command's arguments?  */
+static int
+is_command_arg(char *arg)
+{
+    int i;
+
+    for (i = 1; i < 128 && player->argp[i]; i++) {
+       if (arg == player->argp[i])
+           return 1;
+    }
+    return 0;
+}
+
+/*
+ * Make all objects stale if ARG is one of the player's command arguments.
+ * See ef_make_stale() for what "making stale" means.
+ * Useful for functions that prompt for missing arguments.
+ * These can yield the processor, so we'd like to call ef_make_stale()
+ * there.  Except that leads to false positives when the caller passes
+ * an argument that is never null, and relies on the fact that the
+ * function doesn't yield then.  We can't know that in general.  But
+ * we do know in the common special case of command arguments.
+ */
+void
+make_stale_if_command_arg(char *arg)
+{
+    if (is_command_arg(arg))
+       ef_make_stale();
+}
+
 /*
  * XXX This whole mess should be redone; execute block should
  * start with "exec start", and should end with "exec end".
@@ -229,14 +260,16 @@ execute(void)
 
     while (!failed && status()) {
        player->nstat &= ~EXEC;
-       if (recvclient(buf, sizeof(buf)) < 0)
+       if (getcommand(buf) < 0)
            break;
        if (parse(buf, scanspace, player->argp, player->comtail,
                  &player->condarg, &redir) < 0) {
            failed = 1;
            continue;
        }
-       pr("\nExecute : %s\n", buf);
+       pr("\nExecute : ");
+       uprnf(buf);
+       pr("\n");
        if (redir) {
            pr("Execute : redirection not supported\n");
            failed = 1;