X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=actions.c;h=e3428f70b6bb8309e8c7ff3f847222f6d3fda66f;hp=113024edd078c8cb2481caddd53949de17122c95;hb=d8a952c6da2ac7eda32c7b282cf847568c46bc22;hpb=c31dff24961d15a9cf13b81ec3d19ad68074107a

diff --git a/actions.c b/actions.c
index 113024ed..e3428f70 100644
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.21 2002/01/17 20:54:44 jongfoster Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.26 2002/03/26 22:29:54 swa Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
@@ -7,7 +7,7 @@ const char actions_rcs[] = "$Id: actions.c,v 1.21 2002/01/17 20:54:44 jongfoster
  *                Functions declared include: FIXME
  *
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                IJBSWA 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
@@ -33,6 +33,28 @@ const char actions_rcs[] = "$Id: actions.c,v 1.21 2002/01/17 20:54:44 jongfoster
  *
  * Revisions   :
  *    $Log: actions.c,v $
+ *    Revision 1.26  2002/03/26 22:29:54  swa
+ *    we have a new homepage!
+ *
+ *    Revision 1.25  2002/03/24 13:25:43  swa
+ *    name change related issues
+ *
+ *    Revision 1.24  2002/03/16 23:54:06  jongfoster
+ *    Adding graceful termination feature, to help look for memory leaks.
+ *    If you enable this (which, by design, has to be done by hand
+ *    editing config.h) and then go to http://i.j.b/die, then the program
+ *    will exit cleanly after the *next* request.  It should free all the
+ *    memory that was used.
+ *
+ *    Revision 1.23  2002/03/07 03:46:16  oes
+ *    Fixed compiler warnings
+ *
+ *    Revision 1.22  2002/01/21 00:27:02  jongfoster
+ *    Allowing free_action(NULL).
+ *    Moving the functions that #include actionlist.h to the end of the file,
+ *    because the Visual C++ 97 debugger gets extremely confused if you try
+ *    to debug any code that comes after them in the file.
+ *
  *    Revision 1.21  2002/01/17 20:54:44  jongfoster
  *    Renaming free_url to free_url_spec, since it frees a struct url_spec.
  *
@@ -207,6 +229,9 @@ static const struct action_name action_names[] =
 };
 
 
+static int load_one_actions_file(struct client_state *csp, int fileid);
+
+
 /*********************************************************************
  *
  * Function    :  merge_actions
@@ -288,8 +313,6 @@ jb_err merge_actions (struct action_spec *dest,
  *
  * Description :  Copy an action_specs.
  *                Similar to "cur_action = new_action".
- *                Note that dest better not contain valid data
- *                - it's overwritten, not freed.
  *
  * Parameters  :
  *          1  :  dest = Destination of copy.
@@ -304,6 +327,7 @@ jb_err copy_action (struct action_spec *dest,
    int i;
    jb_err err = JB_ERR_OK;
 
+   free_action(dest);
    memset(dest, '\0', sizeof(*dest));
 
    dest->mask = src->mask;
@@ -573,16 +597,16 @@ jb_err get_actions(char *line,
                {
                   /* append multi string. */
 
-                  struct list * remove = cur_action->multi_remove[action->index];
-                  struct list * add    = cur_action->multi_add[action->index];
+                  struct list * remove_p = cur_action->multi_remove[action->index];
+                  struct list * add_p    = cur_action->multi_add[action->index];
 
                   if ((value == NULL) || (*value == '\0'))
                   {
                      return JB_ERR_PARSE;
                   }
 
-                  list_remove_item(remove, value);
-                  err = enlist_unique(add, value, 0);
+                  list_remove_item(remove_p, value);
+                  err = enlist_unique(add_p, value, 0);
                   if (err)
                   {
                      return err;
@@ -593,8 +617,8 @@ jb_err get_actions(char *line,
                {
                   /* remove multi string. */
 
-                  struct list * remove = cur_action->multi_remove[action->index];
-                  struct list * add    = cur_action->multi_add[action->index];
+                  struct list * remove_p = cur_action->multi_remove[action->index];
+                  struct list * add_p    = cur_action->multi_add[action->index];
 
                   if ( (value == NULL) || (*value == '\0')
                      || ((*value == '*') && (value[1] == '\0')) )
@@ -604,8 +628,8 @@ jb_err get_actions(char *line,
                       *
                       * Remove *ALL*.
                       */
-                     list_remove_all(remove);
-                     list_remove_all(add);
+                     list_remove_all(remove_p);
+                     list_remove_all(add_p);
                      cur_action->multi_remove_all[action->index] = 1;
                   }
                   else
@@ -615,13 +639,13 @@ jb_err get_actions(char *line,
                      if ( !cur_action->multi_remove_all[action->index] )
                      {
                         /* there isn't a catch-all in the remove list already */
-                        err = enlist_unique(remove, value, 0);
+                        err = enlist_unique(remove_p, value, 0);
                         if (err)
                         {
                            return err;
                         }
                      }
-                     list_remove_item(add, value);
+                     list_remove_item(add_p, value);
                   }
                   break;
                }
@@ -798,6 +822,36 @@ void free_current_action (struct current_action_spec *src)
 }
 
 
+static struct file_list *current_actions_file[MAX_ACTION_FILES]  = {
+   NULL, NULL, NULL, NULL, NULL,
+   NULL, NULL, NULL, NULL, NULL
+};
+
+
+#ifdef FEATURE_GRACEFUL_TERMINATION
+/*********************************************************************
+ *
+ * Function    :  unload_current_actions_file
+ *
+ * Description :  Unloads current actions file - reset to state at
+ *                beginning of program.
+ *
+ * Parameters  :  None
+ *
+ * Returns     :  N/A
+ *
+ *********************************************************************/
+void unload_current_actions_file(void)
+{
+   if (current_actions_file)
+   {
+      current_actions_file->unloader = unload_actions_file;
+      current_actions_file = NULL;
+   }
+}
+#endif /* FEATURE_GRACEFUL_TERMINATION */
+
+
 /*********************************************************************
  *
  * Function    :  unload_actions_file
@@ -857,7 +911,7 @@ void free_alias_list(struct action_alias *alias_list)
  *
  * Function    :  load_actions_file
  *
- * Description :  Read and parse a action file and add to files
+ * Description :  Read and parse all the action files and add to files
  *                list.
  *
  * Parameters  :
@@ -868,7 +922,45 @@ void free_alias_list(struct action_alias *alias_list)
  *********************************************************************/
 int load_actions_file(struct client_state *csp)
 {
-   static struct file_list *current_actions_file  = NULL;
+   int i;
+   int result;
+
+   for (i = 0; i < MAX_ACTION_FILES; i++)
+   {
+      if (csp->config->actions_file[i])
+      {
+         result = load_one_actions_file(csp, i);
+         if (result)
+         {
+            return result;
+         }
+      }
+      else if (current_actions_file[i])
+      {
+         current_actions_file[i]->unloader = unload_actions_file;
+         current_actions_file[i] = NULL;
+      }
+   }
+
+   return 0;
+}
+
+/*********************************************************************
+ *
+ * Function    :  load_one_actions_file
+ *
+ * Description :  Read and parse a action file and add to files
+ *                list.
+ *
+ * Parameters  :
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  fileid = File index to load.
+ *
+ * Returns     :  0 => Ok, everything else is an error.
+ *
+ *********************************************************************/
+static int load_one_actions_file(struct client_state *csp, int fileid)
+{
 
    /*
     * Parser mode.
@@ -893,19 +985,16 @@ int load_actions_file(struct client_state *csp)
    struct action_alias * alias_list = NULL;
    unsigned long linenum = 0;
 
-   if (!check_file_changed(current_actions_file, csp->config->actions_file, &fs))
+   if (!check_file_changed(current_actions_file[fileid], csp->config->actions_file[fileid], &fs))
    {
       /* No need to load */
-      if (csp)
-      {
-         csp->actions_list = current_actions_file;
-      }
+      csp->actions_list[fileid] = current_actions_file[fileid];
       return 0;
    }
    if (!fs)
    {
       log_error(LOG_LEVEL_FATAL, "can't load actions file '%s': error finding file: %E",
-                csp->config->actions_file);
+                csp->config->actions_file[fileid]);
       return 1; /* never get here */
    }
 
@@ -913,14 +1002,14 @@ int load_actions_file(struct client_state *csp)
    if (last_perm == NULL)
    {
       log_error(LOG_LEVEL_FATAL, "can't load actions file '%s': out of memory!",
-                csp->config->actions_file);
+                csp->config->actions_file[fileid]);
       return 1; /* never get here */
    }
 
-   if ((fp = fopen(csp->config->actions_file, "r")) == NULL)
+   if ((fp = fopen(csp->config->actions_file[fileid], "r")) == NULL)
    {
       log_error(LOG_LEVEL_FATAL, "can't load actions file '%s': error opening file: %E",
-                csp->config->actions_file);
+                csp->config->actions_file[fileid]);
       return 1; /* never get here */
    }
 
@@ -941,7 +1030,7 @@ int load_actions_file(struct client_state *csp)
                fclose(fp);
                log_error(LOG_LEVEL_FATAL,
                   "can't load actions file '%s': invalid line (%lu): %s", 
-                  csp->config->actions_file, linenum, buf);
+                  csp->config->actions_file[fileid], linenum, buf);
                return 1; /* never get here */
             }
 
@@ -955,7 +1044,7 @@ int load_actions_file(struct client_state *csp)
                fclose(fp);
                log_error(LOG_LEVEL_FATAL,
                   "can't load actions file '%s': invalid line (%lu): {{ }}",
-                  csp->config->actions_file, linenum);
+                  csp->config->actions_file[fileid], linenum);
                return 1; /* never get here */
             }
 
@@ -987,7 +1076,7 @@ int load_actions_file(struct client_state *csp)
                   fclose(fp);
                   log_error(LOG_LEVEL_FATAL,
                      "can't load actions file '%s': line %lu: {{settings}} must only appear once, and it must be before anything else.",
-                     csp->config->actions_file, linenum);
+                     csp->config->actions_file[fileid], linenum);
                }
                mode = MODE_SETTINGS;
             }
@@ -1001,7 +1090,7 @@ int load_actions_file(struct client_state *csp)
                   fclose(fp);
                   log_error(LOG_LEVEL_FATAL,
                      "can't load actions file '%s': line %lu: {{description}} must only appear once, and only a {{settings}} block may be above it.",
-                     csp->config->actions_file, linenum);
+                     csp->config->actions_file[fileid], linenum);
                }
                mode = MODE_DESCRIPTION;
             }
@@ -1023,7 +1112,7 @@ int load_actions_file(struct client_state *csp)
                   fclose(fp);
                   log_error(LOG_LEVEL_FATAL,
                      "can't load actions file '%s': line %lu: {{alias}} must only appear once, and it must be before all actions.",
-                     csp->config->actions_file, linenum);
+                     csp->config->actions_file[fileid], linenum);
                }
                mode = MODE_ALIAS;
             }
@@ -1033,7 +1122,7 @@ int load_actions_file(struct client_state *csp)
                fclose(fp);
                log_error(LOG_LEVEL_FATAL,
                   "can't load actions file '%s': invalid line (%lu): {{%s}}",
-                  csp->config->actions_file, linenum, start);
+                  csp->config->actions_file[fileid], linenum, start);
                return 1; /* never get here */
             }
          }
@@ -1064,7 +1153,7 @@ int load_actions_file(struct client_state *csp)
                fclose(fp);
                log_error(LOG_LEVEL_FATAL,
                   "can't load actions file '%s': out of memory",
-                  csp->config->actions_file);
+                  csp->config->actions_file[fileid]);
                return 1; /* never get here */
             }
             init_action(cur_action);
@@ -1080,7 +1169,7 @@ int load_actions_file(struct client_state *csp)
                fclose(fp);
                log_error(LOG_LEVEL_FATAL,
                   "can't load actions file '%s': invalid line (%lu): %s",
-                  csp->config->actions_file, linenum, buf);
+                  csp->config->actions_file[fileid], linenum, buf);
                return 1; /* never get here */
             }
             *end = '\0';
@@ -1094,7 +1183,7 @@ int load_actions_file(struct client_state *csp)
                fclose(fp);
                log_error(LOG_LEVEL_FATAL,
                   "can't load actions file '%s': invalid line (%lu): %s",
-                  csp->config->actions_file, linenum, buf);
+                  csp->config->actions_file[fileid], linenum, buf);
                return 1; /* never get here */
             }
          }
@@ -1129,7 +1218,7 @@ int load_actions_file(struct client_state *csp)
          {
             log_error(LOG_LEVEL_FATAL,
                "can't load actions file '%s': invalid alias line (%lu): %s",
-               csp->config->actions_file, linenum, buf);
+               csp->config->actions_file[fileid], linenum, buf);
             return 1; /* never get here */
          }
 
@@ -1138,7 +1227,7 @@ int load_actions_file(struct client_state *csp)
             fclose(fp);
             log_error(LOG_LEVEL_FATAL,
                "can't load actions file '%s': out of memory!",
-               csp->config->actions_file);
+               csp->config->actions_file[fileid]);
             return 1; /* never get here */
          }
 
@@ -1164,7 +1253,7 @@ int load_actions_file(struct client_state *csp)
          {
             log_error(LOG_LEVEL_FATAL,
                "can't load actions file '%s': invalid alias line (%lu): %s",
-               csp->config->actions_file, linenum, buf);
+               csp->config->actions_file[fileid], linenum, buf);
             return 1; /* never get here */
          }
 
@@ -1178,7 +1267,7 @@ int load_actions_file(struct client_state *csp)
             fclose(fp);
             log_error(LOG_LEVEL_FATAL,
                "can't load actions file '%s': invalid alias line (%lu): %s = %s",
-               csp->config->actions_file, linenum, buf, start);
+               csp->config->actions_file[fileid], linenum, buf, start);
             return 1; /* never get here */
          }
 
@@ -1196,7 +1285,7 @@ int load_actions_file(struct client_state *csp)
             fclose(fp);
             log_error(LOG_LEVEL_FATAL,
                "can't load actions file '%s': out of memory!",
-               csp->config->actions_file);
+               csp->config->actions_file[fileid]);
             return 1; /* never get here */
          }
 
@@ -1209,7 +1298,7 @@ int load_actions_file(struct client_state *csp)
             fclose(fp);
             log_error(LOG_LEVEL_FATAL,
                "can't load actions file '%s': line %lu: cannot create URL pattern from: %s",
-               csp->config->actions_file, linenum, buf);
+               csp->config->actions_file[fileid], linenum, buf);
             return 1; /* never get here */
          }
 
@@ -1223,7 +1312,7 @@ int load_actions_file(struct client_state *csp)
          fclose(fp);
          log_error(LOG_LEVEL_FATAL,
             "can't load actions file '%s': first needed line (%lu) is invalid: %s",
-            csp->config->actions_file, linenum, buf);
+            csp->config->actions_file[fileid], linenum, buf);
          return 1; /* never get here */
       }
       else
@@ -1232,7 +1321,7 @@ int load_actions_file(struct client_state *csp)
          fclose(fp);
          log_error(LOG_LEVEL_FATAL,
             "can't load actions file '%s': INTERNAL ERROR - mode = %d",
-            csp->config->actions_file, mode);
+            csp->config->actions_file[fileid], mode);
          return 1; /* never get here */
       }
    }
@@ -1244,19 +1333,16 @@ int load_actions_file(struct client_state *csp)
    free_alias_list(alias_list);
 
    /* the old one is now obsolete */
-   if (current_actions_file)
+   if (current_actions_file[fileid])
    {
-      current_actions_file->unloader = unload_actions_file;
+      current_actions_file[fileid]->unloader = unload_actions_file;
    }
 
    fs->next    = files->next;
    files->next = fs;
-   current_actions_file = fs;
+   current_actions_file[fileid] = fs;
 
-   if (csp)
-   {
-      csp->actions_list = fs;
-   }
+   csp->actions_list[fileid] = fs;
 
    return(0);