/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, 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,
* 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/>.
*
* ---
*
* ---
*
* name.c: Name a ship
- *
+ *
* Known contributors to this file:
* Jeff Bailey
*/
#include <config.h>
#include "commands.h"
-#include "optlist.h"
-#include "path.h"
#include "ship.h"
/*
struct nstr_item nb;
char buf[1024];
- 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 {