launch name trade: Check for getstarg() failure immediately

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

diff --git a/src/lib/commands/name.c b/src/lib/commands/name.c
index 8a01326dbce92316080bf9d6dd61f1a5a642c78f..0db67e81eb3997a2629dba85c93901c31ffac343 100644 (file)
--- a/src/lib/commands/name.c
+++ b/src/lib/commands/name.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, 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,31 +14,26 @@
  *  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.
  *
  *  ---
  *
  *  name.c: Name a ship
- * 
+ *
  *  Known contributors to this file:
  *     Jeff Bailey
  */
 
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "nsc.h"
-#include "file.h"
-#include "path.h"
+#include <config.h>
+
 #include "commands.h"
-#include "optlist.h"
+#include "ship.h"
 
 /*
  * name <SHIP> <NAME>
@@ -47,24 +42,20 @@ int
 name(void)
 {
     struct shpstr ship;
-    s_char *p;
+    char *p;
     struct nstr_item nb;
-    s_char buf[1024];
+    char buf[1024];
 
-    if (!opt_SHIPNAMES) {
-       pr("Ship naming is not enabled.\n");
-       return RET_FAIL;
-    }
-    if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
+    if (!snxtitem(&nb, EF_SHIP, player->argp[1], NULL))
        return RET_SYN;
     while (nxtitem(&nb, &ship)) {
        if (!player->owner)
            continue;
        p = getstarg(player->argp[2], "Name? ", buf);
+       if (!p || !*p)
+           return RET_SYN;
        if (!check_ship_ok(&ship))
            return RET_FAIL;
-       if (p == 0 || *p == 0)
-           return RET_SYN;
        if (!strcmp(p, "~")) {
            ship.shp_name[0] = 0;
        } else {