projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
571a3b8
)
Trivial cosmetic changes to make function comments easier to find.
author
jongfoster
<jongfoster@users.sourceforge.net>
Wed, 6 Mar 2002 23:14:35 +0000
(23:14 +0000)
committer
jongfoster
<jongfoster@users.sourceforge.net>
Wed, 6 Mar 2002 23:14:35 +0000
(23:14 +0000)
loadcfg.c
patch
|
blob
|
history
diff --git
a/loadcfg.c
b/loadcfg.c
index
60db918
..
fa50a86
100644
(file)
--- a/
loadcfg.c
+++ b/
loadcfg.c
@@
-1,4
+1,4
@@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.3
2 2002/03/04 18:24:53
oes Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.3
3 2002/03/05 04:52:42
oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@
-35,6
+35,9
@@
const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.32 2002/03/04 18:24:53 oes Exp $"
*
* Revisions :
* $Log: loadcfg.c,v $
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.33 2002/03/05 04:52:42 oes
+ * Deleted non-errlog debugging code
+ *
* Revision 1.32 2002/03/04 18:24:53 oes
* Re-enabled output of unknown config directive hash
*
* Revision 1.32 2002/03/04 18:24:53 oes
* Re-enabled output of unknown config directive hash
*
@@
-576,49
+579,49
@@
struct configuration_spec * load_config(void)
switch( hash_string( cmd ) )
{
switch( hash_string( cmd ) )
{
-/*
**
*************************************************************************
+/*
*************************************************************************
* actionsfile actions-file-name
* In confdir by default
* actionsfile actions-file-name
* In confdir by default
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_actions_file :
freez(config->actions_file);
config->actions_file = make_path(config->confdir, arg);
continue;
case hash_actions_file :
freez(config->actions_file);
config->actions_file = make_path(config->confdir, arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* admin-address email-address
* admin-address email-address
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_admin_address :
freez(config->admin_address);
config->admin_address = strdup(arg);
continue;
case hash_admin_address :
freez(config->admin_address);
config->admin_address = strdup(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* buffer-limit n
* buffer-limit n
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_buffer_limit :
config->buffer_limit = (size_t) 1024 * atoi(arg);
continue;
case hash_buffer_limit :
config->buffer_limit = (size_t) 1024 * atoi(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* confdir directory-name
* confdir directory-name
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_confdir :
freez(config->confdir);
config->confdir = make_path( NULL, arg);
continue;
case hash_confdir :
freez(config->confdir);
config->confdir = make_path( NULL, arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* debug n
* Specifies debug level, multiple values are ORed together.
* debug n
* Specifies debug level, multiple values are ORed together.
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_debug :
config->debug |= atoi(arg);
continue;
case hash_debug :
config->debug |= atoi(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
* deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
- *
**
*************************************************************************/
+ *
*************************************************************************/
#ifdef FEATURE_ACL
case hash_deny_access:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
#ifdef FEATURE_ACL
case hash_deny_access:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
@@
-691,9
+694,9
@@
struct configuration_spec * load_config(void)
continue;
#endif /* def FEATURE_ACL */
continue;
#endif /* def FEATURE_ACL */
-/*
**
*************************************************************************
+/*
*************************************************************************
* enable-edit-actions 0|1
* enable-edit-actions 0|1
- *
**
*************************************************************************/
+ *
*************************************************************************/
#ifdef FEATURE_CGI_EDIT_ACTIONS
case hash_enable_edit_actions:
if ((*arg != '\0') && (0 != atoi(arg)))
#ifdef FEATURE_CGI_EDIT_ACTIONS
case hash_enable_edit_actions:
if ((*arg != '\0') && (0 != atoi(arg)))
@@
-707,9
+710,9
@@
struct configuration_spec * load_config(void)
continue;
#endif /* def FEATURE_CGI_EDIT_ACTIONS */
continue;
#endif /* def FEATURE_CGI_EDIT_ACTIONS */
-/*
**
*************************************************************************
+/*
*************************************************************************
* enable-remote-toggle 0|1
* enable-remote-toggle 0|1
- *
**
*************************************************************************/
+ *
*************************************************************************/
#ifdef FEATURE_CGI_EDIT_ACTIONS
case hash_enable_remote_toggle:
if ((*arg != '\0') && (0 != atoi(arg)))
#ifdef FEATURE_CGI_EDIT_ACTIONS
case hash_enable_remote_toggle:
if ((*arg != '\0') && (0 != atoi(arg)))
@@
-723,9
+726,9
@@
struct configuration_spec * load_config(void)
continue;
#endif /* def FEATURE_CGI_EDIT_ACTIONS */
continue;
#endif /* def FEATURE_CGI_EDIT_ACTIONS */
-/*
**
*************************************************************************
+/*
*************************************************************************
* forward url-pattern (.|http-proxy-host[:port])
* forward url-pattern (.|http-proxy-host[:port])
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_forward:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
case hash_forward:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
@@
-786,9
+789,9
@@
struct configuration_spec * load_config(void)
continue;
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* forward-socks4 url-pattern socks-proxy[:port] (.|http-proxy[:port])
* forward-socks4 url-pattern socks-proxy[:port] (.|http-proxy[:port])
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_forward_socks4:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
case hash_forward_socks4:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
@@
-867,9
+870,9
@@
struct configuration_spec * load_config(void)
continue;
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port])
* forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port])
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_forward_socks4a:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
case hash_forward_socks4a:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
@@
-945,10
+948,10
@@
struct configuration_spec * load_config(void)
continue;
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* jarfile jar-file-name
* In logdir by default
* jarfile jar-file-name
* In logdir by default
- *
**
*************************************************************************/
+ *
*************************************************************************/
#ifdef FEATURE_COOKIE_JAR
case hash_jarfile :
freez(config->jarfile);
#ifdef FEATURE_COOKIE_JAR
case hash_jarfile :
freez(config->jarfile);
@@
-956,34
+959,34
@@
struct configuration_spec * load_config(void)
continue;
#endif /* def FEATURE_COOKIE_JAR */
continue;
#endif /* def FEATURE_COOKIE_JAR */
-/*
**
*************************************************************************
+/*
*************************************************************************
* listen-address [ip][:port]
* listen-address [ip][:port]
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_listen_address :
freez(config->haddr);
config->haddr = strdup(arg);
continue;
case hash_listen_address :
freez(config->haddr);
config->haddr = strdup(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* logdir directory-name
* logdir directory-name
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_logdir :
freez(config->logdir);
config->logdir = make_path(NULL, arg);
continue;
case hash_logdir :
freez(config->logdir);
config->logdir = make_path(NULL, arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* logfile log-file-name
* In logdir by default
* logfile log-file-name
* In logdir by default
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_logfile :
freez(config->logfile);
config->logfile = make_path(config->logdir, arg);
continue;
case hash_logfile :
freez(config->logfile);
config->logfile = make_path(config->logdir, arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
* permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
- *
**
*************************************************************************/
+ *
*************************************************************************/
#ifdef FEATURE_ACL
case hash_permit_access:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
#ifdef FEATURE_ACL
case hash_permit_access:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
@@
-1058,52
+1061,52
@@
struct configuration_spec * load_config(void)
continue;
#endif /* def FEATURE_ACL */
continue;
#endif /* def FEATURE_ACL */
-/*
**
*************************************************************************
+/*
*************************************************************************
* proxy-info-url url
* proxy-info-url url
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_proxy_info_url :
freez(config->proxy_info_url);
config->proxy_info_url = strdup(arg);
continue;
case hash_proxy_info_url :
freez(config->proxy_info_url);
config->proxy_info_url = strdup(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* re_filterfile file-name
* In confdir by default.
* re_filterfile file-name
* In confdir by default.
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_re_filterfile :
freez(config->re_filterfile);
config->re_filterfile = make_path(config->confdir, arg);
continue;
case hash_re_filterfile :
freez(config->re_filterfile);
config->re_filterfile = make_path(config->confdir, arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* single-threaded
* single-threaded
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_single_threaded :
config->multi_threaded = 0;
continue;
case hash_single_threaded :
config->multi_threaded = 0;
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* toggle (0|1)
* toggle (0|1)
- *
**
*************************************************************************/
+ *
*************************************************************************/
#ifdef FEATURE_TOGGLE
case hash_toggle :
g_bToggleIJB = atoi(arg);
continue;
#endif /* def FEATURE_TOGGLE */
#ifdef FEATURE_TOGGLE
case hash_toggle :
g_bToggleIJB = atoi(arg);
continue;
#endif /* def FEATURE_TOGGLE */
-/*
**
*************************************************************************
+/*
*************************************************************************
* trust-info-url url
* trust-info-url url
- *
**
*************************************************************************/
+ *
*************************************************************************/
#ifdef FEATURE_TRUST
case hash_trust_info_url :
enlist(config->trust_info, arg);
continue;
#endif /* def FEATURE_TRUST */
#ifdef FEATURE_TRUST
case hash_trust_info_url :
enlist(config->trust_info, arg);
continue;
#endif /* def FEATURE_TRUST */
-/*
**
*************************************************************************
+/*
*************************************************************************
* trustfile filename
* (In confdir by default.)
* trustfile filename
* (In confdir by default.)
- *
**
*************************************************************************/
+ *
*************************************************************************/
#ifdef FEATURE_TRUST
case hash_trustfile :
freez(config->trustfile);
#ifdef FEATURE_TRUST
case hash_trustfile :
freez(config->trustfile);
@@
-1112,13
+1115,13
@@
struct configuration_spec * load_config(void)
#endif /* def FEATURE_TRUST */
#endif /* def FEATURE_TRUST */
-/*
**
*************************************************************************
+/*
*************************************************************************
* Win32 Console options:
* Win32 Console options:
- *
**
*************************************************************************/
+ *
*************************************************************************/
-/*
**
*************************************************************************
+/*
*************************************************************************
* hide-console
* hide-console
- *
**
*************************************************************************/
+ *
*************************************************************************/
#ifdef _WIN_CONSOLE
case hash_hide_console :
hideConsole = 1;
#ifdef _WIN_CONSOLE
case hash_hide_console :
hideConsole = 1;
@@
-1126,70
+1129,70
@@
struct configuration_spec * load_config(void)
#endif /*def _WIN_CONSOLE*/
#endif /*def _WIN_CONSOLE*/
-/*
**
*************************************************************************
+/*
*************************************************************************
* Win32 GUI options:
* Win32 GUI options:
- *
**
*************************************************************************/
+ *
*************************************************************************/
#if defined(_WIN32) && ! defined(_WIN_CONSOLE)
#if defined(_WIN32) && ! defined(_WIN_CONSOLE)
-/*
**
*************************************************************************
+/*
*************************************************************************
* activity-animation (0|1)
* activity-animation (0|1)
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_activity_animation :
g_bShowActivityAnimation = atoi(arg);
continue;
case hash_activity_animation :
g_bShowActivityAnimation = atoi(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* close-button-minimizes (0|1)
* close-button-minimizes (0|1)
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_close_button_minimizes :
g_bCloseHidesWindow = atoi(arg);
continue;
case hash_close_button_minimizes :
g_bCloseHidesWindow = atoi(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* log-buffer-size (0|1)
* log-buffer-size (0|1)
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_log_buffer_size :
g_bLimitBufferSize = atoi(arg);
continue;
case hash_log_buffer_size :
g_bLimitBufferSize = atoi(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* log-font-name fontnane
* log-font-name fontnane
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_log_font_name :
strcpy( g_szFontFaceName, arg );
continue;
case hash_log_font_name :
strcpy( g_szFontFaceName, arg );
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* log-font-size n
* log-font-size n
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_log_font_size :
g_nFontSize = atoi(arg);
continue;
case hash_log_font_size :
g_nFontSize = atoi(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* log-highlight-messages (0|1)
* log-highlight-messages (0|1)
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_log_highlight_messages :
g_bHighlightMessages = atoi(arg);
continue;
case hash_log_highlight_messages :
g_bHighlightMessages = atoi(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* log-max-lines n
* log-max-lines n
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_log_max_lines :
g_nMaxBufferLines = atoi(arg);
continue;
case hash_log_max_lines :
g_nMaxBufferLines = atoi(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* log-messages (0|1)
* log-messages (0|1)
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_log_messages :
g_bLogMessages = atoi(arg);
continue;
case hash_log_messages :
g_bLogMessages = atoi(arg);
continue;
-/*
**
*************************************************************************
+/*
*************************************************************************
* show-on-task-bar (0|1)
* show-on-task-bar (0|1)
- *
**
*************************************************************************/
+ *
*************************************************************************/
case hash_show_on_task_bar :
g_bShowOnTaskBar = atoi(arg);
continue;
case hash_show_on_task_bar :
g_bShowOnTaskBar = atoi(arg);
continue;
@@
-1197,9
+1200,9
@@
struct configuration_spec * load_config(void)
#endif /* defined(_WIN32) && ! defined(_WIN_CONSOLE) */
#endif /* defined(_WIN32) && ! defined(_WIN_CONSOLE) */
-/*
***************************************************************************/
-/* Warnings about unsupported features */
-
/***
*************************************************************************/
+/*
*************************************************************************
+ * Warnings about unsupported features
+
*
*************************************************************************/
#ifndef FEATURE_ACL
case hash_deny_access:
#endif /* ndef FEATURE_ACL */
#ifndef FEATURE_ACL
case hash_deny_access:
#endif /* ndef FEATURE_ACL */
@@
-1240,9
+1243,9
@@
struct configuration_spec * load_config(void)
/* log_error(LOG_LEVEL_INFO, "Unsupported directive \"%s\" ignored.", cmd); */
continue;
/* log_error(LOG_LEVEL_INFO, "Unsupported directive \"%s\" ignored.", cmd); */
continue;
-/*
**
*************************************************************************/
+/*
*************************************************************************/
default :
default :
-/*
**
*************************************************************************/
+/*
*************************************************************************/
/*
* I decided that I liked this better as a warning than an
* error. To change back to an error, just change log level
/*
* I decided that I liked this better as a warning than an
* error. To change back to an error, just change log level
@@
-1255,7
+1258,7
@@
struct configuration_spec * load_config(void)
string_append(&config->proxy_args, "<br><br>\n");
continue;
string_append(&config->proxy_args, "<br><br>\n");
continue;
-/*
**
*************************************************************************/
+/*
*************************************************************************/
} /* end switch( hash_string(cmd) ) */
} /* end while ( read_config_line(...) ) */
} /* end switch( hash_string(cmd) ) */
} /* end while ( read_config_line(...) ) */