projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added explanation about version numbers and RPM package revisions
[privoxy.git]
/
loadcfg.c
diff --git
a/loadcfg.c
b/loadcfg.c
index
b5500c1
..
d62244c
100644
(file)
--- a/
loadcfg.c
+++ b/
loadcfg.c
@@
-1,4
+1,4
@@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.4
4 2002/04/08 20:37:13 swa
Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.4
5 2002/04/24 02:11:54 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.44 2002/04/08 20:37:13 swa Exp $"
*
* Revisions :
* $Log: loadcfg.c,v $
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.45 2002/04/24 02:11:54 oes
+ * Jon's multiple AF patch: Allow up to MAX_ACTION_FILES actionsfile options
+ *
* Revision 1.44 2002/04/08 20:37:13 swa
* fixed JB spelling
*
* Revision 1.44 2002/04/08 20:37:13 swa
* fixed JB spelling
*
@@
-339,6
+342,7
@@
const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.44 2002/04/08 20:37:13 swa Exp $"
#include "ssplit.h"
#include "encode.h"
#include "urlmatch.h"
#include "ssplit.h"
#include "encode.h"
#include "urlmatch.h"
+#include "cgi.h"
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
@@
-406,7
+410,7
@@
static struct file_list *current_configfile = NULL;
#define hash_toggle 447966ul /* "toggle" */
#define hash_trust_info_url 430331967ul /* "trust-info-url" */
#define hash_trustfile 56494766ul /* "trustfile" */
#define hash_toggle 447966ul /* "toggle" */
#define hash_trust_info_url 430331967ul /* "trust-info-url" */
#define hash_trustfile 56494766ul /* "trustfile" */
-
+#define hash_usermanual 1416668518ul /* "user-manual" */
#define hash_activity_animation 1817904738ul /* "activity-animation" */
#define hash_close_button_minimizes 3651284693ul /* "close-button-minimizes" */
#define hash_hide_console 2048809870ul /* "hide-console" */
#define hash_activity_animation 1817904738ul /* "activity-animation" */
#define hash_close_button_minimizes 3651284693ul /* "close-button-minimizes" */
#define hash_hide_console 2048809870ul /* "hide-console" */
@@
-485,6
+489,7
@@
void unload_configfile (void * data)
freez(config->admin_address);
freez(config->proxy_info_url);
freez(config->proxy_args);
freez(config->admin_address);
freez(config->proxy_info_url);
freez(config->proxy_args);
+ freez(config->usermanual);
#ifdef FEATURE_COOKIE_JAR
freez(config->jarfile);
#ifdef FEATURE_COOKIE_JAR
freez(config->jarfile);
@@
-584,10
+589,10
@@
struct configuration_spec * load_config(void)
/*
* Set to defaults
*/
/*
* Set to defaults
*/
-
config->multi_threaded = 1;
config->hport = HADDR_PORT;
config->buffer_limit = 4096 * 1024;
config->multi_threaded = 1;
config->hport = HADDR_PORT;
config->buffer_limit = 4096 * 1024;
+ config->usermanual = strdup(USER_MANUAL_URL);
config->proxy_args = strdup("");
if ((configfp = fopen(configfile, "r")) == NULL)
config->proxy_args = strdup("");
if ((configfp = fopen(configfile, "r")) == NULL)
@@
-1205,6
+1210,13
@@
struct configuration_spec * load_config(void)
continue;
#endif /* def FEATURE_TRUST */
continue;
#endif /* def FEATURE_TRUST */
+/* *************************************************************************
+ * usermanual url
+ * *************************************************************************/
+ case hash_usermanual :
+ freez(config->usermanual);
+ config->usermanual = strdup(arg);
+ continue;
/* *************************************************************************
* Win32 Console options:
/* *************************************************************************
* Win32 Console options:
@@
-1522,21
+1534,13
@@
static void savearg(char *command, char *argument, struct configuration_spec * c
assert(argument);
buf = strdup("");
assert(argument);
buf = strdup("");
+ string_join(&buf, add_help_link(command, config));
- s = html_encode(command);
- if (NULL == s)
+ if (NULL == buf)
{
{
- freez(buf);
freez(config->proxy_args);
return;
}
freez(config->proxy_args);
return;
}
- string_append(&buf, "<a href=\"");
- string_append(&buf, html_encode(REDIRECT_URL));
- string_append(&buf, "option#");
- string_append(&buf, s);
- string_append(&buf, "\">");
- string_join (&buf, s);
- string_append(&buf, "</a> ");
if ( (NULL != argument) && ('\0' != *argument) )
{
if ( (NULL != argument) && ('\0' != *argument) )
{