X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=d3e38912be24ce410578b0587979b60904a0068e;hb=e6cb71aa62ede2896f78ca94cd3d5199b5846af4;hp=527db0eb4e5f4bb4f0547f3515d93a33f05cc825;hpb=d7b73a30a319e3e67ec17f4d7920f4d45d4a3497;p=privoxy.git

diff --git a/cgisimple.c b/cgisimple.c
index 527db0eb..d3e38912 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.13 2002/02/21 00:10:37 jongfoster Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.15 2002/03/06 22:54:35 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,12 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.13 2002/02/21 00:10:37 jongfo
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
+ *    Revision 1.15  2002/03/06 22:54:35  jongfoster
+ *    Automated function-comment nitpicking.
+ *
+ *    Revision 1.14  2002/03/02 04:14:50  david__schmidt
+ *    Clean up a little CRLF unpleasantness that suddenly appeared
+ *
  *    Revision 1.13  2002/02/21 00:10:37  jongfoster
  *    Adding send-banner?type=auto option
  *
@@ -135,9 +141,9 @@ static jb_err show_defines(struct map *exports);
  *                Lists menu of available unhidden CGIs.
  *               
  * Parameters  :
- *           1 :  csp = Current client state (buffers, headers, etc...)
- *           2 :  rsp = http_response data structure for output
- *           3 :  parameters = map of cgi parameters
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  rsp = http_response data structure for output
+ *          3  :  parameters = map of cgi parameters
  *
  * CGI Parameters : none
  *
@@ -202,9 +208,9 @@ jb_err cgi_default(struct client_state *csp,
  *                given.
  *               
  * Parameters  :
- *           1 :  csp = Current client state (buffers, headers, etc...)
- *           2 :  rsp = http_response data structure for output
- *           3 :  parameters = map of cgi parameters
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  rsp = http_response data structure for output
+ *          3  :  parameters = map of cgi parameters
  *
  * CGI Parameters : none
  *
@@ -246,9 +252,9 @@ jb_err cgi_error_404(struct client_state *csp,
  *                made of it.
  *               
  * Parameters  :
- *           1 :  csp = Current client state (buffers, headers, etc...)
- *           2 :  rsp = http_response data structure for output
- *           3 :  parameters = map of cgi parameters
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  rsp = http_response data structure for output
+ *          3  :  parameters = map of cgi parameters
  *
  * CGI Parameters : none
  *
@@ -309,9 +315,9 @@ jb_err cgi_show_request(struct client_state *csp,
  * Description :  CGI function that returns a banner. 
  *
  * Parameters  :
- *           1 :  csp = Current client state (buffers, headers, etc...)
- *           2 :  rsp = http_response data structure for output
- *           3 :  parameters = map of cgi parameters
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  rsp = http_response data structure for output
+ *          3  :  parameters = map of cgi parameters
  *
  * CGI Parameters :
  *           type : Selects the type of banner between "trans", "logo",
@@ -342,21 +348,31 @@ jb_err cgi_send_banner(struct client_state *csp,
          /* and handle accordingly: */
          if ((p != NULL) && (0 == strcmpic(p, "blank")))
          {
-            imagetype = 't';
+            imagetype = 'b';
+         }
+         else if ((p != NULL) && (0 == strcmpic(p, "pattern")))
+         {
+            imagetype = 'p';
          }
       }
 #endif /* def FEATURE_IMAGE_BLOCKING */
    }
       
-   if ((imagetype != 't') && (imagetype != 'b')) /* transparant/blank */
+   if ((imagetype == 'b') || (imagetype == 't')) /* blank / transparent */
    {
-      rsp->body = bindup(image_junkbuster_gif_data, image_junkbuster_gif_length);
-      rsp->content_length = image_junkbuster_gif_length;
+      rsp->body = bindup(image_blank_data, image_blank_length);
+      rsp->content_length = image_blank_length;
+
    }
-   else
+   else if (imagetype == 'p') /* pattern */
+   {
+      rsp->body = bindup(image_pattern_data, image_pattern_length);
+      rsp->content_length = image_pattern_length;
+   }   
+   else /* logo */
    {
-      rsp->body = bindup(image_blank_gif_data, image_blank_gif_length);
-      rsp->content_length = image_blank_gif_length;
+      rsp->body = bindup(image_logo_data, image_logo_length);
+      rsp->content_length = image_logo_length;
    }   
 
    if (rsp->body == NULL)
@@ -364,7 +380,7 @@ jb_err cgi_send_banner(struct client_state *csp,
       return JB_ERR_MEMORY;
    }
 
-   if (enlist(rsp->headers, "Content-Type: image/gif"))
+   if (enlist(rsp->headers, "Content-Type: image/png"))
    {
       return JB_ERR_MEMORY;
    }
@@ -378,14 +394,14 @@ jb_err cgi_send_banner(struct client_state *csp,
 
 /*********************************************************************
  *
- * Function    :  cgi_transparent_gif
+ * Function    :  cgi_transparent_png
  *
- * Description :  CGI function that sends a 1x1 transparent GIF.
+ * Description :  CGI function that sends a 1x1 transparent PNG.
  *
  * Parameters  :
- *           1 :  csp = Current client state (buffers, headers, etc...)
- *           2 :  rsp = http_response data structure for output
- *           3 :  parameters = map of cgi parameters
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  rsp = http_response data structure for output
+ *          3  :  parameters = map of cgi parameters
  *
  * CGI Parameters : None
  *
@@ -393,19 +409,19 @@ jb_err cgi_send_banner(struct client_state *csp,
  *                JB_ERR_MEMORY on out-of-memory error.  
  *
  *********************************************************************/
-jb_err cgi_transparent_gif(struct client_state *csp,
+jb_err cgi_transparent_png(struct client_state *csp,
                            struct http_response *rsp,
                            const struct map *parameters)
 {
-   rsp->body = bindup(image_blank_gif_data, image_blank_gif_length);
-   rsp->content_length = image_blank_gif_length;
+   rsp->body = bindup(image_blank_data, image_blank_length);
+   rsp->content_length = image_blank_length;
 
    if (rsp->body == NULL)
    {
       return JB_ERR_MEMORY;
    }
 
-   if (enlist(rsp->headers, "Content-Type: image/gif"))
+   if (enlist(rsp->headers, "Content-Type: image/png"))
    {
       return JB_ERR_MEMORY;
    }
@@ -425,9 +441,9 @@ jb_err cgi_transparent_gif(struct client_state *csp,
  *                file versions of IJB.
  *
  * Parameters  :
- *           1 :  csp = Current client state (buffers, headers, etc...)
- *           2 :  rsp = http_response data structure for output
- *           3 :  parameters = map of cgi parameters
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  rsp = http_response data structure for output
+ *          3  :  parameters = map of cgi parameters
  *
  * CGI Parameters : none
  *
@@ -468,9 +484,9 @@ jb_err cgi_show_version(struct client_state *csp,
  *                current status of IJB.
  *
  * Parameters  :
- *           1 :  csp = Current client state (buffers, headers, etc...)
- *           2 :  rsp = http_response data structure for output
- *           3 :  parameters = map of cgi parameters
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  rsp = http_response data structure for output
+ *          3  :  parameters = map of cgi parameters
  *
  * CGI Parameters :
  *        file :  Which file to show.  Only first letter is checked,
@@ -689,9 +705,9 @@ jb_err cgi_show_status(struct client_state *csp,
  *                matches starting from the defaults have lead to that.
  *
  * Parameters  :
- *           1 :  csp = Current client state (buffers, headers, etc...)
- *           2 :  rsp = http_response data structure for output
- *           3 :  parameters = map of cgi parameters
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  rsp = http_response data structure for output
+ *          3  :  parameters = map of cgi parameters
  *
  * CGI Parameters :
  *            url : The url whose actions are to be determined.
@@ -948,9 +964,9 @@ jb_err cgi_show_url_info(struct client_state *csp,
  * Description :  CGI function to return "/robots.txt".
  *
  * Parameters  :
- *           1 :  csp = Current client state (buffers, headers, etc...)
- *           2 :  rsp = http_response data structure for output
- *           3 :  parameters = map of cgi parameters
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  rsp = http_response data structure for output
+ *          3  :  parameters = map of cgi parameters
  *
  * CGI Parameters : None
  *
@@ -997,7 +1013,7 @@ jb_err cgi_robots_txt(struct client_state *csp,
  *                used when building
  *
  * Parameters  :
- *           1 :  exports = map to extend
+ *          1  :  exports = map to extend
  *
  * Returns     :  JB_ERR_OK on success
  *                JB_ERR_MEMORY on out-of-memory error.