Multiple action files: Add options and change comments

[privoxy.git] / loadcfg.c

diff --git a/loadcfg.c b/loadcfg.c
index 30af0f9..b5500c1 100644 (file)
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.38 2002/03/24 13:05:48 jongfoster Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.44 2002/04/08 20:37:13 swa Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -9,7 +9,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.38 2002/03/24 13:05:48 jongfoster
  *                variables it writes to.
  *
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                Privoxy team.  http://ijbswa.sourceforge.net
+ *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and
@@ -35,6 +35,24 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.38 2002/03/24 13:05:48 jongfoster
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
+ *    Revision 1.44  2002/04/08 20:37:13  swa
+ *    fixed JB spelling
+ *
+ *    Revision 1.43  2002/04/08 20:36:50  swa
+ *    fixed JB spelling
+ *
+ *    Revision 1.42  2002/04/05 15:50:15  oes
+ *    fix for invalid HTML proxy_args
+ *
+ *    Revision 1.41  2002/03/31 17:19:00  jongfoster
+ *    Win32 only: Enabling STRICT to fix a VC++ compile warning.
+ *
+ *    Revision 1.40  2002/03/26 22:29:55  swa
+ *    we have a new homepage!
+ *
+ *    Revision 1.39  2002/03/24 13:25:43  swa
+ *    name change related issues
+ *
  *    Revision 1.38  2002/03/24 13:05:48  jongfoster
  *    Renaming re_filterfile to filterfile
  *
@@ -286,6 +304,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.38 2002/03/24 13:05:48 jongfoster
 
 #ifdef _WIN32
 
+# ifndef STRICT
+#  define STRICT
+# endif
 # include <windows.h>
 
 # include "win32.h"
@@ -334,7 +355,7 @@ const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
 
 #ifdef FEATURE_TOGGLE
 /* by haroon - indicates if ijb is enabled */
-int g_bToggleIJB        = 1;   /* JunkBusters is enabled by default. */
+int g_bToggleIJB        = 1;   /* Privoxy is enabled by default. */
 #endif /* def FEATURE_TOGGLE */
 
 /* The filename of the configfile */
@@ -418,6 +439,7 @@ void unload_configfile (void * data)
    struct forward_spec *cur_fwd = config->forward;
 #ifdef FEATURE_ACL
    struct access_control_list *cur_acl = config->acl;
+   int i;
 
    while (cur_acl != NULL)
    {
@@ -454,7 +476,12 @@ void unload_configfile (void * data)
    freez(config->haddr);
    freez(config->logfile);
 
-   freez(config->actions_file);
+   for (i = 0; i < MAX_ACTION_FILES; i++)
+   {
+      freez(config->actions_file_short[i]);
+      freez(config->actions_file[i]);
+   }
+
    freez(config->admin_address);
    freez(config->proxy_info_url);
    freez(config->proxy_args);
@@ -514,6 +541,7 @@ struct configuration_spec * load_config(void)
    struct client_state * fake_csp;
    struct file_list *fs;
    unsigned long linenum = 0;
+   int i;
 
    if ( !check_file_changed(current_configfile, configfile, &fs))
    {
@@ -627,8 +655,28 @@ struct configuration_spec * load_config(void)
  * In confdir by default
  * *************************************************************************/
          case hash_actions_file :
-            freez(config->actions_file);
-            config->actions_file = make_path(config->confdir, arg);
+            i = 0;
+            while ((i < MAX_ACTION_FILES) && (NULL != config->actions_file[i]))
+            {
+               i++;
+            }
+
+            if (i >= MAX_ACTION_FILES)
+            {
+               log_error(LOG_LEVEL_FATAL, "Too many 'actionsfile' directives in config file - limit is %d.\n"
+                  "(You can increase this limit by changing MAX_ACTION_FILES in project.h and recompiling).",
+                  MAX_ACTION_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);
             continue;
 
 /* *************************************************************************
@@ -1314,7 +1362,7 @@ struct configuration_spec * load_config(void)
 
    init_error_log(Argv[0], config->logfile, config->debug);
 
-   if (config->actions_file)
+   if (config->actions_file[0])
    {
       add_loader(load_actions_file, config);
    }
@@ -1390,7 +1438,7 @@ struct configuration_spec * load_config(void)
 /* FIXME: this is a kludge for win32 */
 #if defined(_WIN32) && !defined (_WIN_CONSOLE)
 
-   g_actions_file     = config->actions_file;
+   g_actions_file     = config->actions_file[0]; /* FIXME only works for first action file */
    g_re_filterfile    = config->re_filterfile;
 
 #ifdef FEATURE_TRUST
@@ -1482,7 +1530,9 @@ static void savearg(char *command, char *argument, struct configuration_spec * c
       freez(config->proxy_args);
       return;
    }
-   string_append(&buf, "<a href=\"" REDIRECT_URL "option#");
+   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);