Remove extra semicolon.

[bsdgames-darwin.git] / battlestar / parse.c

diff --git a/battlestar/parse.c b/battlestar/parse.c
index 46a51a0bed33944b00022d89c417657b76d7edf0..60700bc3f029fa1e00f3dbd058ff910c29f9ef6e 100644 (file)
--- a/battlestar/parse.c
+++ b/battlestar/parse.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.9 2000/09/22 08:19:21 jsm Exp $    */
+/*     $NetBSD: parse.c,v 1.17 2020/02/06 22:09:43 fox Exp $   */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,14 +34,24 @@
 #if 0
 static char sccsid[] = "@(#)parse.c    8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: parse.c,v 1.9 2000/09/22 08:19:21 jsm Exp $");
+__RCSID("$NetBSD: parse.c,v 1.17 2020/02/06 22:09:43 fox Exp $");
 #endif
 #endif                         /* not lint */
 
 #include "extern.h"
 
+#define HASHSIZE       256
+#define HASHMUL                81
+#define HASHMASK       (HASHSIZE - 1)
+
+static int hash(const char *);
+static void install(struct wlist *);
+static struct wlist *lookup(const char *);
+
+static struct wlist *hashtab[HASHSIZE];
+
 void
-wordinit()
+wordinit(void)
 {
        struct wlist *w;
 
@@ -53,9 +59,8 @@ wordinit()
                install(w);
 }
 
-int
-hash(s)
-       const char   *s;
+static int
+hash(const char *s)
 {
        int     hashval = 0;
 
@@ -67,9 +72,8 @@ hash(s)
        return hashval;
 }
 
-struct wlist *
-lookup(s)
-       const char   *s;
+static struct wlist *
+lookup(const char   *s)
 {
        struct wlist *wp;
 
@@ -79,9 +83,8 @@ lookup(s)
        return NULL;
 }
 
-void
-install(wp)
-       struct wlist *wp;
+static void
+install(struct wlist *wp)
 {
        int     hashval;
 
@@ -94,7 +97,7 @@ install(wp)
 }
 
 void
-parse()
+parse(void)
 {
        struct wlist *wp;
        int     n;
@@ -117,7 +120,7 @@ parse()
                        for (i = n + 1; i < wordcount; i++) {
                                wordtype[i - 1] = wordtype[i];
                                wordvalue[i - 1] = wordvalue[i];
-                               strcpy(words[i - 1], words[i]);
+                               strlcpy(words[i - 1], words[i], WORDLEN);
                        }
                        wordcount--;
                }
@@ -137,7 +140,7 @@ parse()
                        for (i = n + 1; i < wordcount; i++) {
                                wordtype[i - 1] = wordtype[i];
                                wordvalue[i - 1] = wordvalue[i];
-                               strcpy(words[i - 1], words[i]);
+                               strlcpy(words[i - 1], words[i], WORDLEN);
                        }
                        wordcount--;
                }
@@ -145,33 +148,36 @@ parse()
        /* If there is a sequence (NOUN | OBJECT) AND EVERYTHING
         * then move all the EVERYTHINGs to the beginning, since that's where
         * they're expected.  We can't get rid of the NOUNs and OBJECTs in
-        * case they aren't in EVERYTHING (i.e. not here or nonexistant).
+        * case they aren't in EVERYTHING (i.e. not here or nonexistent).
         */
        flag = 1;
        while (flag) {
                flag = 0;
                for (n = 1; n < wordcount; n++)
-                       if ((wordtype[n - 1] == NOUNS || wordtype[n - 1] == OBJECT) &&
-                           wordvalue[n] == AND && wordvalue[n + 1] == EVERYTHING) {
+                       if ((wordtype[n - 1] == NOUNS || 
+                           wordtype[n - 1] == OBJECT) &&
+                           wordvalue[n] == AND && 
+                           wordvalue[n + 1] == EVERYTHING) {
                                char tmpword[WORDLEN];
                                wordvalue[n + 1] = wordvalue[n - 1];
                                wordvalue[n - 1] = EVERYTHING;
                                wordtype[n + 1] = wordtype[n - 1];
                                wordtype[n - 1] = OBJECT;
                                strcpy(tmpword, words[n - 1]);
-                               strcpy(words[n - 1], words[n + 1]);
+                               strlcpy(words[n - 1], words[n + 1], WORDLEN);
                                strcpy(words[n + 1], tmpword);
                                flag = 1;
                }
                /* And trim EVERYTHING AND EVERYTHING. */
                for (n = 1; n < wordcount; n++)
                        if (wordvalue[n - 1] == EVERYTHING &&
-                           wordvalue[n] == AND && wordvalue[n + 1] == EVERYTHING) {
+                           wordvalue[n] == AND && 
+                           wordvalue[n + 1] == EVERYTHING) {
                                int i;
                                for (i = n + 1; i < wordcount; i++) {
                                        wordtype[i - 1] = wordtype[i + 1];
                                        wordvalue[i - 1] = wordvalue[i + 1];
-                                       strcpy(words[i - 1], words[i + 1]);
+                                       strlcpy(words[i - 1], words[i + 1], WORDLEN);
                                }
                                wordcount--;
                                wordcount--;