COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / client / tags.c

diff --git a/src/client/tags.c b/src/client/tags.c
index f6fb8abecb4f2c677f0b2dcf995280e86230f54a..e6a2d720cc2a4a6704da3bfb5c542c4066d214a5 100644 (file)
--- a/src/client/tags.c
+++ b/src/client/tags.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-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.
  *
  *  ---
  *
@@ -32,58 +32,49 @@
  *     John Yockey, 1998
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "tags.h"
 
+#include <stdlib.h>
 #include <stdio.h>
-
-#ifdef Rel4
 #include <string.h>
-#endif /* Rel4 */
-
 #if !defined(_WIN32)
 #include <unistd.h>
 #endif
 
 struct tagstruct *taglist;
-s_char buf[4096];
-u_short tagnum;
-s_char exec[8];
-
-void free();
 
 void
-io_init()
+io_init(void)
 {
-       taglist = NULL;
-       buf[0] = 0;
-       tagnum = 0;
-       sprintf(exec,"execute");
+    taglist = NULL;
 }
 
-s_char *
-gettag(p)
-       s_char *p;
+char *
+gettag(char *p)
 {
-       struct tagstruct *tag1,*tag2;
+    struct tagstruct *tag1, *tag2;
 
-       if (taglist == NULL) return NULL;
-       tag1 = taglist;
-       if (!strncmp(tag1->item,p,strlen(tag1->item))) {
-               p = tag1->item;
-               taglist = taglist->next;
-               free(tag1);
-               return p;
-       }
-       while (tag1->next != NULL) {
-               tag2 = tag1->next;
-               if (!strncmp(tag2->item,p,strlen(tag2->item))) {
-                       p = tag2->item;
-                       tag1->next = tag2->next;
-                       free(tag2);
-                       return p;
-               }
-               tag1 = tag1->next;
-       }
+    if (taglist == NULL)
        return NULL;
+    tag1 = taglist;
+    if (!strncmp(tag1->item, p, strlen(tag1->item))) {
+       p = tag1->item;
+       taglist = taglist->next;
+       free(tag1);
+       return p;
+    }
+    while (tag1->next != NULL) {
+       tag2 = tag1->next;
+       if (!strncmp(tag2->item, p, strlen(tag2->item))) {
+           p = tag2->item;
+           tag1->next = tag2->next;
+           free(tag2);
+           return p;
+       }
+       tag1 = tag1->next;
+    }
+    return NULL;
 }