projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add #136: Make builds reproducible
[privoxy.git]
/
cgiedit.c
diff --git
a/cgiedit.c
b/cgiedit.c
index
a0e0e6d
..
d12554a
100644
(file)
--- a/
cgiedit.c
+++ b/
cgiedit.c
@@
-1,4
+1,4
@@
-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 $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
@@
-13,7
+13,7
@@
const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.76 2012/07/23 12:42:53 fabiankeil
*
* Stick to the short names in this file for consistency.
*
*
* Stick to the short names in this file for consistency.
*
- * Copyright : Written by and Copyright (C) 2001-20
08 the SourceForg
e
+ * Copyright : Written by and Copyright (C) 2001-20
14 th
e
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@
-243,6
+243,14
@@
static const struct filter_type_info filter_type_info[] =
"server-header-tagger-all", "server_header_tagger_all",
"E", "SERVER-HEADER-TAGGER"
},
"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 */
};
/* FIXME: Following non-static functions should be prototyped in .h or made static */
@@
-338,7
+346,7
@@
static char *section_target(const unsigned sectionid)
{
char buf[30];
{
char buf[30];
- snprintf(buf, sizeof(buf), "#l%
d
", sectionid);
+ snprintf(buf, sizeof(buf), "#l%
u
", sectionid);
return(strdup(buf));
}
return(strdup(buf));
}
@@
-360,7
+368,7
@@
static char *stringify(const unsigned number)
{
char buf[6];
{
char buf[6];
- snprintf(buf, sizeof(buf), "%
i
", number);
+ snprintf(buf, sizeof(buf), "%
u
", number);
return strdup(buf);
}
return strdup(buf);
}
@@
-1827,7
+1835,7
@@
static jb_err get_url_spec_param(struct client_state *csp,
const char *orig_param;
char *param;
char *s;
const char *orig_param;
char *param;
char *s;
- struct
url
_spec compiled[1];
+ struct
pattern
_spec compiled[1];
jb_err err;
assert(csp);
jb_err err;
assert(csp);
@@
-1875,14
+1883,14
@@
static jb_err get_url_spec_param(struct client_state *csp,
free(param);
return JB_ERR_MEMORY;
}
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(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] == '\\')
{
if (param[strlen(param) - 1] == '\\')
{
@@
-1911,14
+1919,14
@@
static jb_err get_url_spec_param(struct client_state *csp,
free(param);
return JB_ERR_MEMORY;
}
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(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;
}
*pvalue = param;
@@
-2378,9
+2386,9
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
*/
if (!err) err = map_conditional(exports, "all-urls-present", 1);
*/
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);
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);
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);
@@
-2491,7
+2499,7
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
return JB_ERR_MEMORY;
}
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);
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);
@@
-2511,7
+2519,7
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
if (prev_section_line_number != ((unsigned)(-1)))
{
/* Not last section */
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");
}
if (!err) err = map(section_exports, "s-prev", 1, buf, 1);
if (!err) err = map_block_keep(section_exports, "s-prev-exists");
}
@@
-2565,7
+2573,7
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
return JB_ERR_MEMORY;
}
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);
err = map(url_exports, "p", 1, buf, 1);
snprintf(buf, sizeof(buf), "%d", url_1_2);
@@
-2631,7
+2639,7
@@
jb_err cgi_edit_actions_list(struct client_state *csp,
/* Could also do section-specific exports here, but it wouldn't be as fast */
/* 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)
if (!err) err = map(section_exports, "s-next", 1, buf, 1);
if ((cur_line != NULL)
@@
-2820,6
+2828,10
@@
jb_err cgi_edit_actions_for_url(struct client_state *csp,
}
}
}
}
+#ifndef FEATURE_EXTERNAL_FILTERS
+ if (!err) err = map_block_killer(exports, "external-content-filters");
+#endif
+
if (err)
{
edit_free_file(file);
if (err)
{
edit_free_file(file);
@@
-3230,7
+3242,7
@@
jb_err cgi_edit_actions_submit(struct client_state *csp,
return err;
}
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);
(long) time(NULL), file->identifier, sectionid);
edit_free_file(file);
@@
-3351,7
+3363,7
@@
jb_err cgi_edit_actions_url(struct client_state *csp,
return err;
}
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);
(long) time(NULL), file->identifier, section_start_line_number);
edit_free_file(file);
@@
-3480,7
+3492,7
@@
jb_err cgi_edit_actions_add_url(struct client_state *csp,
return err;
}
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);
(long) time(NULL), file->identifier, sectionid);
edit_free_file(file);
@@
-3591,7
+3603,7
@@
jb_err cgi_edit_actions_remove_url(struct client_state *csp,
return err;
}
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);
(long) time(NULL), file->identifier, section_start_line_number);
edit_free_file(file);
@@
-3713,7
+3725,7
@@
jb_err cgi_edit_actions_section_remove(struct client_state *csp,
return err;
}
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);
(long) time(NULL), file->identifier);
edit_free_file(file);
@@
-3882,7
+3894,7
@@
jb_err cgi_edit_actions_section_add(struct client_state *csp,
return err;
}
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);
(long) time(NULL), file->identifier);
edit_free_file(file);
@@
-4071,7
+4083,7
@@
jb_err cgi_edit_actions_section_swap(struct client_state *csp,
}
} /* END if (section1 != section2) */
}
} /* 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);
(long) time(NULL), file->identifier);
edit_free_file(file);