X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=f1453d8022bdea365e7e36367c8a9e4494389a1a;hp=03729bf598b6bbcdf3744a7f0fbe1193ea9297db;hb=a4fe5095c2268bc517e1907d3c70a3f420ccfe98;hpb=64a14a3afe5ffea3ee2226e7170677895b651b6f diff --git a/loadcfg.c b/loadcfg.c index 03729bf5..f1453d80 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.34 2002/03/06 23:14:35 jongfoster Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.43 2002/04/08 20:36:50 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -9,7 +9,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.34 2002/03/06 23:14:35 jongfoster * variables it writes to. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,37 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.34 2002/03/06 23:14:35 jongfoster * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.43 2002/04/08 20:36:50 swa + * fixed JB spelling + * + * Revision 1.42 2002/04/05 15:50:15 oes + * fix for invalid HTML proxy_args + * + * Revision 1.41 2002/03/31 17:19:00 jongfoster + * Win32 only: Enabling STRICT to fix a VC++ compile warning. + * + * Revision 1.40 2002/03/26 22:29:55 swa + * we have a new homepage! + * + * Revision 1.39 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.38 2002/03/24 13:05:48 jongfoster + * Renaming re_filterfile to filterfile + * + * Revision 1.37 2002/03/16 23:54:06 jongfoster + * Adding graceful termination feature, to help look for memory leaks. + * If you enable this (which, by design, has to be done by hand + * editing config.h) and then go to http://i.j.b/die, then the program + * will exit cleanly after the *next* request. It should free all the + * memory that was used. + * + * Revision 1.36 2002/03/13 00:27:05 jongfoster + * Killing warnings + * + * Revision 1.35 2002/03/07 03:52:44 oes + * Set logging to tty for --no-daemon mode + * * Revision 1.34 2002/03/06 23:14:35 jongfoster * Trivial cosmetic changes to make function comments easier to find. * @@ -270,6 +301,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.34 2002/03/06 23:14:35 jongfoster #ifdef _WIN32 +# ifndef STRICT +# define STRICT +# endif # include # include "win32.h" @@ -318,7 +352,7 @@ const char loadcfg_h_rcs[] = LOADCFG_H_VERSION; #ifdef FEATURE_TOGGLE /* by haroon - indicates if ijb is enabled */ -int g_bToggleIJB = 1; /* JunkBusters is enabled by default. */ +int g_bToggleIJB = 1; /* Privoxy is enabled by default. */ #endif /* def FEATURE_TOGGLE */ /* The filename of the configfile */ @@ -354,6 +388,7 @@ static struct file_list *current_configfile = NULL; #define hash_deny_access 1227333715ul /* "deny-access" */ #define hash_enable_edit_actions 2517097536ul /* "enable-edit-actions" */ #define hash_enable_remote_toggle 2979744683ul /* "enable-remote-toggle" */ +#define hash_filterfile 250887266ul /* "filterfile" */ #define hash_forward 2029845ul /* "forward" */ #define hash_forward_socks4 3963965521ul /* "forward-socks4" */ #define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */ @@ -363,7 +398,6 @@ static struct file_list *current_configfile = NULL; #define hash_logfile 2114766ul /* "logfile" */ #define hash_permit_access 3587953268ul /* "permit-access" */ #define hash_proxy_info_url 3903079059ul /* "proxy-info-url" */ -#define hash_re_filterfile 3877522444ul /* "re_filterfile" */ #define hash_single_threaded 4250084780ul /* "single-threaded" */ #define hash_suppress_blocklists 1948693308ul /* "suppress-blocklists" */ #define hash_toggle 447966ul /* "toggle" */ @@ -452,6 +486,30 @@ void unload_configfile (void * data) } +#ifdef FEATURE_GRACEFUL_TERMINATION +/********************************************************************* + * + * Function : unload_current_config_file + * + * Description : Unloads current config file - reset to state at + * beginning of program. + * + * Parameters : None + * + * Returns : N/A + * + *********************************************************************/ +void unload_current_config_file(void) +{ + if (current_configfile) + { + current_configfile->unloader = unload_configfile; + current_configfile = NULL; + } +} +#endif + + /********************************************************************* * * Function : load_config @@ -774,7 +832,7 @@ struct configuration_spec * load_config(void) { cur_fwd->forward_host = strdup(p); - if ((p = strchr(cur_fwd->forward_host, ':'))) + if (NULL != (p = strchr(cur_fwd->forward_host, ':'))) { *p++ = '\0'; cur_fwd->forward_port = atoi(p); @@ -837,7 +895,7 @@ struct configuration_spec * load_config(void) { cur_fwd->gateway_host = strdup(p); - if ((p = strchr(cur_fwd->gateway_host, ':'))) + if (NULL != (p = strchr(cur_fwd->gateway_host, ':'))) { *p++ = '\0'; cur_fwd->gateway_port = atoi(p); @@ -855,7 +913,7 @@ struct configuration_spec * load_config(void) { cur_fwd->forward_host = strdup(p); - if ((p = strchr(cur_fwd->forward_host, ':'))) + if (NULL != (p = strchr(cur_fwd->forward_host, ':'))) { *p++ = '\0'; cur_fwd->forward_port = atoi(p); @@ -916,7 +974,7 @@ struct configuration_spec * load_config(void) cur_fwd->gateway_host = strdup(p); - if ((p = strchr(cur_fwd->gateway_host, ':'))) + if (NULL != (p = strchr(cur_fwd->gateway_host, ':'))) { *p++ = '\0'; cur_fwd->gateway_port = atoi(p); @@ -933,7 +991,7 @@ struct configuration_spec * load_config(void) { cur_fwd->forward_host = strdup(p); - if ((p = strchr(cur_fwd->forward_host, ':'))) + if (NULL != (p = strchr(cur_fwd->forward_host, ':'))) { *p++ = '\0'; cur_fwd->forward_port = atoi(p); @@ -1076,7 +1134,7 @@ struct configuration_spec * load_config(void) * re_filterfile file-name * In confdir by default. * *************************************************************************/ - case hash_re_filterfile : + case hash_filterfile : freez(config->re_filterfile); config->re_filterfile = make_path(config->confdir, arg); continue; @@ -1310,7 +1368,7 @@ struct configuration_spec * load_config(void) if ( NULL != config->haddr ) { - if ((p = strchr(config->haddr, ':'))) + if (NULL != (p = strchr(config->haddr, ':'))) { *p++ = '\0'; if (*p) @@ -1442,7 +1500,9 @@ static void savearg(char *command, char *argument, struct configuration_spec * c freez(config->proxy_args); return; } - string_append(&buf, ""); string_join (&buf, s);