Added support for linking with POSIX threads library

[privoxy.git] / loaders.c

diff --git a/loaders.c b/loaders.c
index fb22579..8ce3c06 100644 (file)
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.16 2001/06/09 10:55:28 jongfoster Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.18 2001/06/29 21:45:41 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -35,6 +35,12 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.16 2001/06/09 10:55:28 jongfoster
  *
  * Revisions   :
  *    $Log: loaders.c,v $
+ *    Revision 1.18  2001/06/29 21:45:41  oes
+ *    Indentation, CRLF->LF, Tab-> Space
+ *
+ *    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
  *
@@ -161,11 +167,6 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.16 2001/06/09 10:55:28 jongfoster
 #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
@@ -187,9 +188,8 @@ const char loaders_h_rcs[] = LOADERS_H_VERSION;
 static struct file_list *current_trustfile      = NULL;
 #endif /* def TRUST_FILES */
 
-#ifdef PCRS
 static struct file_list *current_re_filterfile  = NULL;
-#endif /* def PCRS */
+
 
 
 /*********************************************************************
@@ -245,12 +245,10 @@ void sweep(void)
             ncsp->actions_list->active = 1;
          }
 
-#ifdef PCRS
-         if (ncsp->rlist)     /* perl re files */
+         if (ncsp->rlist)     /* pcrsjob files */
          {
             ncsp->rlist->active = 1;
          }
-#endif /* def PCRS */
 
 #ifdef TRUST_FILES
          if (ncsp->tlist)     /* trust files */
@@ -386,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);
@@ -432,6 +429,7 @@ int create_url_spec(struct url_spec * url, char * buf)
    url->unanchored = tmp_url->unanchored;
 
    return 0; /* OK */
+
 }
 
 
@@ -555,6 +553,7 @@ int check_file_changed(const struct file_list * current,
 
    *newfl = fs;
    return 1;
+
 }
 
 
@@ -640,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 */         
@@ -676,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);
 
@@ -829,7 +828,6 @@ load_trustfile_error:
 #endif /* def TRUST_FILES */
 
 
-#ifdef PCRS
 /*********************************************************************
  *
  * Function    :  unload_re_filterfile
@@ -849,11 +847,10 @@ static void unload_re_filterfile(void *f)
    if (b == NULL) return;
 
    destroy_list(b->patterns);
-
    pcrs_free_joblist(b->joblist);
-
    freez(b);
 
+   return;
 }
 
 /*********************************************************************
@@ -959,7 +956,6 @@ load_re_filterfile_error:
    return(-1);
 
 }
-#endif /* def PCRS */
 
 
 /*********************************************************************