X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=9d39f442158a28219082e7355ddcbf318e4124fe;hp=cf6dabc51fab8ba09ab7308118cdecd67183a50a;hb=126983736bbaaa3f532c55218f15738beef6a79b;hpb=b5c1077ef4cf0c7c84659566ebff29e73f47f62e diff --git a/loadcfg.c b/loadcfg.c index cf6dabc5..9d39f442 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,10 +1,10 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.22 2001/09/22 16:36:59 jongfoster Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.27 2001/11/07 00:02:13 steudten Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ * * Purpose : Loads settings from the configuration file into - * global variables. This file contains both the + * global variables. This file contains both the * routine to load the configuration and the global * variables it writes to. * @@ -12,10 +12,10 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.22 2001/09/22 16:36:59 jongfoster * IJBSWA team. http://ijbswa.sourceforge.net * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -35,6 +35,33 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.22 2001/09/22 16:36:59 jongfoster * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.27 2001/11/07 00:02:13 steudten + * Add line number in error output for lineparsing for + * actionsfile and configfile. + * Special handling for CLF added. + * + * Revision 1.26 2001/11/05 21:41:43 steudten + * Add changes to be a real daemon just for unix os. + * (change cwd to /, detach from controlling tty, set + * process group and session leader to the own process. + * Add DBG() Macro. + * Add some fatal-error log message for failed malloc(). + * Add '-d' if compiled with 'configure --with-debug' to + * enable debug output. + * + * Revision 1.25 2001/10/25 03:40:48 david__schmidt + * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple + * threads to call select() simultaneously. So, it's time to do a real, live, + * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__ + * (native). Both versions will work, but using __OS2__ offers multi-threading. + * + * Revision 1.24 2001/10/23 21:40:30 jongfoster + * Added support for enable-edit-actions and enable-remote-toggle config + * file options. + * + * Revision 1.23 2001/10/07 15:36:00 oes + * Introduced new config option "buffer-limit" + * * Revision 1.22 2001/09/22 16:36:59 jongfoster * Removing unused parameter fs from read_config_line() * @@ -226,9 +253,11 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.22 2001/09/22 16:36:59 jongfoster #else /* ifndef _WIN32 */ +#ifndef __OS2__ # include -# include # include +#endif +# include # include # include @@ -293,6 +322,8 @@ static struct file_list *current_configfile = NULL; #define hash_confdir 1978389ul /* "confdir" */ #define hash_debug 78263ul /* "debug" */ #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_forward 2029845ul /* "forward" */ #define hash_forward_socks4 3963965521ul /* "forward-socks4" */ #define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */ @@ -323,7 +354,6 @@ static struct file_list *current_configfile = NULL; static void savearg(char *c, char *o, struct configuration_spec * config); - /********************************************************************* * * Function : unload_configfile @@ -363,7 +393,7 @@ void unload_configfile (void * data) cur_fwd = next_fwd; } config->forward = NULL; - + #ifdef FEATURE_COOKIE_JAR if ( NULL != config->jar ) { @@ -372,22 +402,22 @@ void unload_configfile (void * data) } #endif /* def FEATURE_COOKIE_JAR */ - freez((char *)config->confdir); - freez((char *)config->logdir); + freez(config->confdir); + freez(config->logdir); - freez((char *)config->haddr); - freez((char *)config->logfile); + freez(config->haddr); + freez(config->logfile); - freez((char *)config->actions_file); - freez((char *)config->admin_address); - freez((char *)config->proxy_info_url); - freez((char *)config->proxy_args); + freez(config->actions_file); + freez(config->admin_address); + freez(config->proxy_info_url); + freez(config->proxy_args); #ifdef FEATURE_COOKIE_JAR - freez((char *)config->jarfile); + freez(config->jarfile); #endif /* def FEATURE_COOKIE_JAR */ - freez((char *)config->re_filterfile); + freez(config->re_filterfile); } @@ -399,7 +429,7 @@ void unload_configfile (void * data) * Description : Load the config file and all parameters. * * Parameters : - * 1 : csp = Client state (the config member will be + * 1 : csp = Client state (the config member will be * filled in by this function). * * Returns : 0 => Ok, everything else is an error. @@ -413,8 +443,10 @@ struct configuration_spec * load_config(void) struct configuration_spec * config = NULL; struct client_state * fake_csp; struct file_list *fs; + unsigned long linenum = 0; - if (!check_file_changed(current_configfile, configfile, &fs)) + DBG(1, ("load_config() entered..\n") ); + if ( !check_file_changed(current_configfile, configfile, &fs)) { /* No need to load */ return ((struct configuration_spec *)current_configfile->f); @@ -425,7 +457,9 @@ struct configuration_spec * load_config(void) configfile); } + /* log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile); + */ #ifdef FEATURE_TOGGLE g_bToggleIJB = 1; @@ -443,9 +477,9 @@ struct configuration_spec * load_config(void) /* * This is backwards from how it's usually done. - * Following the usual pattern, "fs" would be stored in a member + * Following the usual pattern, "fs" would be stored in a member * variable in "csp", and then we'd access "config" from "fs->f", - * using a cast. However, "config" is used so often that a + * using a cast. However, "config" is used so often that a * cast each time would be very ugly, and the extra indirection * would waste CPU cycles. Therefore we store "config" in * "csp->config", and "fs" in "csp->config->config_file_list". @@ -467,7 +501,7 @@ struct configuration_spec * load_config(void) /* Never get here - LOG_LEVEL_FATAL causes program exit */ } - while (read_config_line(buf, sizeof(buf), configfp) != NULL) + while (read_config_line(buf, sizeof(buf), configfp, &linenum) != NULL) { char cmd[BUFFER_SIZE]; char arg[BUFFER_SIZE]; @@ -525,7 +559,7 @@ struct configuration_spec * load_config(void) * In confdir by default ****************************************************************************/ case hash_actions_file : - freez((char *)config->actions_file); + freez(config->actions_file); config->actions_file = make_path(config->confdir, arg); continue; @@ -533,24 +567,24 @@ struct configuration_spec * load_config(void) * admin-address email-address ****************************************************************************/ case hash_admin_address : - freez((char *)config->admin_address); + freez(config->admin_address); config->admin_address = strdup(arg); - continue; + continue; /**************************************************************************** * buffer-limit n ****************************************************************************/ case hash_buffer_limit : config->buffer_limit = (size_t) 1024 * atoi(arg); - continue; + continue; /**************************************************************************** * confdir directory-name ****************************************************************************/ case hash_confdir : - freez((char *)config->confdir); - config->confdir = strdup(arg); - continue; + freez(config->confdir); + config->confdir = make_path( NULL, arg); + continue; /**************************************************************************** * debug n @@ -626,7 +660,7 @@ struct configuration_spec * load_config(void) * actions file, the last match wins. However, the internal * implementations are different: The actions file is stored * in the same order as the file, and scanned completely. - * With the ACL, we reverse the order as we load it, then + * With the ACL, we reverse the order as we load it, then * when we scan it we stop as soon as we get a match. */ cur_acl->next = config->acl; @@ -635,6 +669,38 @@ struct configuration_spec * load_config(void) continue; #endif /* def FEATURE_ACL */ +/**************************************************************************** + * enable-edit-actions 0|1 + ****************************************************************************/ +#ifdef FEATURE_CGI_EDIT_ACTIONS + case hash_enable_edit_actions: + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_CGI_EDIT_ACTIONS; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_CGI_EDIT_ACTIONS; + } + continue; +#endif /* def FEATURE_CGI_EDIT_ACTIONS */ + +/**************************************************************************** + * enable-remote-toggle 0|1 + ****************************************************************************/ +#ifdef FEATURE_CGI_EDIT_ACTIONS + case hash_enable_remote_toggle: + if ((*arg != '\0') && (0 != atoi(arg))) + { + config->feature_flags |= RUNTIME_FEATURE_CGI_TOGGLE; + } + else + { + config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE; + } + continue; +#endif /* def FEATURE_CGI_EDIT_ACTIONS */ + /**************************************************************************** * forward url-pattern (.|http-proxy-host[:port]) ****************************************************************************/ @@ -776,7 +842,7 @@ struct configuration_spec * load_config(void) /* Add to list. */ cur_fwd->next = config->forward; config->forward = cur_fwd; - + continue; /**************************************************************************** @@ -854,7 +920,7 @@ struct configuration_spec * load_config(void) /* Add to list. */ cur_fwd->next = config->forward; config->forward = cur_fwd; - + continue; /**************************************************************************** @@ -863,7 +929,7 @@ struct configuration_spec * load_config(void) ****************************************************************************/ #ifdef FEATURE_COOKIE_JAR case hash_jarfile : - freez((char *)config->jarfile); + freez(config->jarfile); config->jarfile = make_path(config->logdir, arg); continue; #endif /* def FEATURE_COOKIE_JAR */ @@ -872,7 +938,7 @@ struct configuration_spec * load_config(void) * listen-address [ip][:port] ****************************************************************************/ case hash_listen_address : - freez((char *)config->haddr); + freez(config->haddr); config->haddr = strdup(arg); continue; @@ -880,16 +946,16 @@ struct configuration_spec * load_config(void) * logdir directory-name ****************************************************************************/ case hash_logdir : - freez((char *)config->logdir); - config->logdir = strdup(arg); - continue; + freez(config->logdir); + config->logdir = make_path(NULL, arg); + continue; /**************************************************************************** * logfile log-file-name * In logdir by default ****************************************************************************/ case hash_logfile : - freez((char *)config->logfile); + freez(config->logfile); config->logfile = make_path(config->logdir, arg); continue; @@ -961,7 +1027,7 @@ struct configuration_spec * load_config(void) * actions file, the last match wins. However, the internal * implementations are different: The actions file is stored * in the same order as the file, and scanned completely. - * With the ACL, we reverse the order as we load it, then + * With the ACL, we reverse the order as we load it, then * when we scan it we stop as soon as we get a match. */ cur_acl->next = config->acl; @@ -974,7 +1040,7 @@ struct configuration_spec * load_config(void) * proxy-info-url url ****************************************************************************/ case hash_proxy_info_url : - freez((char *)config->proxy_info_url); + freez(config->proxy_info_url); config->proxy_info_url = strdup(arg); continue; @@ -983,7 +1049,7 @@ struct configuration_spec * load_config(void) * In confdir by default. ****************************************************************************/ case hash_re_filterfile : - freez((char *)config->re_filterfile); + freez(config->re_filterfile); config->re_filterfile = make_path(config->confdir, arg); continue; @@ -1018,7 +1084,7 @@ struct configuration_spec * load_config(void) ****************************************************************************/ #ifdef FEATURE_TRUST case hash_trustfile : - freez((char *)config->trustfile); + freez(config->trustfile); config->trustfile = make_path(config->confdir, arg); continue; #endif /* def FEATURE_TRUST */ @@ -1115,6 +1181,10 @@ struct configuration_spec * load_config(void) #ifndef FEATURE_ACL case hash_deny_access: #endif /* ndef FEATURE_ACL */ +#ifndef FEATURE_CGI_EDIT_ACTIONS + case hash_enable_edit_actions: + case hash_enable_remote_toggle: +#endif /* def FEATURE_CGI_EDIT_ACTIONS */ #ifndef FEATURE_COOKIE_JAR case hash_jarfile : #endif /* ndef FEATURE_COOKIE_JAR */ @@ -1156,8 +1226,11 @@ struct configuration_spec * load_config(void) * error. To change back to an error, just change log level * to LOG_LEVEL_FATAL. */ - log_error(LOG_LEVEL_ERROR, "Unrecognized directive (%luul) in " + log_error(LOG_LEVEL_ERROR, "Unrecognized directive '%s' in line %lu in " + "configuration file (%s).", buf, linenum, configfile); + /* log_error(LOG_LEVEL_ERROR, "Unrecognized directive (%luul) in " "configuration file: \"%s\"", hash_string( cmd ), buf); + */ config->proxy_args = strsav( config->proxy_args, "
\nWARNING: unrecognized directive : "); config->proxy_args = strsav( config->proxy_args, buf); config->proxy_args = strsav( config->proxy_args, "

\n"); @@ -1253,7 +1326,7 @@ struct configuration_spec * load_config(void) #ifdef FEATURE_TRUST g_trustfile = config->trustfile; #endif /* def FEATURE_TRUST */ - + #endif /* defined(_WIN32) && !defined (_WIN_CONSOLE) */ /* FIXME: end kludge */ @@ -1299,6 +1372,7 @@ struct configuration_spec * load_config(void) files->next = fs; current_configfile = fs; + MustReload = 0; return (config); }