Synthetic commit for tag v_2_9_7

[privoxy.git] / loaders.c

diff --git a/loaders.c b/loaders.c
index c54569d..577a653 100644 (file)
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.24 2001/07/30 22:08:36 jongfoster Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.22 2001/07/20 15:16:17 haroon Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -35,15 +35,6 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.24 2001/07/30 22:08:36 jongfoster
  *
  * Revisions   :
  *    $Log: loaders.c,v $
- *    Revision 1.24  2001/07/30 22:08:36  jongfoster
- *    Tidying up #defines:
- *    - All feature #defines are now of the form FEATURE_xxx
- *    - Permanently turned off WIN_GUI_EDIT
- *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
- *
- *    Revision 1.23  2001/07/20 15:51:54  oes
- *    Fixed indentation of prepocessor commands
- *
  *    Revision 1.22  2001/07/20 15:16:17  haroon
  *    - per Guy's suggestion, added a while loop in sweep() to catch not just
  *      the last inactive CSP but all other consecutive inactive CSPs after that
@@ -208,9 +199,9 @@ const char loaders_h_rcs[] = LOADERS_H_VERSION;
  * These are also entered in the main linked list of files.
  */
 
-#ifdef FEATURE_TRUST
+#ifdef TRUST_FILES
 static struct file_list *current_trustfile      = NULL;
-#endif /* def FEATURE_TRUST */
+#endif /* def TRUST_FILES */
 
 static struct file_list *current_re_filterfile  = NULL;
 
@@ -274,12 +265,12 @@ void sweep(void)
             ncsp->rlist->active = 1;
          }
 
-#ifdef FEATURE_TRUST
+#ifdef TRUST_FILES
          if (ncsp->tlist)     /* trust files */
          {
             ncsp->tlist->active = 1;
          }
-#endif /* def FEATURE_TRUST */
+#endif /* def TRUST_FILES */
 
       }
       else
@@ -297,9 +288,9 @@ void sweep(void)
             freez(ncsp->my_ip_addr_str);
             freez(ncsp->my_hostname);
    
-#ifdef FEATURE_TRUST
+#ifdef TRUST_FILES
             freez(ncsp->referrer);
-#endif /* def FEATURE_TRUST */
+#endif /* def TRUST_FILES */
             freez(ncsp->x_forwarded);
             freez(ncsp->iob->buf);
    
@@ -310,13 +301,13 @@ void sweep(void)
    
             free_current_action(ncsp->action);
    
-#ifdef FEATURE_STATISTICS
+#ifdef STATISTICS
             urls_read++;
             if (ncsp->rejected)
             {
                urls_rejected++;
             }
-#endif /* def FEATURE_STATISTICS */
+#endif /* def STATISTICS */
    
             freez(ncsp);
             
@@ -335,6 +326,10 @@ void sweep(void)
 
          (nfl->unloader)(nfl->f);
 
+#ifndef SPLIT_PROXY_ARGS
+         freez(nfl->proxy_args);
+#endif /* ndef SPLIT_PROXY_ARGS */
+
          freez(nfl->filename);
 
          freez(nfl);
@@ -516,7 +511,10 @@ void free_url(struct url_spec *url)
  *                           This will be set to NULL, OR a struct
  *                           file_list newly allocated on the
  *                           heap, with the filename and lastmodified
- *                           fields filled, and all others zeroed.
+ *                           fields filled, standard header giving file
+ *                           name in proxy_args, and all others zeroed.
+ *                           (proxy_args is only filled in if !defined
+ *                           SPLIT_PROXY_ARGS and !suppress_blocklists).
  *
  * Returns     :  If file unchanged: 0 (and sets newfl == NULL)
  *                If file changed: 1 and sets newfl != NULL
@@ -563,6 +561,21 @@ int check_file_changed(const struct file_list * current,
       return 1;
    }
 
+#ifndef SPLIT_PROXY_ARGS
+   if (!suppress_blocklists)
+   {
+      char * p = html_encode(filename);
+      if (p)
+      {
+         fs->proxy_args = strsav(fs->proxy_args, "<h2>The file `");
+         fs->proxy_args = strsav(fs->proxy_args, p);
+         fs->proxy_args = strsav(fs->proxy_args, 
+            "' contains the following patterns</h2>\n");
+         freez(p);
+      }
+      fs->proxy_args = strsav(fs->proxy_args, "<pre>");
+   }
+#endif /* ndef SPLIT_PROXY_ARGS */
 
    *newfl = fs;
    return 1;
@@ -600,6 +613,19 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
 
    while (fgets(linebuf, sizeof(linebuf), fp))
    {
+#ifndef SPLIT_PROXY_ARGS
+      if (fs && !suppress_blocklists)
+      {
+         char *html_line = html_encode(linebuf);
+         if (html_line != NULL)
+         {
+            fs->proxy_args = strsav(fs->proxy_args, html_line);
+            freez(html_line);
+         }
+         fs->proxy_args = strsav(fs->proxy_args, "<br>");
+      }
+#endif /* ndef SPLIT_PROXY_ARGS */
+
       /* Trim off newline */
       if ((p = strpbrk(linebuf, "\r\n")) != NULL)
       {
@@ -661,7 +687,7 @@ char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
 }
 
 
-#ifdef FEATURE_TRUST
+#ifdef TRUST_FILES
 /*********************************************************************
  *
  * Function    :  unload_trustfile
@@ -799,6 +825,13 @@ int load_trustfile(struct client_state *csp)
 
    fclose(fp);
 
+#ifndef SPLIT_PROXY_ARGS
+   if (!suppress_blocklists)
+   {
+      fs->proxy_args = strsav(fs->proxy_args, "</pre>");
+   }
+#endif /* ndef SPLIT_PROXY_ARGS */
+
    /* the old one is now obsolete */
    if (current_trustfile)
    {
@@ -822,7 +855,7 @@ load_trustfile_error:
    return(-1);
 
 }
-#endif /* def FEATURE_TRUST */
+#endif /* def TRUST_FILES */
 
 
 /*********************************************************************
@@ -841,10 +874,7 @@ static void unload_re_filterfile(void *f)
 {
    struct re_filterfile_spec *b = (struct re_filterfile_spec *)f;
 
-   if (b == NULL)
-   {
-      return;
-   }
+   if (b == NULL) return;
 
    destroy_list(b->patterns);
    pcrs_free_joblist(b->joblist);
@@ -926,6 +956,13 @@ int load_re_filterfile(struct client_state *csp)
 
    fclose(fp);
 
+#ifndef SPLIT_PROXY_ARGS
+   if (!suppress_blocklists)
+   {
+      fs->proxy_args = strsav(fs->proxy_args, "</pre>");
+   }
+#endif /* ndef SPLIT_PROXY_ARGS */
+
    /* the old one is now obsolete */
    if ( NULL != current_re_filterfile )
    {