- Moved linked list support to new "list.c" file.

  Structure definitions are still in project.h,
  function prototypes are now in "list.h".
- Added support for "struct list_share", which is identical
  to "struct list" except it saves memory by not duplicating
  the strings.  Obviously, this only works if there is some
  other way of managing the memory used by the strings.
  (These list_share lists are used for lists which last
  for only 1 request, and where all the list entries are
  just coming directly from entries in the actionsfile.)
  Note that you still need to destroy list_share lists
  properly to free the nodes - it's only the strings
  which are shared.

diff --git a/list.c b/list.c
new file mode 100644 (file)
index 0000000..a44c0e9
--- /dev/null
+++ b/list.c
@@ -0,0 +1,603 @@
+const char list_rcs[] = "$Id: list.c,v NOT CHECKED IN $";
+/*********************************************************************
+ *
+ * File        :  $Source: /cvsroot/ijbswa/current/list.c,v $
+ *
+ * Purpose     :  Declares functions to handle lists.
+ *                Functions declared include:
+ *                   `destroy_list', `enlist' and `list_to_text'
+ *
+ * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
+ *                IJBSWA team.  http://ijbswa.sourceforge.net
+ *
+ *                Based on the Internet Junkbuster originally written
+ *                by and Copyright (C) 1997 Anonymous Coders and 
+ *                Junkbusters Corporation.  http://www.junkbusters.com
+ *
+ *                This program is free software; you can redistribute it 
+ *                and/or modify it under the terms of the GNU General
+ *                Public License as published by the Free Software
+ *                Foundation; either version 2 of the License, or (at
+ *                your option) any later version.
+ *
+ *                This program is distributed in the hope that it will
+ *                be useful, but WITHOUT ANY WARRANTY; without even the
+ *                implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *                PARTICULAR PURPOSE.  See the GNU General Public
+ *                License for more details.
+ *
+ *                The GNU General Public License should be included with
+ *                this file.  If not, you can view it at
+ *                http://www.gnu.org/copyleft/gpl.html
+ *                or write to the Free Software Foundation, Inc., 59
+ *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * Revisions   :
+ *    $Log: list.c,v $
+ *
+ *********************************************************************/
+\f
+
+#include "config.h"
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
+#include "project.h"
+#include "jcc.h"
+#include "list.h"
+#include "miscutil.h"
+
+const char list_h_rcs[] = LIST_H_VERSION;
+
+/*********************************************************************
+ *
+ * Function    :  enlist
+ *
+ * Description :  Append a string into a specified string list.
+ *
+ * Parameters  :
+ *          1  :  header = pointer to list 'dummy' header
+ *          2  :  str = string to add to the list (maybe NULL)
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void enlist(struct list *header, const char *str)
+{
+   struct list *cur = (struct list *)malloc(sizeof(*cur));
+   struct list *last;
+
+   if (cur)
+   {
+      cur->str  = (str ? strdup(str) : NULL);
+      cur->next = NULL;
+
+      last = header->last;
+      if (last == NULL)
+      {
+         last = header;
+      }
+
+      last->next   = cur;
+      header->last = cur;
+   }
+
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  enlist_unique
+ *
+ * Description :  Append a string into a specified string list,
+ *                if & only if it's not there already.
+ *
+ * Parameters  :
+ *          1  :  header = pointer to list 'dummy' header
+ *          2  :  str = string to add to the list (maybe NULL)
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void enlist_unique(struct list *header, const char *str)
+{
+   struct list *last;
+   struct list *cur = header->next;
+
+   while (cur != NULL)
+   {
+      if ((cur->str != NULL) && (0 == strcmp(str, cur->str)))
+      {
+         /* Already there */
+         return;
+      }
+      cur = cur->next;
+   }
+
+   cur = (struct list *)malloc(sizeof(*cur));
+
+   if (cur != NULL)
+   {
+      cur->str  = (str ? strdup(str) : NULL); /* FIXME check retval */
+      cur->next = NULL;
+
+      last = header->last;
+      if (last == NULL)
+      {
+         last = header;
+      }
+      last->next   = cur;
+      header->last = cur;
+   }
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  destroy_list
+ *
+ * Description :  Destroy a string list (opposite of enlist)
+ *
+ * Parameters  :
+ *          1  :  header = pointer to list 'dummy' header
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void destroy_list(struct list *header)
+{
+   struct list *p, *n;
+
+   for (p = header->next; p ; p = n)
+   {
+      n = p->next;
+      freez(p->str);
+      free(p);
+   }
+
+   memset(header, '\0', sizeof(*header));
+
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  list_to_text
+ *
+ * Description :  "Flaten" a string list into 1 long \r\n delimited string.
+ *
+ * Parameters  :
+ *          1  :  h = pointer to list 'dummy' header
+ *
+ * Returns     :  NULL on malloc error, else new long string.
+ *
+ *********************************************************************/
+char *list_to_text(struct list *h)
+{
+   struct list *p;
+   char *ret = NULL;
+   char *s;
+   int size;
+
+   size = 0;
+
+   for (p = h->next; p ; p = p->next)
+   {
+      if (p->str)
+      {
+         size += strlen(p->str) + 2;
+      }
+   }
+
+   if ((ret = (char *)malloc(size + 1)) == NULL)
+   {
+      return(NULL);
+   }
+
+   ret[size] = '\0';
+
+   s = ret;
+
+   for (p = h->next; p ; p = p->next)
+   {
+      if (p->str)
+      {
+         strcpy(s, p->str);
+         s += strlen(s);
+         *s++ = '\r'; *s++ = '\n';
+      }
+   }
+
+   return(ret);
+
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  list_remove_item
+ *
+ * Description :  Remove a string from a specified string list.
+ *
+ * Parameters  :
+ *          1  :  header = pointer to list 'dummy' header
+ *          2  :  str = string to remove from the list
+ *
+ * Returns     :  Number of times it was removed.
+ *
+ *********************************************************************/
+int list_remove_item(struct list *header, const char *str)
+{
+   struct list *prev = header;
+   struct list *cur = prev->next;
+   int count = 0;
+
+   while (cur != NULL)
+   {
+      if ((cur->str != NULL) && (0 == strcmp(str, cur->str)))
+      {
+         count++;
+
+         prev->next = cur->next;
+         free(cur->str);
+         free(cur);
+      }
+      else
+      {
+         prev = cur;
+      }
+      cur = prev->next;
+   }
+
+   header->last = prev;
+
+   return count;
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  list_remove_list
+ *
+ * Description :  Remove all strings in one list from another list.
+ *                This is currently a brute-force algorithm
+ *                (it compares every pair of strings).
+ *
+ * Parameters  :
+ *          1  :  dest = list to change
+ *          2  :  src = list of strings to remove
+ *
+ * Returns     :  Total number of strings removed.
+ *
+ *********************************************************************/
+int list_remove_list(struct list *dest, const struct list *src)
+{
+   struct list *cur = src->next;
+   int count = 0;
+
+   while (cur != NULL)
+   {
+      if (cur->str != NULL)
+      {
+         count += list_remove_item(dest, cur->str);
+      }
+      cur = cur->next;
+   }
+
+   return count;
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  list_duplicate
+ *
+ * Description :  Duplicate a string list
+ *
+ * Parameters  :
+ *          1  :  dest = pointer to destination for copy.  Caller allocs.
+ *          2  :  src = pointer to source for copy.
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void list_duplicate(struct list *dest, const struct list *src)
+{
+   struct list * cur_src = src->next;
+   struct list * cur_dest = dest;
+
+   memset(dest, '\0', sizeof(*dest));
+
+   while (cur_src)
+   {
+      cur_dest = cur_dest->next = (struct list *)zalloc(sizeof(*cur_dest));
+      if (cur_dest == NULL)
+      {
+         return;
+      }
+      cur_dest->str = strdup(cur_src->str);
+      cur_src = cur_src->next;
+   }
+
+   dest->last = cur_dest;
+
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  list_append_list_unique
+ *
+ * Description :  Append a string list to another list
+ *
+ * Parameters  :
+ *          1  :  dest = pointer to destination for merge.  Caller allocs.
+ *          2  :  src = pointer to source for merge.
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void list_append_list_unique(struct list *dest, const struct list *src)
+{
+   struct list * cur = src->next;
+
+   while (cur)
+   {
+      enlist_unique(dest, cur->str);
+      cur = cur->next;
+   }
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  destroy_list_share
+ *
+ * Description :  Destroy a string list (opposite of enlist)
+ *
+ * Parameters  :
+ *          1  :  h = pointer to list 'dummy' header
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void destroy_list_share(struct list_share *h)
+{
+   struct list_share *p, *n;
+
+   for (p = h->next; p ; p = n)
+   {
+      n = p->next;
+      free(p);
+   }
+
+   memset(h, '\0', sizeof(*h));
+
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  enlist_share
+ *
+ * Description :  Append a string into a specified string list.
+ *
+ * Parameters  :
+ *          1  :  header = pointer to list 'dummy' header
+ *          2  :  str = string to add to the list (maybe NULL)
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void enlist_share(struct list_share *header, const char *str)
+{
+   struct list_share *cur = (struct list_share *)malloc(sizeof(*cur));
+   struct list_share *last;
+
+   if (cur)
+   {
+      cur->str  = (str ? strdup(str) : NULL);
+      cur->next = NULL;
+
+      last = header->last;
+      if (last == NULL)
+      {
+         last = header;
+      }
+
+      last->next   = cur;
+      header->last = cur;
+   }
+
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  enlist_unique_share
+ *
+ * Description :  Append a string into a specified string list,
+ *                if & only if it's not there already.
+ *
+ * Parameters  :
+ *          1  :  header = pointer to list 'dummy' header
+ *          2  :  str = string to add to the list (maybe NULL)
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void enlist_unique_share(struct list_share *header, const char *str)
+{
+   struct list_share *last;
+   struct list_share *cur = header->next;
+
+   while (cur != NULL)
+   {
+      if ((cur->str != NULL) && (0 == strcmp(str, cur->str)))
+      {
+         /* Already there */
+         return;
+      }
+      cur = cur->next;
+   }
+
+   cur = (struct list_share *)malloc(sizeof(*cur));
+
+   if (cur != NULL)
+   {
+      cur->str  = str;
+      cur->next = NULL;
+
+      last = header->last;
+      if (last == NULL)
+      {
+         last = header;
+      }
+      last->next   = cur;
+      header->last = cur;
+   }
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  list_append_list_unique_share
+ *
+ * Description :  Append a string list to another list
+ *
+ * Parameters  :
+ *          1  :  dest = pointer to destination for merge.  Caller allocs.
+ *          2  :  src = pointer to source for merge.
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void list_append_list_unique_share(struct list_share *dest, const struct list *src)
+{
+   struct list * cur = src->next;
+
+   while (cur)
+   {
+      enlist_unique_share(dest, cur->str);
+      cur = cur->next;
+   }
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  list_remove_item_share
+ *
+ * Description :  Remove a string from a specified string list.
+ *
+ * Parameters  :
+ *          1  :  header = pointer to list 'dummy' header
+ *          2  :  str = string to remove from the list
+ *
+ * Returns     :  Number of times it was removed.
+ *
+ *********************************************************************/
+int list_remove_item_share(struct list_share *header, const char *str)
+{
+   struct list_share *prev = header;
+   struct list_share *cur = prev->next;
+   int count = 0;
+
+   while (cur != NULL)
+   {
+      if ((cur->str != NULL) && (0 == strcmp(str, cur->str)))
+      {
+         count++;
+
+         prev->next = cur->next;
+         free(cur);
+      }
+      else
+      {
+         prev = cur;
+      }
+      cur = prev->next;
+   }
+
+   header->last = prev;
+
+   return count;
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  list_remove_list_share
+ *
+ * Description :  Remove all strings in one list from another list.
+ *                This is currently a brute-force algorithm
+ *                (it compares every pair of strings).
+ *
+ * Parameters  :
+ *          1  :  dest = list to change
+ *          2  :  src = list of strings to remove
+ *
+ * Returns     :  Total number of strings removed.
+ *
+ *********************************************************************/
+int list_remove_list_share(struct list_share *dest, const struct list *src)
+{
+   struct list *cur = src->next;
+   int count = 0;
+
+   while (cur != NULL)
+   {
+      if (cur->str != NULL)
+      {
+         count += list_remove_item_share(dest, cur->str);
+      }
+      cur = cur->next;
+   }
+
+   return count;
+}
+
+
+/*********************************************************************
+ *
+ * Function    :  list_duplicate_share
+ *
+ * Description :  Duplicate a string list
+ *
+ * Parameters  :
+ *          1  :  dest = pointer to destination for copy.  Caller allocs.
+ *          2  :  src = pointer to source for copy.
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void list_duplicate_share(struct list_share *dest, const struct list *src)
+{
+   struct list * cur_src = src->next;
+   struct list_share * cur_dest = dest;
+
+   memset(dest, '\0', sizeof(*dest));
+
+   while (cur_src)
+   {
+      cur_dest = cur_dest->next = (struct list_share *)zalloc(sizeof(*cur_dest));
+      if (cur_dest == NULL)
+      {
+         return;
+      }
+      cur_dest->str = cur_src->str;
+      cur_src = cur_src->next;
+   }
+
+   dest->last = cur_dest;
+
+}
+

diff --git a/list.h b/list.h
new file mode 100644 (file)
index 0000000..5a6ea13
--- /dev/null
+++ b/list.h
@@ -0,0 +1,84 @@
+#ifndef _LIST_H
+#define _LIST_H
+#define LIST_H_VERSION "$Id: list.h,v NOT CHECKED IN YET $"
+/*********************************************************************
+ *
+ * File        :  $Source: /cvsroot/ijbswa/current/list.c,v $
+ *
+ * Purpose     :  Declares functions to handle lists.
+ *                Functions declared include:
+ *                   `destroy_list', `enlist' and `list_to_text'
+ *
+ * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
+ *                IJBSWA team.  http://ijbswa.sourceforge.net
+ *
+ *                Based on the Internet Junkbuster originally written
+ *                by and Copyright (C) 1997 Anonymous Coders and 
+ *                Junkbusters Corporation.  http://www.junkbusters.com
+ *
+ *                This program is free software; you can redistribute it 
+ *                and/or modify it under the terms of the GNU General
+ *                Public License as published by the Free Software
+ *                Foundation; either version 2 of the License, or (at
+ *                your option) any later version.
+ *
+ *                This program is distributed in the hope that it will
+ *                be useful, but WITHOUT ANY WARRANTY; without even the
+ *                implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *                PARTICULAR PURPOSE.  See the GNU General Public
+ *                License for more details.
+ *
+ *                The GNU General Public License should be included with
+ *                this file.  If not, you can view it at
+ *                http://www.gnu.org/copyleft/gpl.html
+ *                or write to the Free Software Foundation, Inc., 59
+ *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * Revisions   :
+ *    $Log: list.c,v $
+ *
+ *********************************************************************/
+\f
+
+#include "project.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern void enlist(struct list *h, const char *s);
+extern void destroy_list(struct list *h);
+extern char *list_to_text(struct list *h);
+
+void enlist_unique(struct list *header, const char *str);
+
+int list_remove_item(struct list *header, const char *str);
+int list_remove_list(struct list *header, const struct list *to_remove);
+
+void list_duplicate(struct list *dest, const struct list *src);
+void list_append_list_unique(struct list *dest, const struct list *src);
+
+void destroy_list_share(struct list_share *h);
+void enlist_share(struct list_share *header, const char *str);
+void enlist_unique_share(struct list_share *header, const char *str);
+int list_remove_item_share(struct list_share *header, const char *str);
+int list_remove_list_share(struct list_share *dest, const struct list *src);
+void list_duplicate_share(struct list_share *dest, const struct list *src);
+void list_append_list_unique_share(struct list_share *dest, const struct list *src);
+
+/* Revision control strings from this header and associated .c file */
+extern const char list_rcs[];
+extern const char list_h_rcs[];
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* ndef _LIST_H */
+
+/*
+  Local Variables:
+  tab-width: 3
+  end:
+*/