X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=actions.c;h=f08104bcad12f1d10904156d027178cfac379888;hp=3fe17cb2718538812fc13d9ccacc4c432952b59c;hb=b57c5c88740a9748a2cca103bf7ab0edec9489d5;hpb=014e796377eafac5f1875e61282d48cb337dbdce
diff --git a/actions.c b/actions.c
index 3fe17cb2..f08104bc 100644
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.2 2001/05/31 21:40:00 jongfoster Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.13 2001/09/16 15:47:37 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/actions.c,v $
@@ -33,6 +33,47 @@ const char actions_rcs[] = "$Id: actions.c,v 1.2 2001/05/31 21:40:00 jongfoster
*
* Revisions :
* $Log: actions.c,v $
+ * Revision 1.13 2001/09/16 15:47:37 jongfoster
+ * First version of CGI-based edit interface. This is very much a
+ * work-in-progress, and you can't actually use it to edit anything
+ * yet. You must #define FEATURE_CGI_EDIT_ACTIONS for these changes
+ * to have any effect.
+ *
+ * Revision 1.12 2001/09/16 13:21:27 jongfoster
+ * Changes to use new list functions.
+ *
+ * Revision 1.11 2001/09/14 00:17:32 jongfoster
+ * Tidying up memory allocation. New function init_action().
+ *
+ * Revision 1.10 2001/09/10 10:14:34 oes
+ * Removing unused variable
+ *
+ * Revision 1.9 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.8 2001/06/29 13:19:52 oes
+ * Removed logentry from cancelled commit
+ *
+ * Revision 1.7 2001/06/09 10:55:28 jongfoster
+ * Changing BUFSIZ ==> BUFFER_SIZE
+ *
+ * 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
+ *
+ * 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.
+ *
+ * Revision 1.3 2001/06/01 18:49:17 jongfoster
+ * Replaced "list_share" with "list" - the tiny memory gain was not
+ * worth the extra complexity.
+ *
* Revision 1.2 2001/05/31 21:40:00 jongfoster
* Removing some commented out, obsolete blocks of code.
*
@@ -55,9 +96,14 @@ const char actions_rcs[] = "$Id: actions.c,v 1.2 2001/05/31 21:40:00 jongfoster
#include "miscutil.h"
#include "errlog.h"
#include "loaders.h"
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+#include "encode.h"
+#endif /* def FEATURE_CGI_EDIT_ACTIONS */
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
{
@@ -69,9 +115,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);
/*
@@ -174,9 +220,9 @@ void merge_actions (struct action_spec *dest,
if (src->multi_remove_all[i])
{
/* Remove everything from dest */
- destroy_list(dest->multi_remove[i]);
- destroy_list(dest->multi_add[i]);
+ list_remove_all(dest->multi_remove[i]);
dest->multi_remove_all[i] = 1;
+
list_duplicate(dest->multi_add[i], src->multi_add[i]);
}
else if (dest->multi_remove_all[i])
@@ -205,6 +251,8 @@ void 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.
@@ -218,6 +266,8 @@ void copy_action (struct action_spec *dest,
{
int i;
+ memset(dest, '\0', sizeof(*dest));
+
dest->mask = src->mask;
dest->add = src->add;
@@ -240,7 +290,9 @@ void copy_action (struct action_spec *dest,
*
* Function : free_action
*
- * Description : Free an action_specs.
+ * Description : Destroy an action_spec. Frees memory used by it,
+ * except for the memory used by the struct action_spec
+ * itself.
*
* Parameters :
* 1 : src = Source to free.
@@ -390,10 +442,11 @@ 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));
+ init_action(cur_action);
cur_action->mask = ACTION_MASK_ALL;
while (line)
@@ -462,7 +515,7 @@ int get_actions(char *line, struct action_alias * alias_list,
}
list_remove_item(remove, value);
- enlist_unique(add, value);
+ enlist_unique(add, value, 0);
break;
}
case AV_REM_MULTI:
@@ -480,8 +533,8 @@ int get_actions(char *line, struct action_alias * alias_list,
*
* Remove *ALL*.
*/
- destroy_list(remove);
- destroy_list(add);
+ list_remove_all(remove);
+ list_remove_all(add);
cur_action->multi_remove_all[action->index] = 1;
}
else
@@ -491,7 +544,7 @@ int get_actions(char *line, struct action_alias * alias_list,
if ( !cur_action->multi_remove_all[action->index] )
{
/* there isn't a catch-all in the remove list already */
- enlist_unique(remove, value);
+ enlist_unique(remove, value, 0);
}
list_remove_item(add, value);
}
@@ -548,7 +601,7 @@ char * actions_to_text(struct action_spec *action)
unsigned mask = action->mask;
unsigned add = action->add;
char * result = strdup("");
- struct list * lst;
+ struct list_entry * lst;
/* sanity - prevents "-feature +feature" */
mask |= add;
@@ -583,7 +636,7 @@ char * actions_to_text(struct action_spec *action)
} \
else \
{ \
- lst = action->multi_remove[__index]->next; \
+ lst = action->multi_remove[__index]->first; \
while (lst) \
{ \
result = strsav(result, " -" __name "{"); \
@@ -592,7 +645,7 @@ char * actions_to_text(struct action_spec *action)
lst = lst->next; \
} \
} \
- lst = action->multi_add[__index]->next; \
+ lst = action->multi_add[__index]->first; \
while (lst) \
{ \
result = strsav(result, " +" __name "{"); \
@@ -614,6 +667,106 @@ char * actions_to_text(struct action_spec *action)
}
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+/*********************************************************************
+ *
+ * Function : actions_to_html
+ *
+ * Description : Converts a actionsfile entry from numeric form
+ * ("mask" and "add") to a
-seperated HTML string.
+ *
+ * Parameters :
+ * 1 : mask = As from struct url_actions
+ * 2 : add = As from struct url_actions
+ *
+ * Returns : A string. Caller must free it.
+ *
+ *********************************************************************/
+char * actions_to_html(struct action_spec *action)
+{
+ unsigned mask = action->mask;
+ unsigned add = action->add;
+ char * result = strdup("");
+ char * enc_str;
+ struct list_entry * lst;
+
+ /* sanity - prevents "-feature +feature" */
+ mask |= add;
+
+
+#define DEFINE_ACTION_BOOL(__name, __bit) \
+ if (!(mask & __bit)) \
+ { \
+ result = strsav(result, "\n
-" __name); \
+ } \
+ else if (add & __bit) \
+ { \
+ result = strsav(result, "\n
+" __name); \
+ }
+
+#define DEFINE_ACTION_STRING(__name, __bit, __index) \
+ if (!(mask & __bit)) \
+ { \
+ result = strsav(result, "\n
-" __name); \
+ } \
+ else if (add & __bit) \
+ { \
+ result = strsav(result, "\n
+" __name "{"); \
+ enc_str = html_encode(action->string[__index]);\
+ result = strsav(result, enc_str); \
+ freez(enc_str); \
+ result = strsav(result, "}"); \
+ }
+
+#define DEFINE_ACTION_MULTI(__name, __index) \
+ if (action->multi_remove_all[__index]) \
+ { \
+ result = strsav(result, "\n
-" __name "{*}"); \
+ } \
+ else \
+ { \
+ lst = action->multi_remove[__index]->first; \
+ while (lst) \
+ { \
+ result = strsav(result, "\n
-" __name "{");\
+ enc_str = html_encode(lst->str); \
+ result = strsav(result, enc_str); \
+ freez(enc_str); \
+ result = strsav(result, "}"); \
+ lst = lst->next; \
+ } \
+ } \
+ lst = action->multi_add[__index]->first; \
+ while (lst) \
+ { \
+ result = strsav(result, "\n
+" __name "{"); \
+ result = strsav(result, lst->str); \
+ result = strsav(result, "}"); \
+ lst = lst->next; \
+ }
+
+#define DEFINE_ACTION_ALIAS 0 /* No aliases for output */
+
+#include "actionlist.h"
+
+#undef DEFINE_ACTION_MULTI
+#undef DEFINE_ACTION_STRING
+#undef DEFINE_ACTION_BOOL
+#undef DEFINE_ACTION_ALIAS
+
+ /* trim leading
*/
+ if (result && *result)
+ {
+ char * s = result;
+ result = strdup(result + 5);
+ free(s);
+ }
+
+ return result;
+}
+#endif /* def FEATURE_CGI_EDIT_ACTIONS */
+
+
/*********************************************************************
*
* Function : current_actions_to_text
@@ -630,7 +783,7 @@ char * current_action_to_text(struct current_action_spec *action)
{
unsigned flags = action->flags;
char * result = strdup("");
- struct list * lst;
+ struct list_entry * lst;
#define DEFINE_ACTION_BOOL(__name, __bit) \
if (flags & __bit) \
@@ -655,7 +808,7 @@ char * current_action_to_text(struct current_action_spec *action)
}
#define DEFINE_ACTION_MULTI(__name, __index) \
- lst = action->multi[__index]->next; \
+ lst = action->multi[__index]->first; \
if (lst == NULL) \
{ \
result = strsav(result, " -" __name); \
@@ -699,10 +852,29 @@ char * current_action_to_text(struct current_action_spec *action)
void init_current_action (struct current_action_spec *dest)
{
memset(dest, '\0', sizeof(*dest));
+
dest->flags = ACTION_MOST_COMPATIBLE;
}
+/*********************************************************************
+ *
+ * Function : init_action
+ *
+ * Description : Zero out an action.
+ *
+ * Parameters :
+ * 1 : dest = An uninitialized action_spec.
+ *
+ * Returns : N/A
+ *
+ *********************************************************************/
+void init_action (struct action_spec *dest)
+{
+ memset(dest, '\0', sizeof(*dest));
+}
+
+
/*********************************************************************
*
* Function : merge_current_action
@@ -713,7 +885,7 @@ void init_current_action (struct current_action_spec *dest)
* is that this one doesn't allocate memory for
* strings (so "src" better be in memory for at least
* as long as "dest" is, and you'd better free
- * "dest" using "current_free_action").
+ * "dest" using "free_current_action").
* Also, there is no mask or remove lists in dest.
* (If we're applying it to a URL, we don't need them)
*
@@ -737,7 +909,8 @@ void merge_current_action (struct current_action_spec *dest,
char * str = src->string[i];
if (str)
{
- dest->string[i] = str;
+ freez(dest->string[i]);
+ dest->string[i] = strdup(str);
}
}
@@ -745,8 +918,7 @@ void merge_current_action (struct current_action_spec *dest,
{
if (src->multi_remove_all[i])
{
- /* Remove everything from dest */
- destroy_list(dest->multi[i]);
+ /* Remove everything from dest, then add src->multi_add */
list_duplicate(dest->multi[i], src->multi_add[i]);
}
else
@@ -762,7 +934,8 @@ void merge_current_action (struct current_action_spec *dest,
*
* Function : free_current_action
*
- * Description : Free a current_action_spec.
+ * Description : Free memory used by a current_action_spec.
+ * Does not free the current_action_spec itself.
*
* Parameters :
* 1 : src = Source to free.
@@ -774,6 +947,11 @@ void free_current_action (struct current_action_spec *src)
{
int i;
+ for (i = 0; i < ACTION_STRING_COUNT; i++)
+ {
+ freez(src->string[i]);
+ }
+
for (i = 0; i < ACTION_MULTI_COUNT; i++)
{
destroy_list(src->multi[i]);
@@ -804,6 +982,7 @@ void unload_actions_file(void *file_data)
{
next = cur->next;
free_url(cur->url);
+ free_action(cur->action);
freez(cur);
cur = next;
}
@@ -832,7 +1011,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
@@ -841,7 +1020,7 @@ int load_actions_file(struct client_state *csp)
struct action_spec cur_action[1];
struct action_alias * alias_list = NULL;
- memset(cur_action, '\0', sizeof(*cur_action));
+ init_action(cur_action);
if (!check_file_changed(current_actions_file, csp->config->actions_file, &fs))
{
@@ -874,7 +1053,7 @@ int load_actions_file(struct client_state *csp)
return 1; /* never get here */
}
- while (read_config_line(buf, sizeof(buf), fp, fs) != NULL)
+ while (read_config_line(buf, sizeof(buf), fp) != NULL)
{
if (*buf == '{')
{
@@ -929,7 +1108,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 */
@@ -981,9 +1160,8 @@ 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;
char * start = strchr(buf, '=');
char * end = start;
@@ -1113,13 +1291,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, "");
- }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
/* the old one is now obsolete */
if (current_actions_file)
{