Update copyright notice

[empserver] / src / lib / common / stmtch.c

diff --git a/src/lib/common/stmtch.c b/src/lib/common/stmtch.c
index 958a13abb3a98ff950d908cac96b71f9170c4343..351adb38b7e570d2d51ce56a0f77fc2f358c8126 100644 (file)
--- a/src/lib/common/stmtch.c
+++ b/src/lib/common/stmtch.c
@@ -1,11 +1,11 @@
 /*
  *  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,
@@ -14,69 +14,83 @@
  *  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.
  *
  *  ---
  *
  *  stmtch.c: Matching operations on structures and commands
- * 
+ *
  *  Known contributors to this file:
- *     
- */
-/*
- * XXX These routines gamble that structures are all longword-aligned.
- * If this is not true, they will BREAK!
+ *     Markus Armbruster, 2004-2010
  */
 
-#include "misc.h"
+#include <config.h>
+
 #include "match.h"
-#include "common.h"
 
 /*
- * find a matching string from a member string pointer
- * in a structure "str".  Pointer is incremented by
- * the (passed) size of the structure.
+ * 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.
+ * It ignores elements with an empty name.
+ * NEEDLE is compared to element names with mineq(NEEDLE, NAME).
+ * SIZE gives the size of an array element.
  */
 int
-stmtch(register s_char *obj, s_char *base, int off, int size)
+stmtch(char *needle, void *haystack, ptrdiff_t offs, size_t size)
 {
-       register s_char *str;
-       register int stat2;
-       register int i;
-       register int n;
+    int i, res;
+    char *name;
 
-       stat2 = M_NOTFOUND;
-       str = base + off;
-       for (i=0; *(s_char **)str; i++, str += size) {
-               if ((n = mineq(obj, *(s_char **)str)) == ME_MISMATCH)
-                       continue;
-               if (n == ME_EXACT)
-                       return i;
-               if (stat2 != M_NOTFOUND)
-                       return M_NOTUNIQUE;
-               stat2 = i;
+    res = M_NOTFOUND;
+    for (i = 0;; i++) {
+       name = *(char **)((char *)haystack + i * size + offs);
+       if (!name)
+           break;
+       if (!*name)
+           continue;
+       switch (mineq(needle, name)) {
+       case ME_MISMATCH:
+           break;
+       case ME_PARTIAL:
+           if (res == M_NOTFOUND)
+               res = i;
+           else
+               res = M_NOTUNIQUE;
+           break;
+       case ME_EXACT:
+           return i;
        }
-       return stat2;
+    }
+    return res;
 }
 
 /*
- * do partial match comparison.
+ * Compare A with B.
+ * Return ME_EXACT if they are the same, or A is a prefix of B
+ * followed by a space in B.
+ * Return ME_PARTIAL if A is a prefix of B not followed by a space.
+ * Else return ME_MISMATCH.
  */
 int
-mineq(register s_char *a, register s_char *b)
+mineq(char *a, char *b)
 {
-       do {
-               if (*a++ != *b++)
-                       return ME_MISMATCH;
-       } while (*b != ' ' && *a != 0);
-       if (*a == 0 && (*b == ' ' || *b == 0))
-               return ME_EXACT;
-       return ME_PARTIAL;
+    int i;
+
+    /* find common prefix: */
+    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;
+    return ME_PARTIAL;
 }