X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=7752a97f0d60cd56cbe36e9dd203f4ea293288e3;hp=9f3433128e905786daa526f5f1f017a687e04932;hb=b28e9205bb0d4ac98d591c6e506219438799d56c;hpb=1a14f999c1e810ffdf5c29fdbacb31161afd1b36

diff --git a/loaders.c b/loaders.c
index 9f343312..7752a97f 100644
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.14 2001/06/01 03:27:04 oes Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.17 2001/06/29 13:31:51 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -35,6 +35,18 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.14 2001/06/01 03:27:04 oes Exp $"
  *
  * Revisions   :
  *    $Log: loaders.c,v $
+ *    Revision 1.17  2001/06/29 13:31:51  oes
+ *    Various adaptions
+ *
+ *    Revision 1.16  2001/06/09 10:55:28  jongfoster
+ *    Changing BUFSIZ ==> BUFFER_SIZE
+ *
+ *    Revision 1.15  2001/06/07 23:14:14  jongfoster
+ *    Removing ACL and forward file loaders - these
+ *    files have been merged into the config file.
+ *    Cosmetic: Moving unloader funcs next to their
+ *    respective loader funcs
+ *
  *    Revision 1.14  2001/06/01 03:27:04  oes
  *    Fixed line continuation problem
  *
@@ -152,11 +164,6 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.14 2001/06/01 03:27:04 oes Exp $"
 #include "gateway.h"
 #include "actions.h"
 
-#ifndef SPLIT_PROXY_ARGS
-/* For strsav */
-#include "showargs.h"
-#endif /* ndef SPLIT_PROXY_ARGS */
-
 const char loaders_h_rcs[] = LOADERS_H_VERSION;
 
 /* Fix a problem with Solaris.  There should be no effect on other
@@ -257,6 +264,9 @@ void sweep(void)
          csp->next = ncsp->next;
 
          freez(ncsp->ip_addr_str);
+         freez(ncsp->my_ip_addr_str);
+         freez(ncsp->my_hostname);
+
 #ifdef TRUST_FILES
          freez(ncsp->referrer);
 #endif /* def TRUST_FILES */
@@ -359,7 +369,7 @@ int create_url_spec(struct url_spec * url, char * buf)
    if (url->path)
    {
       int errcode;
-      char rebuf[BUFSIZ];
+      char rebuf[BUFFER_SIZE];
 
       if (NULL == (url->preg = zalloc(sizeof(*url->preg))))
       {
@@ -374,14 +384,13 @@ int create_url_spec(struct url_spec * url, char * buf)
             (REG_EXTENDED|REG_NOSUB|REG_ICASE));
       if (errcode)
       {
-         size_t errlen =
-            regerror(errcode,
-               url->preg, buf, sizeof(buf));
+         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);
+            url->spec, buf);
 
          freez(url->spec);
          freez(url->path);
@@ -420,6 +429,7 @@ int create_url_spec(struct url_spec * url, char * buf)
    url->unanchored = tmp_url->unanchored;
 
    return 0; /* OK */
+
 }
 
 
@@ -543,6 +553,7 @@ int check_file_changed(const struct file_list * current,
 
    *newfl = fs;
    return 1;
+
 }
 
 
@@ -569,7 +580,7 @@ int check_file_changed(const struct file_list * current,
 char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
 {
    char *p, *q;
-   char linebuf[BUFSIZ];
+   char linebuf[BUFFER_SIZE];
    int contflag = 0;
 
    *buf = '\0';
@@ -628,7 +639,7 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
       if (contflag)
       {
          contflag = 0;
-			continue;
+   		continue;
       }
 
       /* Remove leading and trailing whitespace */         
@@ -664,7 +675,7 @@ static void unload_trustfile(void *f)
    struct block_spec *b = (struct block_spec *)f;
    if (b == NULL) return;
 
-   unload_trustfile(b->next);
+   unload_trustfile(b->next); /* Stack is cheap, isn't it? */
 
    free_url(b->url);
 
@@ -692,7 +703,7 @@ int load_trustfile(struct client_state *csp)
    struct block_spec *b, *bl;
    struct url_spec **tl;
 
-   char  buf[BUFSIZ], *p, *q;
+   char  buf[BUFFER_SIZE], *p, *q;
    int reject, trusted;
    struct file_list *fs;
 
@@ -832,18 +843,15 @@ load_trustfile_error:
  *********************************************************************/
 static void unload_re_filterfile(void *f)
 {
-   pcrs_job *joblist;
    struct re_filterfile_spec *b = (struct re_filterfile_spec *)f;
 
    if (b == NULL) return;
 
    destroy_list(b->patterns);
-
-   joblist = b->joblist;
-   while ( NULL != (joblist = pcrs_free_job(joblist)) ) {}
-
+   pcrs_free_joblist(b->joblist);
    freez(b);
 
+   return;
 }
 
 /*********************************************************************
@@ -867,7 +875,7 @@ int load_re_filterfile(struct client_state *csp)
    struct re_filterfile_spec *bl;
    struct file_list *fs;
 
-   char  buf[BUFSIZ];
+   char  buf[BUFFER_SIZE];
    int error;
    pcrs_job *dummy;
 
@@ -903,7 +911,7 @@ int load_re_filterfile(struct client_state *csp)
       enlist( bl->patterns, buf );
 
       /* We have a meaningful line -> make it a job */
-      if ((dummy = pcrs_make_job(buf, &error)) == NULL)
+      if ((dummy = pcrs_compile(buf, &error)) == NULL)
       {
          log_error(LOG_LEVEL_RE_FILTER, 
                "Adding re_filter job %s failed with error %d.", buf, error);