Changed version string only to 3.0.12

[privoxy.git] / cgisimple.c

diff --git a/cgisimple.c b/cgisimple.c
index 9448bf3..3d184ec 100644 (file)
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.84 2008/05/26 16:16:55 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,27 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.84 2008/05/26 16:16:55 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.
+ *
+ *    Revision 1.85  2008/05/26 17:30:55  fabiankeil
+ *    Provide an OpenSearch Description to access the
+ *    show-url-info page through "search engine plugins".
+ *
  *    Revision 1.84  2008/05/26 16:16:55  fabiankeil
  *    Spell error correctly.
  *
@@ -480,6 +501,8 @@ jb_err cgi_default(struct client_state *csp,
 {
    struct map *exports;
 
+   (void)parameters;
+
    assert(csp);
    assert(rsp);
 
@@ -796,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;
 
@@ -854,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;
 
@@ -912,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;
 
@@ -959,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)
@@ -1009,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);
@@ -1287,7 +1324,7 @@ jb_err cgi_show_status(struct client_state *csp,
          if (!err) err = string_append(&s, "<tr><td>");
          if (!err) err = string_join(&s, html_encode(csp->actions_list[i]->filename));
          snprintf(buf, sizeof(buf),
-            "</td><td class=\"buttons\"><a href=\"/show-status?file=actions&amp;index=%d\">View</a>", i);
+            "</td><td class=\"buttons\"><a href=\"/show-status?file=actions&amp;index=%u\">View</a>", i);
          if (!err) err = string_append(&s, buf);
 
 #ifdef FEATURE_CGI_EDIT_ACTIONS
@@ -1299,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), "&nbsp;&nbsp;<a href=\"/edit-actions-list?f=%d\">Edit</a>", i);
+               snprintf(buf, sizeof(buf), "&nbsp;&nbsp;<a href=\"/edit-actions-list?f=%u\">Edit</a>", i);
                if (!err) err = string_append(&s, buf);
 #ifdef HAVE_ACCESS
             }
@@ -1334,8 +1371,8 @@ jb_err cgi_show_status(struct client_state *csp,
       {
          if (!err) err = string_append(&s, "<tr><td>");
          if (!err) err = string_join(&s, html_encode(csp->rlist[i]->filename));
-         snprintf(buf, 100,
-            "</td><td class=\"buttons\"><a href=\"/show-status?file=filter&amp;index=%d\">View</a>", i);
+         snprintf(buf, sizeof(buf),
+            "</td><td class=\"buttons\"><a href=\"/show-status?file=filter&amp;index=%u\">View</a>", i);
          if (!err) err = string_append(&s, buf);
          if (!err) err = string_append(&s, "</td></tr>\n");
       }
@@ -1534,7 +1571,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
 
       memset(url_to_query, '\0', sizeof(url_to_query));
       err = parse_http_url(url_param, url_to_query, REQUIRE_PROTOCOL);
-      assert((err != JB_ERR_OK) || (url_to_query->ssl == !strncmp(url_param, "https://", 8)));
+      assert((err != JB_ERR_OK) || (url_to_query->ssl == !strncmpic(url_param, "https://", 8)));
 
       free(url_param);
 
@@ -1812,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"
@@ -1862,15 +1902,15 @@ static jb_err show_defines(struct map *exports)
 
 #ifdef FEATURE_CGI_EDIT_ACTIONS
    if (!err) err = map_conditional(exports, "FEATURE_CGI_EDIT_ACTIONS", 1);
-#else /* ifndef FEATURE_COOKIE_JAR */
+#else /* ifndef FEATURE_CGI_EDIT_ACTIONS */
    if (!err) err = map_conditional(exports, "FEATURE_CGI_EDIT_ACTIONS", 0);
-#endif /* ndef FEATURE_COOKIE_JAR */
+#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);
@@ -2188,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");