Changing show_defines so that it doesn't contain any HTML.

[privoxy.git] / actions.c

diff --git a/actions.c b/actions.c
index 7ad2bc0..d8c6c6b 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.5 2001/06/03 11:03:48 oes Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.8 2001/06/29 13:19:52 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
@@ -33,60 +33,18 @@ const char actions_rcs[] = "$Id: actions.c,v 1.5 2001/06/03 11:03:48 oes Exp $";
  *
  * Revisions   :
  *    $Log: actions.c,v $
- *    Revision 1.5  2001/06/03 11:03:48  oes
- *    Makefile/in
+ *    Revision 1.8  2001/06/29 13:19:52  oes
+ *    Removed logentry from cancelled commit
  *
- *    introduced cgi.c
+ *    Revision 1.7  2001/06/09 10:55:28  jongfoster
+ *    Changing BUFSIZ ==> BUFFER_SIZE
  *
- *    actions.c:
+ *    Revision 1.6  2001/06/07 23:04:34  jongfoster
+ *    Made get_actions() static.
  *
+ *    Revision 1.5  2001/06/03 19:11:48  oes
  *    adapted to new enlist_unique arg format
  *
- *    conf loadcfg.c
- *
- *    introduced confdir option
- *
- *    filters.c filtrers.h
- *
- *     extracted-CGI relevant stuff
- *
- *    jbsockets.c
- *
- *     filled comment
- *
- *    jcc.c
- *
- *     support for new cgi mechansim
- *
- *    list.c list.h
- *
- *    functions for new list type: "map"
- *    extended enlist_unique
- *
- *    miscutil.c .h
- *    introduced bindup()
- *
- *    parsers.c parsers.h
- *
- *    deleted const struct interceptors
- *
- *    pcrs.c
- *    added FIXME
- *
- *    project.h
- *
- *    added struct map
- *    added struct http_response
- *    changes struct interceptors to struct cgi_dispatcher
- *    moved HTML stuff to cgi.h
- *
- *    re_filterfile:
- *
- *    changed
- *
- *    showargs.c
- *    NO TIME LEFT
- *
  *    Revision 1.4  2001/06/01 20:03:42  jongfoster
  *    Better memory management - current_action->strings[] now
  *    contains copies of the strings, not the original.
@@ -120,6 +78,8 @@ const char actions_rcs[] = "$Id: actions.c,v 1.5 2001/06/03 11:03:48 oes Exp $";
 
 const char actions_h_rcs[] = ACTIONS_H_VERSION;
 
+
+/* Turn off everything except forwarding */
 /* This structure is used to hold user-defined aliases */
 struct action_alias
 {
@@ -131,9 +91,9 @@ struct action_alias
 
 /*
  * Must declare this in this file for the above structure.
- * FIXME: Make this static or put structure in header.
  */
-extern int get_actions (char *line, struct action_alias * alias_list,
+static int get_actions (char *line, 
+                        struct action_alias * alias_list,
                         struct action_spec *cur_action);
 
 /*
@@ -452,8 +412,9 @@ int get_action_token(char **line, char **name, char **value)
  *                nonzero => Error (line was trashed anyway)
  *
  *********************************************************************/
-int get_actions(char *line, struct action_alias * alias_list,
-                struct action_spec *cur_action)
+static int get_actions(char *line,
+                       struct action_alias * alias_list,
+                       struct action_spec *cur_action)
 {
    memset(cur_action, '\0', sizeof(*cur_action));
    cur_action->mask = ACTION_MASK_ALL;
@@ -900,7 +861,7 @@ int load_actions_file(struct client_state *csp)
 
    struct url_actions *last_perm;
    struct url_actions *perm;
-   char  buf[BUFSIZ];
+   char  buf[BUFFER_SIZE];
    struct file_list *fs;
 #define MODE_START_OF_FILE 1
 #define MODE_ACTIONS       2
@@ -997,7 +958,7 @@ int load_actions_file(struct client_state *csp)
          {
             /* It's an actions block */
 
-            char  actions_buf[BUFSIZ];
+            char  actions_buf[BUFFER_SIZE];
             char * end;
 
             /* set mode */
@@ -1049,7 +1010,7 @@ int load_actions_file(struct client_state *csp)
       else if (mode == MODE_ALIAS)
       {
          /* define an alias */
-         char  actions_buf[BUFSIZ];
+         char  actions_buf[BUFFER_SIZE];
          struct action_alias * new_alias;
          int more = 1;
 
@@ -1181,13 +1142,6 @@ int load_actions_file(struct client_state *csp)
       alias_list = next;
    }
 
-#ifndef SPLIT_PROXY_ARGS
-   if (!suppress_blocklists)
-   {
-      fs->proxy_args = strsav(fs->proxy_args, "</pre>");
-   }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
    /* the old one is now obsolete */
    if (current_actions_file)
    {