X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=1d6a10ebe1f8e9e9645a67c58ecde18f9cc00a59;hp=d62244cb7d3009eca47bfa83437513d61f957320;hb=a2dc27748cbcd8cf95ac96197291fac3c4cba4fc;hpb=4ef2e11672d18bdb4751cf781f0623d7252248fe diff --git a/loadcfg.c b/loadcfg.c index d62244cb..1d6a10eb 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.45 2002/04/24 02:11:54 oes Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.47 2002/05/12 21:36:29 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -35,6 +35,14 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.45 2002/04/24 02:11:54 oes Exp $" * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.47 2002/05/12 21:36:29 jongfoster + * Correcting function comments + * + * Revision 1.46 2002/04/26 12:55:14 oes + * - New option "user-manual", defaults to our site + * via project.h #define + * - savearg now embeds option names in help links + * * Revision 1.45 2002/04/24 02:11:54 oes * Jon's multiple AF patch: Allow up to MAX_ACTION_FILES actionsfile options * @@ -530,11 +538,9 @@ void unload_current_config_file(void) * * Description : Load the config file and all parameters. * - * Parameters : - * 1 : csp = Client state (the config member will be - * filled in by this function). + * Parameters : None * - * Returns : 0 => Ok, everything else is an error. + * Returns : The configuration_spec, or NULL on error. * *********************************************************************/ struct configuration_spec * load_config(void) @@ -1520,6 +1526,7 @@ struct configuration_spec * load_config(void) * Parameters : * 1 : command = config setting that was found * 2 : argument = the setting's argument (if any) + * 3 : config = Configuration to save into. * * Returns : N/A * @@ -1533,8 +1540,17 @@ static void savearg(char *command, char *argument, struct configuration_spec * c assert(*command); assert(argument); - buf = strdup(""); - string_join(&buf, add_help_link(command, config)); + /* + * Add config option name embedded in + * link to it's section in the user-manual + */ + buf = strdup("usermanual); + string_append(&buf, CONFIG_HELP_PREFIX); + string_join (&buf, string_toupper(command)); + string_append(&buf, "\">"); + string_append(&buf, command); + string_append(&buf, " "); if (NULL == buf) {