X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=1560697a78ca0a67f39ace929df41e49315a05bd;hp=160ff0da19e28a895c7804588cd8045ce812554b;hb=cd275efe90ca39d461537daf389e79a3cd79e507;hpb=c8f782a4a2fe5672307ed43f81ebd1816d4ca93d
diff --git a/loadcfg.c b/loadcfg.c
index 160ff0da..1560697a 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.59 2006/12/31 17:56:38 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.81 2008/11/13 09:08:42 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -8,7 +8,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.59 2006/12/31 17:56:38 fabiankeil
* routine to load the configuration and the global
* variables it writes to.
*
- * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge
+ * Copyright : Written by and Copyright (C) 2001-2008 the SourceForge
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@ -35,6 +35,92 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.59 2006/12/31 17:56:38 fabiankeil
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.81 2008/11/13 09:08:42 fabiankeil
+ * Add new config option: keep-alive-timeout.
+ *
+ * Revision 1.80 2008/08/31 15:59:03 fabiankeil
+ * There's no reason to let remote toggling support depend
+ * on FEATURE_CGI_EDIT_ACTIONS, so make sure it doesn't.
+ *
+ * Revision 1.79 2008/08/30 12:03:07 fabiankeil
+ * Remove FEATURE_COOKIE_JAR.
+ *
+ * Revision 1.78 2008/08/02 08:23:22 fabiankeil
+ * If the enforce-blocks directive is used with FEATURE_FORCE_LOAD
+ * disabled, log a message that blocks will always be enforced
+ * instead of complaining about an unrecognized directive.
+ * Reported by Pietro Leone.
+ *
+ * Revision 1.77 2008/05/26 16:13:22 fabiankeil
+ * Reuse directive_hash and don't hash the same directive twice.
+ *
+ * Revision 1.76 2008/05/10 09:03:16 fabiankeil
+ * - Merge three string_append() calls.
+ * - Remove useless assertion.
+ *
+ * Revision 1.75 2008/03/30 14:52:05 fabiankeil
+ * Rename load_actions_file() and load_re_filterfile()
+ * as they load multiple files "now".
+ *
+ * Revision 1.74 2008/03/26 18:07:07 fabiankeil
+ * Add hostname directive. Closes PR#1918189.
+ *
+ * Revision 1.73 2008/02/16 16:54:51 fabiankeil
+ * Fix typo.
+ *
+ * Revision 1.72 2008/02/03 13:46:15 fabiankeil
+ * Add SOCKS5 support. Patch #1862863 by Eric M. Hopper with minor changes.
+ *
+ * Revision 1.71 2007/12/23 15:24:56 fabiankeil
+ * Reword "unrecognized directive" warning, use better
+ * mark up and add a
. Fixes parts of #1856559.
+ *
+ * Revision 1.70 2007/12/15 14:24:05 fabiankeil
+ * Plug memory leak if listen-address only specifies the port.
+ *
+ * Revision 1.69 2007/10/27 13:02:27 fabiankeil
+ * Relocate daemon-mode-related log messages to make sure
+ * they aren't shown again in case of configuration reloads.
+ *
+ * Revision 1.68 2007/10/19 16:32:34 fabiankeil
+ * Plug memory leak introduced with my last commit.
+ *
+ * Revision 1.67 2007/10/14 14:12:41 fabiankeil
+ * When in daemon mode, close stderr after the configuration file has been
+ * parsed the first time. If logfile isn't set, stop logging. Fixes BR#897436.
+ *
+ * Revision 1.66 2007/08/05 14:02:09 fabiankeil
+ * #1763173 from Stefan Huehner: declare unload_configfile() static.
+ *
+ * Revision 1.65 2007/07/21 11:51:36 fabiankeil
+ * As Hal noticed, checking dispatch_cgi() as the last cruncher
+ * looks like a bug if CGI requests are blocked unintentionally,
+ * so don't do it unless the user enabled the new config option
+ * "allow-cgi-request-crunching".
+ *
+ * Revision 1.64 2007/05/21 10:44:08 fabiankeil
+ * - Use strlcpy() instead of strcpy().
+ * - Stop treating actions files special. Expect a complete file name
+ * (with or without path) like it's done for the rest of the files.
+ * Closes FR#588084.
+ * - Remove an unnecessary temporary memory allocation.
+ * - Don't log anything to the console when running as
+ * daemon and no errors occurred.
+ *
+ * Revision 1.63 2007/04/09 18:11:36 fabiankeil
+ * Don't mistake VC++'s _snprintf() for a snprintf() replacement.
+ *
+ * Revision 1.62 2007/03/17 15:20:05 fabiankeil
+ * New config option: enforce-blocks.
+ *
+ * Revision 1.61 2007/03/16 16:47:35 fabiankeil
+ * - Mention other reasons why acl directive loading might have failed.
+ * - Don't log the acl source if the acl destination is to blame.
+ *
+ * Revision 1.60 2007/01/27 13:09:16 fabiankeil
+ * Add new config option "templdir" to
+ * change the templates directory.
+ *
* Revision 1.59 2006/12/31 17:56:38 fabiankeil
* Added config option accept-intercepted-requests
* and disabled it by default.
@@ -402,9 +488,6 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.59 2006/12/31 17:56:38 fabiankeil
# include "w32log.h"
# endif /* ndef _WIN_CONSOLE */
-/* VC++ has "_snprintf", not "snprintf" */
-#define snprintf _snprintf
-
#else /* ifndef _WIN32 */
#ifndef __OS2__
@@ -428,6 +511,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.59 2006/12/31 17:56:38 fabiankeil
#include "encode.h"
#include "urlmatch.h"
#include "cgi.h"
+#include "gateway.h"
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
@@ -475,6 +559,7 @@ static struct file_list *current_configfile = NULL;
#define hash_actions_file 1196306641ul /* "actionsfile" */
#define hash_accept_intercepted_requests 1513024973ul /* "accept-intercepted-requests" */
#define hash_admin_address 4112573064ul /* "admin-address" */
+#define hash_allow_cgi_request_crunching 258915987ul /* "allow-cgi-request-crunching" */
#define hash_buffer_limit 1881726070ul /* "buffer-limit */
#define hash_confdir 1978389ul /* "confdir" */
#define hash_debug 78263ul /* "debug" */
@@ -482,12 +567,15 @@ static struct file_list *current_configfile = NULL;
#define hash_enable_edit_actions 2517097536ul /* "enable-edit-actions" */
#define hash_enable_remote_toggle 2979744683ul /* "enable-remote-toggle" */
#define hash_enable_remote_http_toggle 110543988ul /* "enable-remote-http-toggle" */
+#define hash_enforce_blocks 1862427469ul /* "enforce-blocks" */
#define hash_filterfile 250887266ul /* "filterfile" */
#define hash_forward 2029845ul /* "forward" */
#define hash_forward_socks4 3963965521ul /* "forward-socks4" */
#define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */
+#define hash_forward_socks5 3963965522ul /* "forward-socks5" */
#define hash_forwarded_connect_retries 101465292ul /* "forwarded-connect-retries" */
-#define hash_jarfile 2046641ul /* "jarfile" */
+#define hash_hostname 10308071ul /* "hostname" */
+#define hash_keep_alive_timeout 3878599515ul /* "keep-alive-timeout" */
#define hash_listen_address 1255650842ul /* "listen-address" */
#define hash_logdir 422889ul /* "logdir" */
#define hash_logfile 2114766ul /* "logfile" */
@@ -527,7 +615,7 @@ static void savearg(char *command, char *argument, struct configuration_spec * c
* Returns : N/A
*
*********************************************************************/
-void unload_configfile (void * data)
+static void unload_configfile (void * data)
{
struct configuration_spec * config = (struct configuration_spec *)data;
struct forward_spec *cur_fwd = config->forward;
@@ -557,17 +645,10 @@ void unload_configfile (void * data)
}
config->forward = NULL;
-#ifdef FEATURE_COOKIE_JAR
- if ( NULL != config->jar )
- {
- fclose( config->jar );
- config->jar = NULL;
- }
-#endif /* def FEATURE_COOKIE_JAR */
-
freez(config->confdir);
freez(config->logdir);
freez(config->templdir);
+ freez(config->hostname);
freez(config->haddr);
freez(config->logfile);
@@ -585,10 +666,6 @@ void unload_configfile (void * data)
freez(config->proxy_args);
freez(config->usermanual);
-#ifdef FEATURE_COOKIE_JAR
- freez(config->jarfile);
-#endif /* def FEATURE_COOKIE_JAR */
-
#ifdef FEATURE_TRUST
freez(config->trustfile);
list_remove_all(config->trust_info);
@@ -633,6 +710,9 @@ void unload_current_config_file(void)
*
* Description : Load the config file and all parameters.
*
+ * XXX: more than thousand lines long
+ * and thus in serious need of refactoring.
+ *
* Parameters : None
*
* Returns : The configuration_spec, or NULL on error.
@@ -648,6 +728,10 @@ struct configuration_spec * load_config(void)
struct file_list *fs;
unsigned long linenum = 0;
int i;
+ char *logfile = NULL;
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ int keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
+#endif
if ( !check_file_changed(current_configfile, configfile, &fs))
{
@@ -660,7 +744,10 @@ struct configuration_spec * load_config(void)
configfile);
}
- log_error(LOG_LEVEL_INFO, "loading configuration file '%s':", configfile);
+ if (NULL != current_configfile)
+ {
+ log_error(LOG_LEVEL_INFO, "Reloading configuration file '%s'", configfile);
+ }
#ifdef FEATURE_TOGGLE
global_toggle_state = 1;
@@ -718,8 +805,9 @@ struct configuration_spec * load_config(void)
struct forward_spec *cur_fwd;
int vec_count;
char *vec[3];
+ unsigned long directive_hash;
- strcpy(tmp, buf);
+ strlcpy(tmp, buf, sizeof(tmp));
/* Copy command (i.e. up to space or tab) into cmd */
p = buf;
@@ -737,7 +825,7 @@ struct configuration_spec * load_config(void)
}
/* Copy the argument into arg */
- strcpy(arg, p);
+ strlcpy(arg, p, sizeof(arg));
/* Should never happen, but check this anyway */
if (*cmd == '\0')
@@ -757,8 +845,8 @@ struct configuration_spec * load_config(void)
/* Save the argument for show-proxy-args */
savearg(cmd, arg, config);
-
- switch( hash_string( cmd ) )
+ directive_hash = hash_string(cmd);
+ switch (directive_hash)
{
/* *************************************************************************
* actionsfile actions-file-name
@@ -778,15 +866,8 @@ struct configuration_spec * load_config(void)
MAX_AF_FILES);
}
config->actions_file_short[i] = strdup(arg);
- p = malloc(strlen(arg) + sizeof(".action"));
- if (p == NULL)
- {
- log_error(LOG_LEVEL_FATAL, "Out of memory");
- }
- strcpy(p, arg);
- strcat(p, ".action");
- config->actions_file[i] = make_path(config->confdir, p);
- free(p);
+ config->actions_file[i] = make_path(config->confdir, arg);
+
continue;
/* *************************************************************************
* accept-intercepted-requests
@@ -810,6 +891,20 @@ struct configuration_spec * load_config(void)
config->admin_address = strdup(arg);
continue;
+/* *************************************************************************
+ * allow-cgi-request-crunching
+ * *************************************************************************/
+ case hash_allow_cgi_request_crunching:
+ if ((*arg != '\0') && (0 != atoi(arg)))
+ {
+ config->feature_flags |= RUNTIME_FEATURE_CGI_CRUNCHING;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_CGI_CRUNCHING;
+ }
+ continue;
+
/* *************************************************************************
* buffer-limit n
* *************************************************************************/
@@ -863,11 +958,11 @@ struct configuration_spec * load_config(void)
if (acl_addr(vec[0], cur_acl->src) < 0)
{
- log_error(LOG_LEVEL_ERROR, "Invalid source IP for deny-access "
- "directive in configuration file: \"%s\"", vec[0]);
+ log_error(LOG_LEVEL_ERROR, "Invalid source address, port or netmask "
+ "for deny-access directive in configuration file: \"%s\"", vec[0]);
string_append(&config->proxy_args,
- "
\nWARNING: Invalid source IP for deny-access directive"
- " in configuration file: \"");
+ "
\nWARNING: Invalid source address, port or netmask "
+ "for deny-access directive in configuration file: \"");
string_append(&config->proxy_args,
vec[0]);
string_append(&config->proxy_args,
@@ -879,13 +974,13 @@ struct configuration_spec * load_config(void)
{
if (acl_addr(vec[1], cur_acl->dst) < 0)
{
- log_error(LOG_LEVEL_ERROR, "Invalid destination IP for deny-access "
- "directive in configuration file: \"%s\"", vec[0]);
+ log_error(LOG_LEVEL_ERROR, "Invalid destination address, port or netmask "
+ "for deny-access directive in configuration file: \"%s\"", vec[1]);
string_append(&config->proxy_args,
- "
\nWARNING: Invalid destination IP for deny-access directive"
- " in configuration file: \"");
+ "
\nWARNING: Invalid destination address, port or netmask "
+ "for deny-access directive in configuration file: \"");
string_append(&config->proxy_args,
- vec[0]);
+ vec[1]);
string_append(&config->proxy_args,
"\"
\n");
freez(cur_acl);
@@ -927,7 +1022,7 @@ struct configuration_spec * load_config(void)
/* *************************************************************************
* enable-remote-toggle 0|1
* *************************************************************************/
-#ifdef FEATURE_CGI_EDIT_ACTIONS
+#ifdef FEATURE_TOGGLE
case hash_enable_remote_toggle:
if ((*arg != '\0') && (0 != atoi(arg)))
{
@@ -938,7 +1033,7 @@ struct configuration_spec * load_config(void)
config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE;
}
continue;
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
+#endif /* def FEATURE_TOGGLE */
/* *************************************************************************
* enable-remote-http-toggle 0|1
@@ -954,6 +1049,25 @@ struct configuration_spec * load_config(void)
}
continue;
+/* *************************************************************************
+ * enforce-blocks 0|1
+ * *************************************************************************/
+ case hash_enforce_blocks:
+#ifdef FEATURE_FORCE_LOAD
+ if ((*arg != '\0') && (0 != atoi(arg)))
+ {
+ config->feature_flags |= RUNTIME_FEATURE_ENFORCE_BLOCKS;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_ENFORCE_BLOCKS;
+ }
+#else
+ log_error(LOG_LEVEL_ERROR, "Ignoring directive 'enforce-blocks'. "
+ "FEATURE_FORCE_LOAD is disabled, blocks will always be enforced.");
+#endif /* def FEATURE_FORCE_LOAD */
+ continue;
+
/* *************************************************************************
* filterfile file-name
* In confdir by default.
@@ -972,14 +1086,8 @@ struct configuration_spec * load_config(void)
MAX_AF_FILES);
}
config->re_filterfile_short[i] = strdup(arg);
- p = malloc(strlen(arg) + 1);
- if (p == NULL)
- {
- log_error(LOG_LEVEL_FATAL, "Out of memory");
- }
- strcpy(p, arg);
- config->re_filterfile[i] = make_path(config->confdir, p);
- free(p);
+ config->re_filterfile[i] = make_path(config->confdir, arg);
+
continue;
/* *************************************************************************
@@ -1130,6 +1238,7 @@ struct configuration_spec * load_config(void)
* forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port])
* *************************************************************************/
case hash_forward_socks4a:
+ case hash_forward_socks5:
vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
if (vec_count != 3)
@@ -1151,7 +1260,14 @@ struct configuration_spec * load_config(void)
continue;
}
- cur_fwd->type = SOCKS_4A;
+ if (directive_hash == hash_forward_socks4a)
+ {
+ cur_fwd->type = SOCKS_4A;
+ }
+ else
+ {
+ cur_fwd->type = SOCKS_5;
+ }
/* Save the URL pattern */
if (create_url_spec(cur_fwd->url, vec[0]))
@@ -1212,15 +1328,37 @@ struct configuration_spec * load_config(void)
continue;
/* *************************************************************************
- * jarfile jar-file-name
- * In logdir by default
+ * hostname hostname-to-show-on-cgi-pages
* *************************************************************************/
-#ifdef FEATURE_COOKIE_JAR
- case hash_jarfile :
- freez(config->jarfile);
- config->jarfile = make_path(config->logdir, arg);
+ case hash_hostname :
+ freez(config->hostname);
+ config->hostname = strdup(arg);
+ if (NULL == config->hostname)
+ {
+ log_error(LOG_LEVEL_FATAL, "Out of memory saving hostname.");
+ }
continue;
-#endif /* def FEATURE_COOKIE_JAR */
+
+/* *************************************************************************
+ * keep-alive-timeout timeout
+ * *************************************************************************/
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ case hash_keep_alive_timeout :
+ if (*arg != '\0')
+ {
+ int timeout = atoi(arg);
+ if (0 <= timeout)
+ {
+ config->feature_flags |= RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
+ keep_alive_timeout = timeout;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
+ }
+ }
+ continue;
+#endif
/* *************************************************************************
* listen-address [ip][:port]
@@ -1243,8 +1381,14 @@ struct configuration_spec * load_config(void)
* In logdir by default
* *************************************************************************/
case hash_logfile :
- freez(config->logfile);
- config->logfile = no_daemon ? NULL : make_path(config->logdir, arg);
+ if (!no_daemon)
+ {
+ logfile = make_path(config->logdir, arg);
+ if (NULL == logfile)
+ {
+ log_error(LOG_LEVEL_FATAL, "Out of memory while creating logfile path");
+ }
+ }
continue;
/* *************************************************************************
@@ -1278,11 +1422,11 @@ struct configuration_spec * load_config(void)
if (acl_addr(vec[0], cur_acl->src) < 0)
{
- log_error(LOG_LEVEL_ERROR, "Invalid source IP for permit-access "
- "directive in configuration file: \"%s\"", vec[0]);
+ log_error(LOG_LEVEL_ERROR, "Invalid source address, port or netmask "
+ "for permit-access directive in configuration file: \"%s\"", vec[0]);
string_append(&config->proxy_args,
- "
\nWARNING: Invalid source IP for permit-access directive"
- " in configuration file: \"");
+ "
\nWARNING: Invalid source address, port or netmask for "
+ "permit-access directive in configuration file: \"");
string_append(&config->proxy_args,
vec[0]);
string_append(&config->proxy_args,
@@ -1294,14 +1438,13 @@ struct configuration_spec * load_config(void)
{
if (acl_addr(vec[1], cur_acl->dst) < 0)
{
- log_error(LOG_LEVEL_ERROR, "Invalid destination IP for "
- "permit-access directive in configuration file: \"%s\"",
- vec[0]);
+ log_error(LOG_LEVEL_ERROR, "Invalid destination address, port or netmask "
+ "for permit-access directive in configuration file: \"%s\"", vec[1]);
string_append(&config->proxy_args,
- "
\nWARNING: Invalid destination IP for permit-access directive"
- " in configuration file: \"");
+ "
\nWARNING: Invalid destination address, port or netmask for "
+ "permit-access directive in configuration file: \"");
string_append(&config->proxy_args,
- vec[0]);
+ vec[1]);
string_append(&config->proxy_args,
"\"
\n");
freez(cur_acl);
@@ -1491,11 +1634,10 @@ struct configuration_spec * load_config(void)
#endif /* ndef FEATURE_ACL */
#ifndef FEATURE_CGI_EDIT_ACTIONS
case hash_enable_edit_actions:
+#endif /* ndef FEATURE_CGI_EDIT_ACTIONS */
+#ifndef FEATURE_TOGGLE
case hash_enable_remote_toggle:
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
-#ifndef FEATURE_COOKIE_JAR
- case hash_jarfile :
-#endif /* ndef FEATURE_COOKIE_JAR */
+#endif /* ndef FEATURE_TOGGLE */
#ifndef FEATURE_ACL
case hash_permit_access:
#endif /* ndef FEATURE_ACL */
@@ -1535,9 +1677,9 @@ struct configuration_spec * load_config(void)
* to LOG_LEVEL_FATAL.
*/
log_error(LOG_LEVEL_ERROR, "Ignoring unrecognized directive '%s' (%luul) in line %lu "
- "in configuration file (%s).", buf, hash_string(cmd), linenum, configfile);
+ "in configuration file (%s).", buf, directive_hash, linenum, configfile);
string_append(&config->proxy_args,
- " WARNING: unrecognized directive, ignored");
+ " Warning: ignored unrecognized directive above.
");
continue;
/* *************************************************************************/
@@ -1546,21 +1688,39 @@ struct configuration_spec * load_config(void)
fclose(configfp);
+ set_debug_level(config->debug);
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ set_keep_alive_timeout(keep_alive_timeout);
+#endif
+
+ freez(config->logfile);
+
+ if (!no_daemon)
+ {
+ if (NULL != logfile)
+ {
+ config->logfile = logfile;
+ init_error_log(Argv[0], config->logfile);
+ }
+ else
+ {
+ disable_logging();
+ }
+ }
+
if (NULL == config->proxy_args)
{
log_error(LOG_LEVEL_FATAL, "Out of memory loading config - insufficient memory for config->proxy_args");
}
- init_error_log(Argv[0], config->logfile, config->debug);
-
if (config->actions_file[0])
{
- add_loader(load_actions_file, config);
+ add_loader(load_action_files, config);
}
- if (config->re_filterfile)
+ if (config->re_filterfile[0])
{
- add_loader(load_re_filterfile, config);
+ add_loader(load_re_filterfiles, config);
}
#ifdef FEATURE_TRUST
@@ -1570,18 +1730,6 @@ struct configuration_spec * load_config(void)
}
#endif /* def FEATURE_TRUST */
-#ifdef FEATURE_COOKIE_JAR
- if ( NULL != config->jarfile )
- {
- if ( NULL == (config->jar = fopen(config->jarfile, "a")) )
- {
- log_error(LOG_LEVEL_FATAL, "can't open jarfile '%s': %E", config->jarfile);
- /* Never get here - LOG_LEVEL_FATAL causes program exit */
- }
- setbuf(config->jar, NULL);
- }
-#endif /* def FEATURE_COOKIE_JAR */
-
if ( NULL == config->haddr )
{
config->haddr = strdup( HADDR_DEFAULT );
@@ -1606,7 +1754,11 @@ struct configuration_spec * load_config(void)
}
if (*config->haddr == '\0')
{
- config->haddr = NULL;
+ /*
+ * Only the port specified. We stored it in config->hport
+ * and don't need its text representation anymore.
+ */
+ freez(config->haddr);
}
}
@@ -1711,12 +1863,11 @@ static void savearg(char *command, char *argument, struct configuration_spec * c
char * s;
assert(command);
- assert(*command);
assert(argument);
/*
* Add config option name embedded in
- * link to it's section in the user-manual
+ * link to its section in the user-manual
*/
buf = strdup("\nusermanual, "file://", 7) ||
@@ -1726,9 +1877,7 @@ static void savearg(char *command, char *argument, struct configuration_spec * c
}
else
{
- string_append(&buf, "http://");
- string_append(&buf, CGI_SITE_2_HOST);
- string_append(&buf, "/user-manual/");
+ string_append(&buf, "http://" CGI_SITE_2_HOST "/user-manual/");
}
string_append(&buf, CONFIG_HELP_PREFIX);
string_join (&buf, string_toupper(command));