X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgi.h;h=2217b06521dae323663619046b38557c98fcbbe1;hb=e97ab93c25bbff1a08279c35fc4c77855d909585;hp=c76696a3c70794ae0fef00d9f233683177ce51f2;hpb=4f714f74b7d1376746f807f600a89bb552628836;p=privoxy.git

diff --git a/cgi.h b/cgi.h
index c76696a3..2217b065 100644
--- a/cgi.h
+++ b/cgi.h
@@ -1,6 +1,6 @@
-#ifndef _CGI_H
-#define _CGI_H
-#define CGI_H_VERSION "$Id: cgi.h,v 1.4 2001/06/09 10:50:58 jongfoster Exp $"
+#ifndef CGI_H_INCLUDED
+#define CGI_H_INCLUDED
+#define CGI_H_VERSION "$Id: cgi.h,v 1.11 2001/08/05 16:06:20 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.h,v $
@@ -38,6 +38,40 @@
  *
  * Revisions   :
  *    $Log: cgi.h,v $
+ *    Revision 1.11  2001/08/05 16:06:20  jongfoster
+ *    Modifiying "struct map" so that there are now separate header and
+ *    "map_entry" structures.  This means that functions which modify a
+ *    map no longer need to return a pointer to the modified map.
+ *    Also, it no longer reverses the order of the entries (which may be
+ *    important with some advanced template substitutions).
+ *
+ *    Revision 1.10  2001/08/01 21:19:22  jongfoster
+ *    Moving file version information to a separate CGI page.
+ *
+ *    Revision 1.9  2001/08/01 00:17:54  jongfoster
+ *    Adding prototype for map_conditional
+ *
+ *    Revision 1.8  2001/07/30 22:08:36  jongfoster
+ *    Tidying up #defines:
+ *    - All feature #defines are now of the form FEATURE_xxx
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ *    Revision 1.7  2001/07/29 18:43:08  jongfoster
+ *    Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to
+ *    ANSI C rules.
+ *
+ *    Revision 1.6  2001/06/29 21:45:41  oes
+ *    Indentation, CRLF->LF, Tab-> Space
+ *
+ *    Revision 1.5  2001/06/29 13:22:44  oes
+ *    - Cleaned up
+ *    - Added new functions: default_exports(), make_menu(),
+ *      error_response() etc, ranamed others and changed
+ *      param and return types.
+ *    - Removed HTTP/HTML snipplets
+ *    - Removed logentry from cancelled commit
+ *
  *    Revision 1.4  2001/06/09 10:50:58  jongfoster
  *    Changing "show URL info" handler to new style.
  *    Adding "extern" to some function prototypes.
@@ -65,14 +99,16 @@ extern struct map *parse_cgi_parameters(char *argstring);
 /*
  * CGI functions
  */
+extern int cgi_show_version(struct client_state *csp, struct http_response *rsp,
+                            struct map *parameters);
 extern int cgi_default(struct client_state *csp, struct http_response *rsp,
                        struct map *parameters);
 extern int cgi_show_status(struct client_state *csp, struct http_response *rsp,
                            struct map *parameters);
-extern int cgi_show_url_info(struct client_state *csp, struct http_response *rsp,
+extern int cgi_show_url_info(struct client_state *csp, struct http_response *rsp,
                              struct map *parameters);
 extern int cgi_send_banner(struct client_state *csp, struct http_response *rsp,
-			                  struct map *parameters);
+   		                  struct map *parameters);
 
 /* Not exactly a CGI */
 extern struct http_response *error_response(struct client_state *csp, const char *template, int err);
@@ -83,41 +119,29 @@ extern struct http_response *error_response(struct client_state *csp, const char
 extern struct http_response *finish_http_response(struct http_response *rsp);
 extern void free_http_response(struct http_response *rsp);
 
-extern struct map *default_exports(struct client_state *csp, char *caller);
-extern struct map *map_block_killer(struct map *map, char *name);
-extern char *fill_template(struct client_state *csp, const char *template, struct map *exports);
+extern struct map * default_exports(const struct client_state *csp, const char *caller);
+extern void map_block_killer(struct map *map, const char *name);
+extern void map_conditional(struct map *exports, const char *name, int choose_first);
+extern char *fill_template(struct client_state *csp, const char *templatename, struct map *exports);
 
 
 /*
  * Text generators
  */
 extern char *make_menu(const char *self);
-extern char *dump_map(struct map *map);
+extern char *dump_map(const struct map *map);
 
-#ifdef STATISTICS
+#ifdef FEATURE_STATISTICS
 extern struct map *add_stats(struct map *exports);
-#endif /* def STATISTICS */
-
+#endif /* def FEATURE_STATISTICS */
 
 /*
- * Hint: You can encode your own GIFs like that:
- * perl -e 'while (read STDIN, $c, 1) { printf("\\%.3o,", unpack("C", $c)); }'
+ * Some images.
  */
-
-static const char JBGIF[] =
-   "GIF89aD\000\013\000\360\000\000\000\000\000\377\377\377!"
-   "\371\004\001\000\000\001\000,\000\000\000\000D\000\013\000"
-   "\000\002a\214\217\251\313\355\277\000\200G&K\025\316hC\037"
-   "\200\234\230Y\2309\235S\230\266\206\372J\253<\3131\253\271"
-   "\270\215\342\254\013\203\371\202\264\334P\207\332\020o\266"
-   "N\215I\332=\211\312\3513\266:\026AK)\364\370\365aobr\305"
-   "\372\003S\275\274k2\354\254z\347?\335\274x\306^9\374\276"
-   "\037Q\000\000;";
-
-static const char BLANKGIF[] =
-   "GIF89a\001\000\001\000\200\000\000\377\377\377\000\000"
-   "\000!\371\004\001\000\000\000\000,\000\000\000\000\001"
-   "\000\001\000\000\002\002D\001\000;";
+extern const char image_junkbuster_gif_data[];
+extern const int  image_junkbuster_gif_length;
+extern const char image_blank_gif_data[];
+extern const int  image_blank_gif_length;
 
 
 /* Revision control strings from this header and associated .c file */
@@ -128,7 +152,7 @@ extern const char cgi_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _CGI_H */
+#endif /* ndef CGI_H_INCLUDED */
 
 /*
   Local Variables: