-const char loaders_rcs[] = "$Id: loaders.c,v 1.27 2001/09/22 16:36:59 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 $
*
* Revisions :
* $Log: loaders.c,v $
- * Revision 1.27 2001/09/22 16:36:59 jongfoster
- * Removing unused parameter fs from read_config_line()
- *
- * Revision 1.26 2001/09/22 14:05:22 jongfoster
- * Bugfix: Multiple escaped "#" characters in a configuration
- * file are now permitted.
- * Also removing 3 unused headers.
- *
- * Revision 1.25 2001/09/13 22:44:03 jongfoster
- * Adding {} to an if statement
- *
- * 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
#include "project.h"
#include "list.h"
#include "loaders.h"
+#include "encode.h"
#include "filters.h"
#include "parsers.h"
#include "jcc.h"
+#include "ssplit.h"
#include "miscutil.h"
#include "errlog.h"
+#include "gateway.h"
#include "actions.h"
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;
for (csp = clients; csp && (ncsp = csp->next) ; csp = csp->next)
{
- if (ncsp->flags & CSP_FLAG_ACTIVE)
+ if (ncsp->active)
{
/* mark this client's files as active */
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
* follow it
*/
{
- while (!(ncsp->flags & CSP_FLAG_ACTIVE))
+ while( !ncsp->active )
{
csp->next = ncsp->next;
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);
destroy_list(ncsp->cookie_list);
free_current_action(ncsp->action);
-
-#ifdef FEATURE_STATISTICS
+
+#ifdef STATISTICS
urls_read++;
- if (ncsp->flags & CSP_FLAG_REJECTED)
+ if (ncsp->rejected)
{
urls_rejected++;
}
-#endif /* def FEATURE_STATISTICS */
+#endif /* def STATISTICS */
freez(ncsp);
(nfl->unloader)(nfl->f);
+#ifndef SPLIT_PROXY_ARGS
+ freez(nfl->proxy_args);
+#endif /* ndef SPLIT_PROXY_ARGS */
+
freez(nfl->filename);
freez(nfl);
* 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
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;
* Description : Read a single non-empty line from a file and return
* 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.
* 2 : buflen = Size of buffer in bytes.
* 3 : fp = File to read from
+ * 4 : fs = File will be written to fs->proxy_args. May
+ * be NULL to disable this feature.
*
* Returns : NULL on EOF or error
* Otherwise, returns buf.
*
*********************************************************************/
-char *read_config_line(char *buf, int buflen, FILE *fp)
+char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
{
- char *p;
- char *src;
- char *dest;
+ char *p, *q;
char linebuf[BUFFER_SIZE];
int contflag = 0;
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)
{
}
/* If there's a comment char.. */
- p = linebuf;
- while ((p = strchr(p, '#')) != NULL)
+ if ((p = strpbrk(linebuf, "#")) != NULL)
{
/* ..and it's escaped, left-shift the line over the escape. */
if ((p != linebuf) && (*(p-1) == '\\'))
{
- src = p;
- dest = p - 1;
- while ((*dest++ = *src++) != '\0')
- {
- /* nop */
- }
- /* Now scan from just after the "#". */
+ q = p-1;
+ while ((*q++ = *p++) != '\0') /* nop */;
}
/* Else, chop off the rest of the line */
else
if (contflag)
{
contflag = 0;
- continue;
+ continue;
}
/* Remove leading and trailing whitespace */
}
-#ifdef FEATURE_TRUST
+#ifdef TRUST_FILES
/*********************************************************************
*
* Function : unload_trustfile
tl = csp->config->trust_list;
- while (read_config_line(buf, sizeof(buf), fp) != NULL)
+ while (read_config_line(buf, sizeof(buf), fp, fs) != NULL)
{
trusted = 0;
reject = 1;
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)
{
return(-1);
}
-#endif /* def FEATURE_TRUST */
+#endif /* def TRUST_FILES */
/*********************************************************************
{
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);
}
/* Read line by line */
- while (read_config_line(buf, sizeof(buf), fp) != NULL)
+ while (read_config_line(buf, sizeof(buf), fp, fs) != NULL)
{
enlist( bl->patterns, buf );
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 )
{
projects / privoxy.git / blobdiff