X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loadcfg.c;h=72d91b39810ace23f6a2926a3ea605f33d288235;hb=e5e8de7741d7605bbf0419df7e2638ff58401c61;hp=18db099187adae7d9c226ca7b1ff94986fbe0ead;hpb=536a88ebe11300228987eaa39ef4bbd63cd0e1ba;p=privoxy.git
diff --git a/loadcfg.c b/loadcfg.c
index 18db0991..72d91b39 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.19 2001/07/15 17:45:16 jongfoster Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.21 2001/09/16 17:10:43 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -35,6 +35,16 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.19 2001/07/15 17:45:16 jongfoster
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.21 2001/09/16 17:10:43 jongfoster
+ * Moving function savearg() here, since it was the only thing left in
+ * showargs.c.
+ *
+ * Revision 1.20 2001/07/30 22:08:36 jongfoster
+ * Tidying up #defines:
+ * - All feature #defines are now of the form FEATURE_xxx
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
* Revision 1.19 2001/07/15 17:45:16 jongfoster
* Removing some unused #includes
*
@@ -226,14 +236,10 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.19 2001/07/15 17:45:16 jongfoster
#include "jcc.h"
#include "filters.h"
#include "loaders.h"
-#include "showargs.h"
-#include "parsers.h"
-#include "killpopup.h"
#include "miscutil.h"
#include "errlog.h"
-#include "jbsockets.h"
-#include "gateway.h"
#include "ssplit.h"
+#include "encode.h"
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
@@ -311,6 +317,8 @@ static struct file_list *current_configfile = NULL;
#define hash_show_on_task_bar 215410365ul /* "show-on-task-bar" */
+static void savearg(char *c, char *o, struct configuration_spec * config);
+
/*********************************************************************
*
@@ -454,7 +462,7 @@ struct configuration_spec * load_config(void)
/* Never get here - LOG_LEVEL_FATAL causes program exit */
}
- while (read_config_line(buf, sizeof(buf), configfp, fs) != NULL)
+ while (read_config_line(buf, sizeof(buf), configfp) != NULL)
{
char cmd[BUFFER_SIZE];
char arg[BUFFER_SIZE];
@@ -1284,6 +1292,62 @@ struct configuration_spec * load_config(void)
}
+/*********************************************************************
+ *
+ * Function : savearg
+ *
+ * Description : Called from `load_config'. It saves each non-empty
+ * and non-comment line from config into a list. This
+ * list is used to create the show-proxy-args page.
+ *
+ * Parameters :
+ * 1 : c = config setting that was found
+ * 2 : o = the setting's argument (if any)
+ *
+ * Returns : N/A
+ *
+ *********************************************************************/
+static void savearg(char *c, char *o, struct configuration_spec * config)
+{
+ char buf[BUFFER_SIZE];
+
+ *buf = '\0';
+
+ if ( ( NULL != c ) && ( '\0' != *c ) )
+ {
+ if ((c = html_encode(c)))
+ {
+ sprintf(buf, "%s ", c, c);
+ }
+ freez(c);
+ }
+ if ( ( NULL != o ) && ( '\0' != *o ) )
+ {
+ if ((o = html_encode(o)))
+ {
+ if (strncmpic(o, "http://", 7) == 0)
+ {
+ strcat(buf, "");
+ strcat(buf, o);
+ strcat(buf, "");
+ }
+ else
+ {
+ strcat(buf, o);
+ }
+ }
+ freez(o);
+ }
+
+ strcat(buf, "
\n");
+
+ config->proxy_args = strsav(config->proxy_args, buf);
+
+}
+
+
/*
Local Variables:
tab-width: 3