X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=src%2Floaders.c;h=14a434cdcbb19b37fe909953f4a3687b9c76dec2;hb=4755c62ad98c26bebd21d2c649689300809a7d76;hp=3d7ca633a1325906ba570eef5a8051db84b9fc20;hpb=2da19eb8eff90f6c9a7cb46ff891643e89d50a55;p=privoxy.git diff --git a/src/loaders.c b/src/loaders.c index 3d7ca633..14a434cd 100644 --- a/src/loaders.c +++ b/src/loaders.c @@ -1,7 +1,7 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.50 2002/04/24 02:12:16 oes Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 2.0 2002/06/04 14:34:21 jongfoster Exp $"; /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ + * File : $Source: /cvsroot/ijbswa/current/src/loaders.c,v $ * * Purpose : Functions to load and unload the various * configuration files. Also contains code to manage @@ -35,6 +35,9 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.50 2002/04/24 02:12:16 oes Exp $" * * Revisions : * $Log: loaders.c,v $ + * Revision 2.0 2002/06/04 14:34:21 jongfoster + * Moving source files to src/ + * * Revision 1.50 2002/04/24 02:12:16 oes * Jon's multiple AF patch: Sweep now takes care of all AFs * @@ -296,18 +299,39 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.50 2002/04/24 02:12:16 oes Exp $" const char loaders_h_rcs[] = LOADERS_H_VERSION; -/* - * Currently active files. - * These are also entered in the main linked list of files. - */ #ifdef FEATURE_TRUST +/** + * Currently active trust file. + * This is also entered in the main linked list of files. + */ static struct file_list *current_trustfile = NULL; #endif /* def FEATURE_TRUST */ + +/** + * Currently active re_filter file. + * This is also entered in the main linked list of files. + */ static struct file_list *current_re_filterfile = NULL; +/** + * Character code for CR (ASCII 13). + * If you have a wierd compiler and this definition is + * incorrect, you also need to fix NEWLINE() in loaders.h + */ +#define CHAR_CR '\r' /* ASCII 13 */ + + +/** + * Character code for LF (ASCII 10). + * If you have a wierd compiler and this definition is + * incorrect, you also need to fix NEWLINE() in loaders.h + */ +#define CHAR_LF '\n' /* ASCII 10 */ + + /********************************************************************* * @@ -550,13 +574,6 @@ jb_err simple_read_line(FILE *fp, char **dest, int *newline) p = buf; -/* - * Character codes. If you have a wierd compiler and the following are - * incorrect, you also need to fix NEWLINE() in loaders.h - */ -#define CHAR_CR '\r' /* ASCII 13 */ -#define CHAR_LF '\n' /* ASCII 10 */ - for (;;) { ch = getc(fp);