-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.76 2012/07/23 12:42:53 fabiankeil Exp $";
+const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.81 2014/06/02 06:22:20 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
*
* Stick to the short names in this file for consistency.
*
- * Copyright : Written by and Copyright (C) 2001-2008 the SourceForge
+ * Copyright : Written by and Copyright (C) 2001-2014 the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
"server-header-tagger-all", "server_header_tagger_all",
"E", "SERVER-HEADER-TAGGER"
},
+#ifdef FEATURE_EXTERNAL_FILTERS
+ {
+ ACTION_MULTI_EXTERNAL_FILTER,
+ "external-content-filter-params", "external-filter",
+ "external-content-filter-all", "external_content_filter_all",
+ "E", "EXTERNAL-CONTENT-FILTER"
+ },
+#endif
};
/* FIXME: Following non-static functions should be prototyped in .h or made static */
{
char buf[30];
- snprintf(buf, sizeof(buf), "#l%d", sectionid);
+ snprintf(buf, sizeof(buf), "#l%u", sectionid);
return(strdup(buf));
}
{
char buf[6];
- snprintf(buf, sizeof(buf), "%i", number);
+ snprintf(buf, sizeof(buf), "%u", number);
return strdup(buf);
}
const char *orig_param;
char *param;
char *s;
- struct url_spec compiled[1];
+ struct pattern_spec compiled[1];
jb_err err;
assert(csp);
free(param);
return JB_ERR_MEMORY;
}
- err = create_url_spec(compiled, s);
+ err = create_pattern_spec(compiled, s);
free(s);
if (err)
{
free(param);
return (err == JB_ERR_MEMORY) ? JB_ERR_MEMORY : JB_ERR_CGI_PARAMS;
}
- free_url_spec(compiled);
+ free_pattern_spec(compiled);
if (param[strlen(param) - 1] == '\\')
{
free(param);
return JB_ERR_MEMORY;
}
- err = create_url_spec(compiled, s);
+ err = create_pattern_spec(compiled, s);
free(s);
if (err)
{
free(param);
return (err == JB_ERR_MEMORY) ? JB_ERR_MEMORY : JB_ERR_CGI_PARAMS;
}
- free_url_spec(compiled);
+ free_pattern_spec(compiled);
}
*pvalue = param;
*/
if (!err) err = map_conditional(exports, "all-urls-present", 1);
- snprintf(buf, sizeof(buf), "%d", line_number);
+ snprintf(buf, sizeof(buf), "%u", line_number);
if (!err) err = map(exports, "all-urls-s", 1, buf, 1);
- snprintf(buf, sizeof(buf), "%d", line_number + 2);
+ snprintf(buf, sizeof(buf), "%u", line_number + 2);
if (!err) err = map(exports, "all-urls-s-next", 1, buf, 1);
if (!err) err = map(exports, "all-urls-actions", 1,
actions_to_html(csp, cur_line->data.action), 0);
return JB_ERR_MEMORY;
}
- snprintf(buf, sizeof(buf), "%d", line_number);
+ snprintf(buf, sizeof(buf), "%u", line_number);
err = map(section_exports, "s", 1, buf, 1);
if (!err) err = map(section_exports, "actions", 1,
actions_to_html(csp, cur_line->data.action), 0);
if (prev_section_line_number != ((unsigned)(-1)))
{
/* Not last section */
- snprintf(buf, sizeof(buf), "%d", prev_section_line_number);
+ snprintf(buf, sizeof(buf), "%u", prev_section_line_number);
if (!err) err = map(section_exports, "s-prev", 1, buf, 1);
if (!err) err = map_block_keep(section_exports, "s-prev-exists");
}
return JB_ERR_MEMORY;
}
- snprintf(buf, sizeof(buf), "%d", line_number);
+ snprintf(buf, sizeof(buf), "%u", line_number);
err = map(url_exports, "p", 1, buf, 1);
snprintf(buf, sizeof(buf), "%d", url_1_2);
/* Could also do section-specific exports here, but it wouldn't be as fast */
- snprintf(buf, sizeof(buf), "%d", line_number);
+ snprintf(buf, sizeof(buf), "%u", line_number);
if (!err) err = map(section_exports, "s-next", 1, buf, 1);
if ((cur_line != NULL)
}
}
+#ifndef FEATURE_EXTERNAL_FILTERS
+ if (!err) err = map_block_killer(exports, "external-content-filters");
+#endif
+
if (err)
{
edit_free_file(file);
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i#l%d",
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i#l%u",
(long) time(NULL), file->identifier, sectionid);
edit_free_file(file);
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i#l%d",
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i#l%u",
(long) time(NULL), file->identifier, section_start_line_number);
edit_free_file(file);
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i#l%d",
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i#l%u",
(long) time(NULL), file->identifier, sectionid);
edit_free_file(file);
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i#l%d",
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u#l%u",
(long) time(NULL), file->identifier, section_start_line_number);
edit_free_file(file);
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i",
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u",
(long) time(NULL), file->identifier);
edit_free_file(file);
return err;
}
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i",
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u",
(long) time(NULL), file->identifier);
edit_free_file(file);
}
} /* END if (section1 != section2) */
- snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i",
+ snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u",
(long) time(NULL), file->identifier);
edit_free_file(file);