COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / subs / mtch.c

diff --git a/src/lib/subs/mtch.c b/src/lib/subs/mtch.c
index 31ceda051595d346b0663cf993207a65c21dbd56..566ae9a117bf2f6ab73171b4be1e1a19b948c492 100644 (file)
--- a/src/lib/subs/mtch.c
+++ b/src/lib/subs/mtch.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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -30,10 +30,8 @@
  *  Known contributors to this file:
  *     (List known contributors to this file)
  */
-/*
- * XXX These routines gamble that structures are all longword-aligned.
- * If this is not true, they will BREAK!
- */
+
+#include <config.h>
 
 #include "misc.h"
 #include "player.h"
@@ -42,47 +40,34 @@
 #include "prototypes.h"
 
 /*
- * find a matching integer from a member of a structure.
- * Inspired by stmtch above.
+ * Search for COMMAND in COMS[], return its index.
+ * Return M_NOTFOUND if there are no matches, M_NOTUNIQUE if there are
+ * several, M_IGNORE if the command should be ignored.
+ * Ignore commands that require more permissions than COMSTAT.
  */
 int
-intmatch(register int value, register int *ptr, int size)
-{
-    register int i;
-
-    size /= sizeof(*ptr);
-    for (i = 0; *ptr; i++, ptr += size)
-       if (value == *ptr)
-           return i;
-    return -1;
-}
-
-/*
- * find a matching command from coms[].  Return status is:
- *  >= 0: match found, value is array entry in coms[]
- */
-int
-comtch(register s_char *command, struct cmndstr *coms, int comstat,
-       int god)
+comtch(register s_char *command, struct cmndstr *coms, int comstat)
 {
     register struct cmndstr *com;
     register int status;
-    register int i;
 
     if (command == 0 || *command == 0)
        return M_IGNORE;
     status = M_NOTFOUND;
     for (com = coms; com->c_form != 0; com++) {
-       if ((com->c_permit & comstat) != com->c_permit && !god)
-           continue;
-       if ((i = mineq(command, com->c_form)) == ME_MISMATCH)
+       if ((com->c_permit & comstat) != com->c_permit)
            continue;
-       if (i == ME_EXACT)
+       switch (mineq(command, com->c_form)) {
+       case ME_MISMATCH:
+           break;
+       case ME_PARTIAL:
+           if (status >= 0)
+               return M_NOTUNIQUE;
+           status = com - coms;
+           break;
+       case ME_EXACT:
            return com - coms;
-       /* partial */
-       if (status != M_NOTFOUND)
-           return M_NOTUNIQUE;
-       status = com - coms;
+       }
     }
 
     return status;