Update copyright notice

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

diff --git a/src/lib/common/stmtch.c b/src/lib/common/stmtch.c
index f94233e033a87db046563d96b52f8b09fb125840..6e4ed98096ab376831a95f115e063ad143ad534d 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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,33 +19,29 @@
  *
  *  ---
  *
- *  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-2008
  */
 
-#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
@@ -55,14 +51,15 @@ stmtch(char *needle, void *haystack, ptrdiff_t offs, size_t elt_size)
     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)
-               return M_NOTUNIQUE;
-           res = i;
+           if (res == M_NOTFOUND)
+               res = i;
+           else
+               res = M_NOTUNIQUE;
            break;
        case ME_EXACT:
            return i;
@@ -73,12 +70,11 @@ stmtch(char *needle, void *haystack, ptrdiff_t offs, size_t elt_size)
 }
 
 /*
- * 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(char *a, char *b)
@@ -86,7 +82,7 @@ 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;