X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=bcc76c1677e230234ca04bb2f1e23b7c6a3e8ca0;hp=5767ee2e08a0f964a1ceea53bfb1bd08d880356b;hb=1412a743dc787f574eb4ee48a74923387df74cfa;hpb=87a69fc505def6be1c8a4d24ae225c3623b5e861

diff --git a/loaders.c b/loaders.c
index 5767ee2e..bcc76c16 100644
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.2 2001/05/17 23:01:01 oes Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.7 2001/05/26 00:28:36 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -35,6 +35,40 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.2 2001/05/17 23:01:01 oes Exp $";
  *
  * Revisions   :
  *    $Log: loaders.c,v $
+ *    Revision 1.7  2001/05/26 00:28:36  jongfoster
+ *    Automatic reloading of config file.
+ *    Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32).
+ *    Most of the global variables have been moved to a new
+ *    struct configuration_spec, accessed through csp->config->globalname
+ *    Most of the globals remaining are used by the Win32 GUI.
+ *
+ *    Revision 1.6  2001/05/23 12:27:33  oes
+ *
+ *    Fixed ugly indentation of my last changes
+ *
+ *    Revision 1.5  2001/05/23 10:39:05  oes
+ *    - Added support for escaping the comment character
+ *      in config files by a backslash
+ *    - Added support for line continuation in config
+ *      files
+ *    - Fixed a buffer overflow bug with long config lines
+ *
+ *    Revision 1.4  2001/05/22 18:56:28  oes
+ *    CRLF -> LF
+ *
+ *    Revision 1.3  2001/05/20 01:21:20  jongfoster
+ *    Version 2.9.4 checkin.
+ *    - Merged popupfile and cookiefile, and added control over PCRS
+ *      filtering, in new "permissionsfile".
+ *    - Implemented LOG_LEVEL_FATAL, so that if there is a configuration
+ *      file error you now get a message box (in the Win32 GUI) rather
+ *      than the program exiting with no explanation.
+ *    - Made killpopup use the PCRS MIME-type checking and HTTP-header
+ *      skipping.
+ *    - Removed tabs from "config"
+ *    - Moved duplicated url parsing code in "loaders.c" to a new funcition.
+ *    - Bumped up version number.
+ *
  *    Revision 1.2  2001/05/17 23:01:01  oes
  *     - Cleaned CRLF's from the sources and related files
  *
@@ -88,10 +122,6 @@ const char loaders_h_rcs[] = LOADERS_H_VERSION;
 #define ijb_isspace(__X) isspace((int)(unsigned char)(__X))
 
 
-#define NLOADERS 8
-static int (*loaders[NLOADERS])(struct client_state *);
-
-
 /*
  * Currently active files.
  * These are also entered in the main linked list of files.
@@ -115,10 +145,10 @@ static struct file_list *current_trustfile      = NULL;
 #ifdef PCRS
 static struct file_list *current_re_filterfile  = NULL;
 #endif /* def PCRS */
-
-
-static int create_url_spec(struct url_spec * url, char * buf);
-
+
+
+static int create_url_spec(struct url_spec * url, char * buf);
+
 
 /*********************************************************************
  *
@@ -161,6 +191,13 @@ void sweep(void)
       {
          /* mark this client's files as active */
 
+         /*
+          * Always have a configuration file.
+          * (Also note the slightly non-standard extra
+          * indirection here.)
+          */
+         ncsp->config->config_file_list->active = 1;
+
          if (ncsp->blist)     /* block files */
          {
             ncsp->blist->active = 1;
@@ -254,125 +291,125 @@ void sweep(void)
 }
 
 
-/*********************************************************************
- *
- * Function    :  create_url_spec
- *
- * Description :  Creates a "url_spec" structure from a string.
- *                When finished, free with unload_url().
- *
- * Parameters  :
- *          1  :  url = Target url_spec to be filled in.  Must be
- *                      zeroed out before the call (e.g. using zalloc).
- *          2  :  buf = Source pattern, null terminated.  NOTE: The
- *                      contents of this buffer are destroyed by this
- *                      function.  If this function succeeds, the
- *                      buffer is copied to url->spec.  If this
- *                      function fails, the contents of the buffer
- *                      are lost forever.
- *
- * Returns     :  0 => Ok, everything else is an error.
- *
- *********************************************************************/
-static int create_url_spec(struct url_spec * url, char * buf)
-{
-   char *p;
-   struct url_spec tmp_url[1];
-
-   /* paranoia - should never happen. */
-   if ((url == NULL) || (buf == NULL))
-   {
-      return 1;
-   }
-
-   /* save a copy of the orignal specification */
-   if ((url->spec = strdup(buf)) == NULL)
-   {
-      return 1;
-   }
-
-   if ((p = strchr(buf, '/')))
-   {
-      if (NULL == (url->path = strdup(p)))
-      {
-         freez(url->spec);
-         return 1;
-      }
-      url->pathlen = strlen(url->path);
-      *p = '\0';
-   }
-   else
-   {
-      url->path    = NULL;
-      url->pathlen = 0;
-   }
-#ifdef REGEX
-   if (url->path)
-   {
-      int errcode;
-      char rebuf[BUFSIZ];
-
-      if (NULL == (url->preg = zalloc(sizeof(*url->preg))))
-      {
-         freez(url->spec);
-         freez(url->path);
-         return 1;
-      }
-
-      sprintf(rebuf, "^(%s)", url->path);
-
-      errcode = regcomp(url->preg, rebuf,
-            (REG_EXTENDED|REG_NOSUB|REG_ICASE));
-      if (errcode)
-      {
-         size_t errlen =
-            regerror(errcode,
-               url->preg, buf, sizeof(buf));
-
-         buf[errlen] = '\0';
-
-         log_error(LOG_LEVEL_ERROR, "error compiling %s: %s",
-                 url->spec, buf);
-
-         freez(url->spec);
-         freez(url->path);
-         freez(url->preg);
-
-         return 1;
-      }
-   }
-#endif
-   if ((p = strchr(buf, ':')) == NULL)
-   {
-      url->port = 0;
-   }
-   else
-   {
-      *p++ = '\0';
-      url->port = atoi(p);
-   }
-
-   if ((url->domain = strdup(buf)) == NULL)
-   {
-      freez(url->spec);
-      freez(url->path);
-#ifdef REGEX
-      freez(url->preg);
-#endif /* def REGEX */
-      return 1;
-   }
-
-   /* split domain into components */
-
-   *tmp_url = dsplit(url->domain);
-   url->dbuf = tmp_url->dbuf;
-   url->dcnt = tmp_url->dcnt;
-   url->dvec = tmp_url->dvec;
-
-   return 0; /* OK */
-}
-
-
+/*********************************************************************
+ *
+ * Function    :  create_url_spec
+ *
+ * Description :  Creates a "url_spec" structure from a string.
+ *                When finished, free with unload_url().
+ *
+ * Parameters  :
+ *          1  :  url = Target url_spec to be filled in.  Must be
+ *                      zeroed out before the call (e.g. using zalloc).
+ *          2  :  buf = Source pattern, null terminated.  NOTE: The
+ *                      contents of this buffer are destroyed by this
+ *                      function.  If this function succeeds, the
+ *                      buffer is copied to url->spec.  If this
+ *                      function fails, the contents of the buffer
+ *                      are lost forever.
+ *
+ * Returns     :  0 => Ok, everything else is an error.
+ *
+ *********************************************************************/
+static int create_url_spec(struct url_spec * url, char * buf)
+{
+   char *p;
+   struct url_spec tmp_url[1];
+
+   /* paranoia - should never happen. */
+   if ((url == NULL) || (buf == NULL))
+   {
+      return 1;
+   }
+
+   /* save a copy of the orignal specification */
+   if ((url->spec = strdup(buf)) == NULL)
+   {
+      return 1;
+   }
+
+   if ((p = strchr(buf, '/')))
+   {
+      if (NULL == (url->path = strdup(p)))
+      {
+         freez(url->spec);
+         return 1;
+      }
+      url->pathlen = strlen(url->path);
+      *p = '\0';
+   }
+   else
+   {
+      url->path    = NULL;
+      url->pathlen = 0;
+   }
+#ifdef REGEX
+   if (url->path)
+   {
+      int errcode;
+      char rebuf[BUFSIZ];
+
+      if (NULL == (url->preg = zalloc(sizeof(*url->preg))))
+      {
+         freez(url->spec);
+         freez(url->path);
+         return 1;
+      }
+
+      sprintf(rebuf, "^(%s)", url->path);
+
+      errcode = regcomp(url->preg, rebuf,
+            (REG_EXTENDED|REG_NOSUB|REG_ICASE));
+      if (errcode)
+      {
+         size_t errlen =
+            regerror(errcode,
+               url->preg, buf, sizeof(buf));
+
+         buf[errlen] = '\0';
+
+         log_error(LOG_LEVEL_ERROR, "error compiling %s: %s",
+                 url->spec, buf);
+
+         freez(url->spec);
+         freez(url->path);
+         freez(url->preg);
+
+         return 1;
+      }
+   }
+#endif
+   if ((p = strchr(buf, ':')) == NULL)
+   {
+      url->port = 0;
+   }
+   else
+   {
+      *p++ = '\0';
+      url->port = atoi(p);
+   }
+
+   if ((url->domain = strdup(buf)) == NULL)
+   {
+      freez(url->spec);
+      freez(url->path);
+#ifdef REGEX
+      freez(url->preg);
+#endif /* def REGEX */
+      return 1;
+   }
+
+   /* split domain into components */
+
+   *tmp_url = dsplit(url->domain);
+   url->dbuf = tmp_url->dbuf;
+   url->dcnt = tmp_url->dcnt;
+   url->dvec = tmp_url->dvec;
+
+   return 0; /* OK */
+}
+
+
 /*********************************************************************
  *
  * Function    :  unload_url
@@ -492,22 +529,22 @@ static void unload_imagefile(void *f)
  * Description :  Unloads a permissions file.
  *
  * Parameters  :
- *          1  :  file_data = the data structure associated with the
+ *          1  :  file_data = the data structure associated with the
  *                            permissions file.
  *
  * Returns     :  N/A
  *
  *********************************************************************/
 static void unload_permissions_file(void *file_data)
-{
+{
    struct permissions_spec * next;
    struct permissions_spec * cur = (struct permissions_spec *)file_data;
-   while (cur != NULL)
-   {
+   while (cur != NULL)
+   {
       next = cur->next;
       unload_url(cur->url);
-      freez(cur);
-      cur = next;
+      freez(cur);
+      cur = next;
    }
 
 }
@@ -630,9 +667,9 @@ static void unload_re_filterfile(void *f)
  *                On error: 1 and sets newfl == NULL
  *
  *********************************************************************/
-static int check_file_changed(const struct file_list * current,
-                              const char * filename,
-                              struct file_list ** newfl)
+int check_file_changed(const struct file_list * current,
+                       const char * filename,
+                       struct file_list ** newfl)
 {
    struct file_list *fs;
    struct stat statbuf[1];
@@ -696,8 +733,9 @@ static int check_file_changed(const struct file_list * current,
  * Function    :  read_config_line
  *
  * Description :  Read a single non-empty line from a file and return
- *                it.  Trims comments, leading and trailing whitespace.
- *                Also wites the file to fs->proxy_args.
+ *                it.  Trims comments, leading and trailing whitespace
+ *                and respects escaping of newline and comment char.
+ *                Also writes the file to fs->proxy_args.
  *
  * Parameters  :
  *          1  :  buf = Buffer to use.
@@ -714,6 +752,9 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
 {
    char *p, *q;
    char linebuf[BUFSIZ];
+   int contflag = 0;
+
+   *buf = '\0';
 
    while (fgets(linebuf, sizeof(linebuf), fp))
    {
@@ -730,17 +771,40 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
       }
 #endif /* ndef SPLIT_PROXY_ARGS */
 
-      /* Trim off newline and any comment */
-      if ((p = strpbrk(linebuf, "\r\n#")) != NULL)
+      /* Trim off newline */
+      if ((p = strpbrk(linebuf, "\r\n")) != NULL)
+      {
+         *p = '\0';
+      }
+
+      /* Line continuation? Trim escape and set flag. */
+      if ((p != linebuf) && (*--p == '\\'))
       {
+         contflag = 1;
          *p = '\0';
       }
+
+      /* If there's a comment char.. */
+      if ((p = strpbrk(linebuf, "#")) != NULL)
+      {
+         /* ..and it's escaped, left-shift the line over the escape. */
+         if ((p != linebuf) && (*(p-1) == '\\'))
+         {
+            q = p-1;
+            while ((*q++ = *p++) != '\0') /* nop */;
+         }
+         /* Else, chop off the rest of the line */
+         else
+         {
+            *p = '\0';
+         }
+      }
       
       /* Trim leading whitespace */
       p = linebuf;
       while (*p && ijb_isspace(*p))
       {
-         *p++;
+         p++;
       }
 
       if (*p)
@@ -775,8 +839,16 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
          /* More paranoia.  This if statement is always true. */
          if (*linebuf)
          {
-            strcpy(buf, linebuf);
-            return buf;
+            strncat(buf, linebuf, buflen - strlen(buf));
+            if (contflag)
+            {
+               contflag = 0;
+               continue;
+            }
+            else
+            {
+               return buf;
+            }
          }
       }
    }
@@ -807,7 +879,7 @@ int load_aclfile(struct client_state *csp)
    struct access_control_list *a, *bl;
    struct file_list *fs;
 
-   if (!check_file_changed(current_aclfile, aclfile, &fs))
+   if (!check_file_changed(current_aclfile, csp->config->aclfile, &fs))
    {
       /* No need to load */
       if (csp)
@@ -829,7 +901,7 @@ int load_aclfile(struct client_state *csp)
       goto load_aclfile_error;
    }
 
-   fp = fopen(aclfile, "r");
+   fp = fopen(csp->config->aclfile, "r");
 
    if (fp == NULL)
    {
@@ -916,7 +988,8 @@ int load_aclfile(struct client_state *csp)
    return(0);
 
 load_aclfile_error:
-   log_error(LOG_LEVEL_ERROR, "can't load access control list %s: %E", aclfile);
+   log_error(LOG_LEVEL_ERROR, "can't load access control list %s: %E",
+             csp->config->aclfile);
    return(-1);
 
 }
@@ -944,7 +1017,7 @@ int load_blockfile(struct client_state *csp)
    int reject;
    struct file_list *fs;
 
-   if (!check_file_changed(current_blockfile, blockfile, &fs))
+   if (!check_file_changed(current_blockfile, csp->config->blockfile, &fs))
    {
       /* No need to load */
       if (csp)
@@ -964,7 +1037,7 @@ int load_blockfile(struct client_state *csp)
       goto load_blockfile_error;
    }
 
-   if ((fp = fopen(blockfile, "r")) == NULL)
+   if ((fp = fopen(csp->config->blockfile, "r")) == NULL)
    {
       goto load_blockfile_error;
    }
@@ -1002,13 +1075,13 @@ int load_blockfile(struct client_state *csp)
       bl->next = b;
 
       b->reject = reject;
-
-      /* Save the URL pattern */
-      if (create_url_spec(b->url, buf))
-      {
-         fclose(fp);
-         goto load_blockfile_error;
-      }
+
+      /* Save the URL pattern */
+      if (create_url_spec(b->url, buf))
+      {
+         fclose(fp);
+         goto load_blockfile_error;
+      }
    }
 
    fclose(fp);
@@ -1038,7 +1111,7 @@ int load_blockfile(struct client_state *csp)
    return(0);
 
 load_blockfile_error:
-   log_error(LOG_LEVEL_ERROR, "can't load blockfile '%s': %E", blockfile);
+   log_error(LOG_LEVEL_ERROR, "can't load blockfile '%s': %E", csp->config->blockfile);
    return(-1);
 
 }
@@ -1066,7 +1139,7 @@ int load_imagefile(struct client_state *csp)
    int reject;
    struct file_list *fs;
 
-   if (!check_file_changed(current_imagefile, imagefile, &fs))
+   if (!check_file_changed(current_imagefile, csp->config->imagefile, &fs))
    {
       /* No need to load */
       if (csp)
@@ -1086,7 +1159,7 @@ int load_imagefile(struct client_state *csp)
       goto load_imagefile_error;
    }
 
-   if ((fp = fopen(imagefile, "r")) == NULL)
+   if ((fp = fopen(csp->config->imagefile, "r")) == NULL)
    {
       goto load_imagefile_error;
    }
@@ -1122,17 +1195,17 @@ int load_imagefile(struct client_state *csp)
       /* add it to the list */
       b->next  = bl->next;
       bl->next = b;
-
-      b->reject = reject;
 
-      /* Save the URL pattern */
-      if (create_url_spec(b->url, buf))
+      b->reject = reject;
+
+      /* Save the URL pattern */
+      if (create_url_spec(b->url, buf))
       {
          fclose(fp);
          goto load_imagefile_error;
       }
    }
-
+
    fclose(fp);
 
 #ifndef SPLIT_PROXY_ARGS
@@ -1160,18 +1233,18 @@ int load_imagefile(struct client_state *csp)
    return(0);
 
 load_imagefile_error:
-   log_error(LOG_LEVEL_ERROR, "can't load imagefile '%s': %E", imagefile);
+   log_error(LOG_LEVEL_ERROR, "can't load imagefile '%s': %E", csp->config->imagefile);
    return(-1);
 
 }
 #endif /* def USE_IMAGE_LIST */
 
-
+
 /*********************************************************************
  *
  * Function    :  load_permissions_file
  *
- * Description :  Read and parse a permissions file and add to files
+ * Description :  Read and parse a permissions file and add to files
  *                list.
  *
  * Parameters  :
@@ -1187,10 +1260,10 @@ int load_permissions_file(struct client_state *csp)
    struct permissions_spec *b, *bl;
    char  buf[BUFSIZ], *p, *q;
    int permissions;
-   struct file_list *fs;
+   struct file_list *fs;
    int i;
 
-   if (!check_file_changed(current_permissions_file, permissions_file, &fs))
+   if (!check_file_changed(current_permissions_file, csp->config->permissions_file, &fs))
    {
       /* No need to load */
       if (csp)
@@ -1210,82 +1283,82 @@ int load_permissions_file(struct client_state *csp)
       goto load_permissions_error;
    }
 
-   if ((fp = fopen(permissions_file, "r")) == NULL)
+   if ((fp = fopen(csp->config->permissions_file, "r")) == NULL)
    {
       goto load_permissions_error;
-   }
+   }
 
-
-   /*
-    * default_permissions is set in this file.
-    *
-    * Reset it to default first.
-    */
-   default_permissions = PERMIT_RE_FILTER;
+
+   /*
+    * default_permissions is set in this file.
+    *
+    * Reset it to default first.
+    */
+   csp->config->default_permissions = PERMIT_RE_FILTER;
 
    while (read_config_line(buf, sizeof(buf), fp, fs) != NULL)
    {
-      p = buf;
-
-      permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS;
-
-      /*
-       * FIXME: for() loop is a kludge.  Want to loop around until we
-       * find a non-control character.  Assume there will be at most 4
-       * characters.
-       */
-      for (i = 0; i < 4; i++)
-      {
+      p = buf;
+
+      permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS;
+
+      /*
+       * FIXME: for() loop is a kludge.  Want to loop around until we
+       * find a non-control character.  Assume there will be at most 4
+       * characters.
+       */
+      for (i = 0; i < 4; i++)
+      {
          switch ((int)*p)
          {
-            case '>':
-               /*
-                * Allow cookies to be read by the server, but do
-                * not allow them to be set.
-                */
+            case '>':
+               /*
+                * Allow cookies to be read by the server, but do
+                * not allow them to be set.
+                */
                permissions = (permissions & ~PERMIT_COOKIE_SET);
                p++;
                break;
 
             case '<':
-               /*
-                * Allow server to set cookies but do not let the
-                * server read them.
-                */
-               permissions = (permissions & ~PERMIT_COOKIE_READ);
+               /*
+                * Allow server to set cookies but do not let the
+                * server read them.
+                */
+               permissions = (permissions & ~PERMIT_COOKIE_READ);
                p++;
                break;
 
-            case '^':
-               /*
-                * Block popups
-                */
-               permissions = (permissions & ~PERMIT_POPUPS);
-               p++;
-               break;
-
-            case '%':
-               /*
-                * Permit filtering using PCRS
-                */
-               permissions = (permissions | PERMIT_RE_FILTER);
-               p++;
-               break;
-
-            case '~':
-               /*
-                * All of the above (maximum filtering).
+            case '^':
+               /*
+                * Block popups
+                */
+               permissions = (permissions & ~PERMIT_POPUPS);
+               p++;
+               break;
+
+            case '%':
+               /*
+                * Permit filtering using PCRS
                 */
-               permissions = PERMIT_RE_FILTER;
+               permissions = (permissions | PERMIT_RE_FILTER);
                p++;
                break;
 
-            default:
-               /*
-                * FIXME: Should break out of the loop here.
+            case '~':
+               /*
+                * All of the above (maximum filtering).
                 */
+               permissions = PERMIT_RE_FILTER;
+               p++;
                break;
-         }
+
+            default:
+               /*
+                * FIXME: Should break out of the loop here.
+                */
+               break;
+         }
       }
 
       /*
@@ -1293,18 +1366,18 @@ int load_permissions_file(struct client_state *csp)
        * front of the pattern
        */
       q = buf;
-      if (p > q)
-      {
+      if (p > q)
+      {
          while ((*q++ = *p++) != '\0')
          {
             /* nop */
-         }
+         }
       }
 
       /* a lines containing only "special" chars sets default */
       if (*buf == '\0')
-      {
-         default_permissions = permissions;
+      {
+         csp->config->default_permissions = permissions;
          continue;
       }
 
@@ -1319,13 +1392,13 @@ int load_permissions_file(struct client_state *csp)
       /* add it to the list */
       b->next  = bl->next;
       bl->next = b;
-
+
       /* Save flags */
-      b->permissions = permissions;
-
-      /* Save the URL pattern */
-      if (create_url_spec(b->url, buf))
-      {
+      b->permissions = permissions;
+
+      /* Save the URL pattern */
+      if (create_url_spec(b->url, buf))
+      {
          fclose(fp);
          goto load_permissions_error;
       }
@@ -1358,7 +1431,8 @@ int load_permissions_file(struct client_state *csp)
    return(0);
 
 load_permissions_error:
-   log_error(LOG_LEVEL_ERROR, "can't load permissions file '%s': %E", permissions_file);
+   log_error(LOG_LEVEL_ERROR, "can't load permissions file '%s': %E",
+             csp->config->permissions_file);
    return(-1);
 
 }
@@ -1388,7 +1462,7 @@ int load_trustfile(struct client_state *csp)
    int reject, trusted;
    struct file_list *fs;
 
-   if (!check_file_changed(current_trustfile, trustfile, &fs))
+   if (!check_file_changed(current_trustfile, csp->config->trustfile, &fs))
    {
       /* No need to load */
       if (csp)
@@ -1408,12 +1482,12 @@ int load_trustfile(struct client_state *csp)
       goto load_trustfile_error;
    }
 
-   if ((fp = fopen(trustfile, "r")) == NULL)
+   if ((fp = fopen(csp->config->trustfile, "r")) == NULL)
    {
       goto load_trustfile_error;
    }
 
-   tl = trust_list;
+   tl = csp->config->trust_list;
 
    while (read_config_line(buf, sizeof(buf), fp, fs) != NULL)
    {
@@ -1456,8 +1530,8 @@ int load_trustfile(struct client_state *csp)
 
       b->reject = reject;
 
-      /* Save the URL pattern */
-      if (create_url_spec(b->url, buf))
+      /* Save the URL pattern */
+      if (create_url_spec(b->url, buf))
       {
          fclose(fp);
          goto load_trustfile_error;
@@ -1501,7 +1575,8 @@ int load_trustfile(struct client_state *csp)
    return(0);
 
 load_trustfile_error:
-   log_error(LOG_LEVEL_ERROR, "can't load trustfile '%s': %E", trustfile);
+   log_error(LOG_LEVEL_ERROR, "can't load trustfile '%s': %E",
+             csp->config->trustfile);
    return(-1);
 
 }
@@ -1527,12 +1602,11 @@ int load_forwardfile(struct client_state *csp)
    struct forward_spec *b, *bl;
    char  buf[BUFSIZ], *p, *q, *tmp;
    char  *vec[4];
-   int port, n, reject;
+   int n, reject;
    struct file_list *fs;
    const struct gateway *gw;
-   struct url_spec url[1];
 
-   if (!check_file_changed(current_forwardfile, forwardfile, &fs))
+   if (!check_file_changed(current_forwardfile, csp->config->forwardfile, &fs))
    {
       /* No need to load */
       if (csp)
@@ -1553,7 +1627,7 @@ int load_forwardfile(struct client_state *csp)
       goto load_forwardfile_error;
    }
 
-   if ((fp = fopen(forwardfile, "r")) == NULL)
+   if ((fp = fopen(csp->config->forwardfile, "r")) == NULL)
    {
       goto load_forwardfile_error;
    }
@@ -1597,9 +1671,6 @@ int load_forwardfile(struct client_state *csp)
 
       /* allocate a new node */
       if (((b = zalloc(sizeof(*b))) == NULL)
-#ifdef REGEX
-      || ((b->url->preg = zalloc(sizeof(*b->url->preg))) == NULL)
-#endif
       )
       {
          fclose(fp);
@@ -1610,77 +1681,14 @@ int load_forwardfile(struct client_state *csp)
       b->next  = bl->next;
       bl->next = b;
 
-      /* save a copy of the orignal specification */
-      if ((b->url->spec = strdup(buf)) == NULL)
-      {
-         fclose(fp);
-         goto load_forwardfile_error;
-      }
-
-      b->reject = reject;
-
-      if ((p = strchr(buf, '/')))
-      {
-         b->url->path    = strdup(p);
-         b->url->pathlen = strlen(b->url->path);
-         *p = '\0';
-      }
-      else
-      {
-         b->url->path    = NULL;
-         b->url->pathlen = 0;
-      }
-#ifdef REGEX
-      if (b->url->path)
-      {
-         int errcode;
-         char rebuf[BUFSIZ];
-
-         sprintf(rebuf, "^(%s)", b->url->path);
-
-         errcode = regcomp(b->url->preg, rebuf,
-               (REG_EXTENDED|REG_NOSUB|REG_ICASE));
-
-         if (errcode)
-         {
-            size_t errlen = regerror(errcode, b->url->preg, buf, sizeof(buf));
-
-            buf[errlen] = '\0';
-
-            log_error(LOG_LEVEL_ERROR, "error compiling %s: %s",
-                    b->url->spec, buf);
-            fclose(fp);
-            goto load_forwardfile_error;
-         }
-      }
-      else
-      {
-         freez(b->url->preg);
-      }
-#endif
-      if ((p = strchr(buf, ':')) == NULL)
-      {
-         port = 0;
-      }
-      else
-      {
-         *p++ = '\0';
-         port = atoi(p);
-      }
-
-      b->url->port = port;
-
-      if ((b->url->domain = strdup(buf)) == NULL)
-      {
-         fclose(fp);
-         goto load_forwardfile_error;
-      }
-
-      /* split domain into components */
-      *url = dsplit(b->url->domain);
-      b->url->dbuf = url->dbuf;
-      b->url->dcnt = url->dcnt;
-      b->url->dvec = url->dvec;
+      b->reject = reject;
+
+      /* Save the URL pattern */
+      if (create_url_spec(b->url, buf))
+      {
+         fclose(fp);
+         goto load_forwardfile_error;
+      }
 
       /* now parse the gateway specs */
 
@@ -1770,7 +1778,8 @@ int load_forwardfile(struct client_state *csp)
    return(0);
 
 load_forwardfile_error:
-   log_error(LOG_LEVEL_ERROR, "can't load forwardfile '%s': %E", forwardfile);
+   log_error(LOG_LEVEL_ERROR, "can't load forwardfile '%s': %E",
+             csp->config->forwardfile);
    return(-1);
 
 }
@@ -1802,7 +1811,7 @@ int load_re_filterfile(struct client_state *csp)
    int error;
    pcrs_job *dummy;
 
-   if (!check_file_changed(current_re_filterfile, re_filterfile, &fs))
+   if (!check_file_changed(current_re_filterfile, csp->config->re_filterfile, &fs))
    {
       /* No need to load */
       if (csp)
@@ -1823,7 +1832,7 @@ int load_re_filterfile(struct client_state *csp)
    }
 
    /* Open the file or fail */
-   if ((fp = fopen(re_filterfile, "r")) == NULL)
+   if ((fp = fopen(csp->config->re_filterfile, "r")) == NULL)
    {
       goto load_re_filterfile_error;
    }
@@ -1875,7 +1884,8 @@ int load_re_filterfile(struct client_state *csp)
    return( 0 );
 
 load_re_filterfile_error:
-   log_error(LOG_LEVEL_ERROR, "can't load re_filterfile '%s': %E", re_filterfile);
+   log_error(LOG_LEVEL_ERROR, "can't load re_filterfile '%s': %E", 
+             csp->config->re_filterfile);
    return(-1);
 
 }
@@ -1892,19 +1902,21 @@ load_re_filterfile_error:
  * Parameters  :
  *          1  :  loader = pointer to a function that can parse and load
  *                the appropriate config file.
+ *          2  :  config = The configuration_spec to add the loader to.
  *
  * Returns     :  N/A
  *
  *********************************************************************/
-void add_loader(int (*loader)(struct client_state *))
+void add_loader(int (*loader)(struct client_state *), 
+                struct configuration_spec * config)
 {
    int i;
 
    for (i=0; i < NLOADERS; i++)
    {
-      if (loaders[i] == NULL)
+      if (config->loaders[i] == NULL)
       {
-         loaders[i] = loader;
+         config->loaders[i] = loader;
          break;
       }
    }
@@ -1923,6 +1935,8 @@ void add_loader(int (*loader)(struct client_state *))
  *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
+ *                      Must be non-null.  Reads: "csp->config"
+ *                      Writes: various data members.
  *
  * Returns     :  0 => Ok, everything else is an error.
  *
@@ -1934,34 +1948,17 @@ int run_loader(struct client_state *csp)
 
    for (i=0; i < NLOADERS; i++)
    {
-      if (loaders[i] == NULL)
+      if (csp->config->loaders[i] == NULL)
       {
          break;
       }
-      ret |= (loaders[i])(csp);
+      ret |= (csp->config->loaders[i])(csp);
    }
    return(ret);
 
 }
 
 
-/*********************************************************************
- *
- * Function    :  remove_all_loaders
- *
- * Description :  Remove all loaders from the list.
- *
- * Parameters  :  N/A
- *
- * Returns     :  N/A
- *
- *********************************************************************/
-void remove_all_loaders(void)
-{
-   memset( loaders, 0, sizeof( loaders ) );
-}
-
-
 /*
   Local Variables:
   tab-width: 3