/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2013, 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/>.
*
* ---
*
- * 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.
*
* ---
*
* sarg.c: Parse selection arguments
- *
+ *
* Known contributors to this file:
* Dave Pare, 1989
+ * Markus Armbruster, 2004-2010
*/
+#include <config.h>
+
#include <ctype.h>
-#include <string.h>
+#include "file.h"
#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
#include "nat.h"
-#include "deity.h"
-#include "file.h"
+#include "nsc.h"
+#include "player.h"
#include "prototypes.h"
-#include "optlist.h"
+#include "xy.h"
/*
* returns one of
* #1, lx:ly,hx:hy --> NS_AREA
* @x,y:dist --> NS_DIST
* %d or %d/%d/%d --> NS_LIST
+ * ~ or letter --> NS_GROUP
* * --> NS_ALL
*
* or 0 for none of the above.
*/
-int
-sarg_type(s_char *ptr)
+enum ns_seltype
+sarg_type(char *str)
{
int c;
- c = *ptr;
+ c = *str;
if (c == '@')
return NS_DIST;
if (c == '*')
return NS_ALL;
- if (c == '#' || strchr(ptr, ',') != 0)
+ if (c == '#' || strchr(str, ','))
return NS_AREA;
if (isdigit(c))
return NS_LIST;
- if (c == '~' || isupper(c) || islower(c))
+ if (c == '~' || isalpha(c))
return NS_GROUP;
- return 0;
+ return NS_UNDEF;
}
int
-sarg_xy(s_char *ptr, coord *xp, coord *yp)
+sarg_xy(char *str, coord *xp, coord *yp)
{
- if (sarg_type(ptr) != NS_AREA)
- return 0;
- *xp = atoip(&ptr);
- if (*ptr++ != ',')
+ coord x, y;
+ struct natstr *np;
+
+ x = strtox(str, &str);
+ if (x < 0 || *str++ != ',')
return 0;
- if (!isdigit(*ptr) && *ptr != '-')
+ y = strtoy(str, &str);
+ if (y < 0 || (*str != 0 && !isspace(*str)))
return 0;
- *yp = atoi(ptr);
- inputxy(xp, yp, player->cnum);
- if ((*xp ^ *yp) & 01)
+ if ((x ^ y) & 1)
return 0;
+ np = getnatp(player->cnum);
+ *xp = xabs(np, x);
+ *yp = yabs(np, y);
return 1;
}
-/* returns absolute coords */
-static int
-sarg_getrange(s_char *buf, register struct range *rp)
+/*
+ * translate #1 or lx:ly,hx:hy into a result range struct
+ * returns absolute coords
+ */
+int
+sarg_area(char *str, struct range *rp)
{
- register int rlm;
- register int c;
+ long rlm;
struct natstr *np;
- s_char *bp;
+ struct realmstr realm;
+ char *end;
- bp = buf;
- c = *bp;
- if (c == '#') {
+ if (*str == '#') {
/*
* realm #X where (X > 0 && X < MAXNOR)
* Assumes realms are in abs coordinates
*/
- bp++;
- rlm = atoi(bp);
- if (rlm < 0 || rlm >= MAXNOR)
- return 0;
- np = getnatp(player->cnum);
- rp->lx = np->nat_b[rlm].b_xl;
- rp->hx = np->nat_b[rlm].b_xh;
- rp->ly = np->nat_b[rlm].b_yl;
- rp->hy = np->nat_b[rlm].b_yh;
+ if (*++str) {
+ rlm = strtol(str, &end, 10);
+ if (end == str || (*end != 0 && !isspace(*end))
+ || rlm < 0 || MAXNOR <= rlm)
+ return 0;
+ } else
+ rlm = 0;
+ getrealm(rlm, player->cnum, &realm);
+ rp->lx = realm.r_xl;
+ rp->hx = realm.r_xh;
+ rp->ly = realm.r_yl;
+ rp->hy = realm.r_yh;
} else {
/*
* full map specification
* LX:LY,HX:HY where
* ly, hy are optional.
*/
- if (!isdigit(c) && c != '-')
+ rp->lx = rp->hx = strtox(str, &str);
+ if (rp->lx < 0)
return 0;
- rp->lx = rp->hx = atoip(&bp);
- if (*bp == ':') {
- bp++;
- rp->hx = atoip(&bp);
+ if (*str == ':') {
+ rp->hx = strtox(str + 1, &str);
+ if (rp->hx < 0)
+ return 0;
}
- if (*bp++ != ',')
+ if (*str++ != ',')
return 0;
- if (!isdigit(c) && c != '-')
+ rp->ly = rp->hy = strtoy(str, &str);
+ if (rp->ly < 0)
return 0;
- rp->ly = rp->hy = atoip(&bp);
- if (*bp == ':') {
- bp++;
- rp->hy = atoip(&bp);
+ if (*str == ':') {
+ rp->hy = strtoy(str + 1, &str);
+ if (rp->hy < 0)
+ return 0;
}
- inputxy(&rp->lx, &rp->ly, player->cnum);
- inputxy(&rp->hx, &rp->hy, player->cnum);
+ if (*str != 0 && !isspace(*str))
+ return 0;
+ np = getnatp(player->cnum);
+ rp->lx = xabs(np, rp->lx);
+ rp->hx = xabs(np, rp->hx);
+ rp->ly = yabs(np, rp->ly);
+ rp->hy = yabs(np, rp->hy);
}
xysize_range(rp);
return 1;
}
-/*
- * translate #1 or lx:ly,hx:hy into
- * a result range struct
- */
-int
-sarg_area(s_char *buf, register struct range *rp)
-{
- if (!sarg_getrange(buf, rp))
- return 0;
- rp->hx += 1;
- if (rp->hx >= WORLD_X)
- rp->hx = 0;
- rp->hy += 1;
- if (rp->hy >= WORLD_Y)
- rp->hy = 0;
- xysize_range(rp);
- return 1;
-}
-
/*
* translate @x,y:int into
* result params
*/
int
-sarg_range(s_char *buf, coord *xp, coord *yp, int *dist)
+sarg_range(char *str, coord *xp, coord *yp, int *dist)
{
- s_char *bp;
+ coord x, y;
+ long d;
+ char *end;
+ struct natstr *np;
- bp = buf;
- if (bp == 0 || *bp == 0)
+ if (*str++ != '@')
return 0;
- if (*bp++ != '@')
+ x = strtox(str, &str);
+ if (x < 0 || *str++ != ',')
return 0;
- *xp = atoip(&bp);
- if (*bp++ != ',')
+ y = strtoy(str, &str);
+ if (y < 0 || *str++ != ':')
return 0;
- *yp = atoip(&bp);
- if (*bp++ != ':')
+ d = strtol(str, &end, 10);
+ if (end == str || (*end != 0 && !isspace(*end)) || d < 0)
return 0;
- inputxy(xp, yp, player->cnum);
- *dist = atoi(bp);
+ *dist = d;
+ np = getnatp(player->cnum);
+ *xp = xabs(np, x);
+ *yp = yabs(np, y);
return 1;
}
* list of idents; id/id/id/id/id
*/
int
-sarg_list(s_char *str, register int *list, int max)
+sarg_list(char *str, int *list, int max)
{
- register int i;
- register int j;
- register int n;
- s_char *arg;
+ int i, j;
+ long n;
+ char *end;
- arg = str;
- for (i = 0; i < max; i++) {
- if (!isdigit(*arg)) {
- pr("Illegal character '%c'\n", *arg);
+ i = 0;
+ do {
+ n = strtol(str, &end, 10);
+ if (end == str || n < 0) {
+ pr("Illegal character '%c'\n", *str);
return 0;
}
- n = atoip(&arg);
for (j = 0; j < i; j++) {
if (list[j] == n)
break;
}
- if (j != i) {
- /* duplicate; ignore */
- i--;
- } else
- list[i] = n;
- if (*arg == 0)
- break;
- if (*arg != '/') {
- pr("Expecting '/', got '%c'\n", *arg);
- return 0;
+ if (j == i) {
+ if (i >= max) {
+ pr("List too long (limit is %d)\n", max);
+ return 0;
+ }
+ list[i++] = n;
}
- arg++;
- if (*arg == 0)
- break;
+ str = end;
+ } while (*str++ == '/');
+
+ if (str[-1] != 0 && !isspace(str[-1])) {
+ pr("Expecting '/', got '%c'\n", str[-1]);
+ return 0;
}
- return i + 1;
+ return i;
}
projects / empserver / blobdiff