X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=2a0ca9b09e1f6736094954db3403e717b77d53c6;hp=aade4ea337f2937638d49d67fb6910c6331fb64c;hb=8e8592f169a794eb9f41d19853ee0ddd4e068a1c;hpb=90ec44c21497eb138fa11deaf5151a71fe6ab6a9 diff --git a/loadcfg.c b/loadcfg.c index aade4ea3..2a0ca9b0 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,10 +1,10 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.23 2001/10/07 15:36:00 oes Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.26 2001/11/05 21:41:43 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.23 2001/10/07 15:36:00 oes Exp $" * 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,25 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.23 2001/10/07 15:36:00 oes Exp $" * * Revisions : * $Log: loadcfg.c,v $ + * 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" * @@ -229,9 +248,11 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.23 2001/10/07 15:36:00 oes Exp $" #else /* ifndef _WIN32 */ +#ifndef __OS2__ # include -# include # include +#endif +# include # include # include @@ -368,7 +389,7 @@ void unload_configfile (void * data) cur_fwd = next_fwd; } config->forward = NULL; - + #ifdef FEATURE_COOKIE_JAR if ( NULL != config->jar ) { @@ -377,22 +398,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); } @@ -404,7 +425,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. @@ -418,7 +439,9 @@ struct configuration_spec * load_config(void) struct configuration_spec * config = NULL; struct client_state * fake_csp; struct file_list *fs; + unsigned long linenum = 0; + DBG(1, ("load_config() entered..\n") ); if (!check_file_changed(current_configfile, configfile, &fs)) { /* No need to load */ @@ -430,7 +453,9 @@ struct configuration_spec * load_config(void) configfile); } + /* log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile); + */ #ifdef FEATURE_TOGGLE g_bToggleIJB = 1; @@ -448,9 +473,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". @@ -472,7 +497,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]; @@ -530,7 +555,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; @@ -538,24 +563,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 @@ -631,7 +656,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; @@ -813,7 +838,7 @@ struct configuration_spec * load_config(void) /* Add to list. */ cur_fwd->next = config->forward; config->forward = cur_fwd; - + continue; /**************************************************************************** @@ -891,7 +916,7 @@ struct configuration_spec * load_config(void) /* Add to list. */ cur_fwd->next = config->forward; config->forward = cur_fwd; - + continue; /**************************************************************************** @@ -900,7 +925,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 */ @@ -909,7 +934,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; @@ -917,16 +942,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; @@ -998,7 +1023,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; @@ -1011,7 +1036,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; @@ -1020,7 +1045,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; @@ -1055,7 +1080,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 */ @@ -1197,8 +1222,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"); @@ -1294,7 +1322,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 */