/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
* stmtch.c: Matching operations on structures and commands
*
* Known contributors to this file:
- *
+ * Markus Armbruster, 2004
*/
-#include "misc.h"
+#include <config.h>
+
#include "match.h"
-#include "common.h"
/*
- * Find NEEDLE in array HAYSTACK[], return its index.
+ * Find element named NEEDLE in array HAYSTACK[], return its index.
* Return M_NOTFOUND if there are no matches, M_NOTUNIQUE if there are
* several.
* Each array element has a pointer to its name stored at offset OFFS.
- * Search stops when this name is a null pointer or empty. NEEDLE is
- * compared to element names with mineq(NEEDLE, NAME).
+ * Search stops when this name is a null pointer or empty.
+ * NEEDLE is compared to element names with mineq(NEEDLE, NAME).
* ELT_SIZE gives the size of an array element.
*/
int
int i, res;
res = M_NOTFOUND;
- for (i = 0; ELT_NAME(i) && ELT_NAME(i)[0] != 0; ++i) {
+ for (i = 0; ELT_NAME(i) && ELT_NAME(i)[0] != 0; i++) {
switch (mineq(needle, ELT_NAME(i))) {
case ME_MISMATCH:
break;
case ME_PARTIAL:
- if (res != M_NOTFOUND)
+ if (res >= 0)
return M_NOTUNIQUE;
res = i;
break;
/*
* Compare A with B.
* Return ME_EXACT if they are the same, or A is a prefix of B
- * followed by a space.
+ * followed by a space in B.
* Return ME_PARTIAL if A is a prefix of B not followed by a space.
- * Else return ME_NOMATCH.
+ * Else return ME_MISMATCH.
*/
int
mineq(char *a, char *b)
int i;
/* find common prefix: */
- for (i = 0; a[i] != 0 && a[i] == b[i]; ++i) ;
+ for (i = 0; a[i] != 0 && a[i] == b[i]; i++) ;
if (a[i] != 0) return ME_MISMATCH;
if (b[i] == 0 || b[i] == ' ') return ME_EXACT;