-const char actions_rcs[] = "$Id: actions.c,v 1.47 2008/03/28 15:13:37 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.54 2008/09/20 10:04:33 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/actions.c,v $
*
* Revisions :
* $Log: actions.c,v $
+ * Revision 1.54 2008/09/20 10:04:33 fabiankeil
+ * Remove hide-forwarded-for-headers action which has
+ * been obsoleted by change-x-forwarded-for{block}.
+ *
+ * Revision 1.53 2008/05/26 16:04:04 fabiankeil
+ * s@memorey@memory@
+ *
+ * Revision 1.52 2008/04/27 16:26:59 fabiankeil
+ * White space fix for the last commit.
+ *
+ * Revision 1.51 2008/04/27 16:20:19 fabiankeil
+ * Complain about every block action without reason found.
+ *
+ * Revision 1.50 2008/03/30 14:52:00 fabiankeil
+ * Rename load_actions_file() and load_re_filterfile()
+ * as they load multiple files "now".
+ *
+ * Revision 1.49 2008/03/29 12:13:45 fabiankeil
+ * Remove send-wafer and send-vanilla-wafer actions.
+ *
+ * Revision 1.48 2008/03/28 18:17:14 fabiankeil
+ * In action_used_to_be_valid(), loop through an array of formerly
+ * valid actions instead of using an OR-chain of strcmpic() calls.
+ *
* Revision 1.47 2008/03/28 15:13:37 fabiankeil
* Remove inspect-jpegs action.
*
static const char *formerly_valid_actions[] = {
"inspect-jpegs",
"kill-popups",
- "treat-forbidden-connects-like-blocks"
+ "send-vanilla-wafer",
+ "send-wafer",
+ "treat-forbidden-connects-like-blocks",
+ "vanilla-wafer",
+ "wafer"
};
- int i;
+ unsigned int i;
for (i = 0; i < SZ(formerly_valid_actions); i++)
{
{
/*
* XXX: Temporary backwards compatibility hack.
+ * XXX: should include line number.
*/
- static int complaint_shown = 0;
value = "No reason specified.";
- if (!complaint_shown)
- {
- log_error(LOG_LEVEL_ERROR, "At least one block "
- "without reason found. This may become a fatal "
- "error in future versions.");
- complaint_shown = 1;
- }
+ log_error(LOG_LEVEL_ERROR,
+ "block action without reason found. This may "
+ "become a fatal error in future versions.");
}
else
{
/* Found it */
merge_actions(cur_action, alias->action);
}
- else if ((2 < strlen(option)) && action_used_to_be_valid(option+1))
+ else if (((size_t)2 < strlen(option)) && action_used_to_be_valid(option+1))
{
log_error(LOG_LEVEL_ERROR, "Action '%s' is no longer valid "
"in this Privoxy release. Ignored.", option+1);
}
+ else if (((size_t)2 < strlen(option)) && 0 == strcmpic(option+1, "hide-forwarded-for-headers"))
+ {
+ log_error(LOG_LEVEL_FATAL, "The action 'hide-forwarded-for-headers' "
+ "is no longer valid in this Privoxy release. "
+ "Use 'change-x-forwarded-for' instead.");
+ }
else
{
/* Bad action name */
if (merge_current_action(csp->action, b->action))
{
log_error(LOG_LEVEL_ERROR,
- "Out of memorey while changing action bits");
+ "Out of memory while changing action bits");
}
/* and signal the change. */
updated = 1;
/*********************************************************************
*
- * Function : load_actions_file
+ * Function : load_action_files
*
* Description : Read and parse all the action files and add to files
* list.
* Returns : 0 => Ok, everything else is an error.
*
*********************************************************************/
-int load_actions_file(struct client_state *csp)
+int load_action_files(struct client_state *csp)
{
int i;
int result;
size_t len = strlen(buf);
char * start = buf + 2;
char * end = buf + len - 1;
- if ((len < 5) || (*end-- != '}') || (*end-- != '}'))
+ if ((len < (size_t)5) || (*end-- != '}') || (*end-- != '}'))
{
/* too short */
fclose(fp);