Update copyright notice

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

diff --git a/src/lib/common/stmtch.c b/src/lib/common/stmtch.c
index bcb4fefe4c96945f9e9ba034eff87a5c913318d8..0f018713c5c9b93b209233f0329b445a6835a42b 100644 (file)
--- a/src/lib/common/stmtch.c
+++ b/src/lib/common/stmtch.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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
@@ -19,68 +19,69 @@
  *
  *  ---
  *
- *  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
  */
 
-#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 or empty.
+ * NEEDLE is compared to element names with mineq(NEEDLE, NAME).
+ * ELT_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 elt_size)
 {
-    register s_char *str;
-    register int stat2;
-    register int i;
-    register int n;
+#define ELT_NAME(i) (*(char **)((char *)haystack + (i)*elt_size + offs))
+    int i, res;
 
-    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)
+    res = M_NOTFOUND;
+    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 >= 0)
+               return M_NOTUNIQUE;
+           res = i;
+           break;
+       case ME_EXACT:
            return i;
-       if (stat2 != M_NOTFOUND)
-           return M_NOTUNIQUE;
-       stat2 = i;
+       }
     }
-    return stat2;
+    return res;
+#undef ELT_NAME
 }
 
 /*
- * Compare A with B, up to the first space in B.
- * Return ME_EXACT if they are the same.
- * Return ME_PARTIAL if A is a prefix of B.
+ * 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.
- * Note: May read B beyond the first space, but not beyond a
- * terminating 0.
  */
 int
-mineq(register s_char *a, register s_char *b)
+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;