X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=3d184ec86aa24ecc96946df3d8da2d362f64b391;hb=7629bc44c1537497c2b33bef1332b9fedb7a83d7;hp=e1c2c1ae22a6a8eb905f31b18a79cd45a923544b;hpb=3ae301616db25944b4271fb465c625d0e6ebd8be;p=privoxy.git
diff --git a/cgisimple.c b/cgisimple.c
index e1c2c1ae..3d184ec8 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.86 2008/06/28 14:19:05 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.90 2009/03/01 18:43:09 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,19 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.86 2008/06/28 14:19:05 fabian
*
* Revisions :
* $Log: cgisimple.c,v $
+ * Revision 1.90 2009/03/01 18:43:09 fabiankeil
+ * Fix cparser warnings.
+ *
+ * Revision 1.89 2008/10/11 11:31:14 fabiankeil
+ * Add FEATURE_CONNECTION_KEEP_ALIVE to the list
+ * of conditional defines on the show-status page.
+ *
+ * Revision 1.88 2008/08/30 12:03:07 fabiankeil
+ * Remove FEATURE_COOKIE_JAR.
+ *
+ * Revision 1.87 2008/08/29 15:59:22 fabiankeil
+ * Fix two comments.
+ *
* Revision 1.86 2008/06/28 14:19:05 fabiankeil
* Protocol detection is done case-insensitive, fix assertion
* to do the same. Yay for Privoxy-Regression-Test and zzuf.
@@ -488,6 +501,8 @@ jb_err cgi_default(struct client_state *csp,
{
struct map *exports;
+ (void)parameters;
+
assert(csp);
assert(rsp);
@@ -804,6 +819,9 @@ jb_err cgi_transparent_image(struct client_state *csp,
struct http_response *rsp,
const struct map *parameters)
{
+ (void)csp;
+ (void)parameters;
+
rsp->body = bindup(image_blank_data, image_blank_length);
rsp->content_length = image_blank_length;
@@ -862,6 +880,9 @@ jb_err cgi_send_default_favicon(struct client_state *csp,
"\017\000\000";
static const size_t favicon_length = sizeof(default_favicon_data) - 1;
+ (void)csp;
+ (void)parameters;
+
rsp->body = bindup(default_favicon_data, favicon_length);
rsp->content_length = favicon_length;
@@ -920,6 +941,9 @@ jb_err cgi_send_error_favicon(struct client_state *csp,
"\017\000\000";
static const size_t favicon_length = sizeof(error_favicon_data) - 1;
+ (void)csp;
+ (void)parameters;
+
rsp->body = bindup(error_favicon_data, favicon_length);
rsp->content_length = favicon_length;
@@ -967,6 +991,8 @@ jb_err cgi_send_stylesheet(struct client_state *csp,
assert(csp);
assert(rsp);
+ (void)parameters;
+
err = template_load(csp, &rsp->body, "cgi-style.css", 0);
if (err == JB_ERR_FILE)
@@ -1017,6 +1043,9 @@ jb_err cgi_send_url_info_osd(struct client_state *csp,
jb_err err = JB_ERR_MEMORY;
struct map *exports = default_exports(csp, NULL);
+ (void)csp;
+ (void)parameters;
+
if (NULL != exports)
{
err = template_fill_for_cgi(csp, "url-info-osd.xml", exports, rsp);
@@ -1295,7 +1324,7 @@ jb_err cgi_show_status(struct client_state *csp,
if (!err) err = string_append(&s, "| ");
if (!err) err = string_join(&s, html_encode(csp->actions_list[i]->filename));
snprintf(buf, sizeof(buf),
- " | View", i);
+ " | View", i);
if (!err) err = string_append(&s, buf);
#ifdef FEATURE_CGI_EDIT_ACTIONS
@@ -1307,7 +1336,7 @@ jb_err cgi_show_status(struct client_state *csp,
if (access(csp->config->actions_file[i], W_OK) == 0)
{
#endif /* def HAVE_ACCESS */
- snprintf(buf, sizeof(buf), " Edit", i);
+ snprintf(buf, sizeof(buf), " Edit", i);
if (!err) err = string_append(&s, buf);
#ifdef HAVE_ACCESS
}
@@ -1342,8 +1371,8 @@ jb_err cgi_show_status(struct client_state *csp,
{
if (!err) err = string_append(&s, " |
| ");
if (!err) err = string_join(&s, html_encode(csp->rlist[i]->filename));
- snprintf(buf, 100,
- " | View", i);
+ snprintf(buf, sizeof(buf),
+ " | View", i);
if (!err) err = string_append(&s, buf);
if (!err) err = string_append(&s, " |
\n");
}
@@ -1820,6 +1849,9 @@ jb_err cgi_robots_txt(struct client_state *csp,
char buf[100];
jb_err err;
+ (void)csp;
+ (void)parameters;
+
rsp->body = strdup(
"# This is the Privoxy control interface.\n"
"# It isn't very useful to index it, and you're likely to break stuff.\n"
@@ -1874,11 +1906,11 @@ static jb_err show_defines(struct map *exports)
if (!err) err = map_conditional(exports, "FEATURE_CGI_EDIT_ACTIONS", 0);
#endif /* ndef FEATURE_CGI_EDIT_ACTIONS */
-#ifdef FEATURE_COOKIE_JAR
- if (!err) err = map_conditional(exports, "FEATURE_COOKIE_JAR", 1);
-#else /* ifndef FEATURE_COOKIE_JAR */
- if (!err) err = map_conditional(exports, "FEATURE_COOKIE_JAR", 0);
-#endif /* ndef FEATURE_COOKIE_JAR */
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ if (!err) err = map_conditional(exports, "FEATURE_CONNECTION_KEEP_ALIVE", 1);
+#else /* ifndef FEATURE_CGI_EDIT_ACTIONS */
+ if (!err) err = map_conditional(exports, "FEATURE_CONNECTION_KEEP_ALIVE", 0);
+#endif /* ndef FEATURE_CONNECTION_KEEP_ALIVE */
#ifdef FEATURE_FAST_REDIRECTS
if (!err) err = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1);
@@ -2196,7 +2228,7 @@ static jb_err cgi_show_file(struct client_state *csp,
static jb_err load_file(const char *filename, char **buffer, size_t *length)
{
FILE *fp;
- int ret;
+ long ret;
jb_err err = JB_ERR_OK;
fp = fopen(filename, "rb");