X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=showargs.c;h=b80b199353492d1b87ed1383bd1f70e541800541;hp=a5b85b381f0a1c3be9d6156d32e460b8147491d8;hb=32b3455b3f9782f86bac0b0bff7f1049db292822;hpb=4793e1be2b24df19d6aa42a84b95653d040054f9
diff --git a/showargs.c b/showargs.c
index a5b85b38..b80b1993 100644
--- a/showargs.c
+++ b/showargs.c
@@ -1,10 +1,11 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.8 2001/05/29 09:50:24 jongfoster Exp $";
+const char showargs_rcs[] = "$Id: showargs.c,v 1.23 2001/08/02 22:03:23 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/showargs.c,v $
*
* Purpose : Contains various utility routines needed to
* generate the show-proxy-args page.
+ * FIXME: Is this really stuff for a separate file?
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
* IJBSWA team. http://ijbswa.sourceforge.net
@@ -33,6 +34,65 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.8 2001/05/29 09:50:24 jongfoste
*
* Revisions :
* $Log: showargs.c,v $
+ * Revision 1.23 2001/08/02 22:03:23 jongfoster
+ * Fixing an unterminated character constant.
+ *
+ * Revision 1.22 2001/08/01 00:20:57 jongfoster
+ * Changing show_defines so that it doesn't contain any HTML.
+ *
+ * Revision 1.21 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.20 2001/07/18 17:27:22 oes
+ * Adapted to new #defines
+ *
+ * Revision 1.19 2001/07/13 14:11:36 oes
+ * - Included SHOW_RCS for deanimate.*
+ * - Removed all #ifdef PCRS
+ *
+ *
+ * Revision 1.18 2001/07/02 02:55:16 iwanttokeepanon
+ * Apended " on some sites" to the HTML generating function `show_defines' (@ line
+ * 392); since "DENY_GZIP" is not *really* necessary for all PCRS functionallity.
+ *
+ * Revision 1.17 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
+ *
+ * Revision 1.16 2001/06/29 13:35:07 oes
+ * - Adapted
+ * - Improved comments
+ * - Removed init_proxy_args
+ * - Renamed end_proxy_args(csp) to show_rcs(void)
+ * - Removed logentry from cancelled commit
+ * - Destroyed support for ndef SPLIT_PROXY_ARGS (Ooops)
+ * - Separated the #define list into show_defines()
+ *
+ * Revision 1.15 2001/06/09 10:55:28 jongfoster
+ * Changing BUFSIZ ==> BUFFER_SIZE
+ *
+ * Revision 1.14 2001/06/07 23:15:40 jongfoster
+ * Removing config->proxy_args_gateways
+ * Missing return statement added to end_proxy_args().
+ *
+ * Revision 1.13 2001/06/06 09:37:59 sarantis
+ * Fix misplaced comment start.
+ *
+ * Revision 1.12 2001/06/04 10:41:52 swa
+ * show version string of cgi.h and cgi.c
+ *
+ * Revision 1.11 2001/06/03 11:03:48 oes
+ * moved stuff to cgi.c
+ *
+ * Revision 1.10 2001/05/31 21:36:07 jongfoster
+ * Added RCS for actions.[ch] and list.[ch]
+ *
+ * Revision 1.9 2001/05/29 23:11:38 oes
+ *
+ * - Moved strsav() from showargs to miscutil
+ *
* Revision 1.8 2001/05/29 09:50:24 jongfoster
* Unified blocklist/imagelist/permissionslist.
* File format is still under discussion, but the internal changes
@@ -152,6 +212,8 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.8 2001/05/29 09:50:24 jongfoste
#include "errlog.h"
#include "miscutil.h"
#include "gateway.h"
+#include "cgi.h"
+#include "list.h"
const char showargs_h_rcs[] = SHOWARGS_H_VERSION;
@@ -173,7 +235,7 @@ const char showargs_h_rcs[] = SHOWARGS_H_VERSION;
*********************************************************************/
void savearg(char *c, char *o, struct configuration_spec * config)
{
- char buf[BUFSIZ];
+ char buf[BUFFER_SIZE];
*buf = '\0';
@@ -207,125 +269,32 @@ void savearg(char *c, char *o, struct configuration_spec * config)
strcat(buf, "
\n");
- config->proxy_args_invocation = strsav(config->proxy_args_invocation, buf);
-
-}
-
-
-/*********************************************************************
- *
- * Function : init_proxy_args
- *
- * Description : Create the "top" of the show-proxy-args page.
- *
- * Parameters :
- * 1 : argc = argument count (same as in main)
- * 2 : argv[] = program arguments (same as in main)
- *
- * Returns : N/A
- *
- *********************************************************************/
-void init_proxy_args(int argc, const char *argv[], struct configuration_spec * config)
-{
- const struct gateway *g;
- char * b;
- int i;
-
- freez(config->proxy_args_header);
- freez(config->proxy_args_invocation);
- freez(config->proxy_args_gateways);
- freez(config->proxy_args_trailer);
-
-
- b = NULL;
- b = strsav(b,
- "HTTP/1.0 200 OK\n"
- "Server: IJ/" VERSION "\n"
- "Content-type: text/html\n\n"
-
- ""
- "
\n" - ); - - b = strsav(b, - "
"); - #define SHOW_RCS(__x) \ { \ extern const char __x[]; \ @@ -334,9 +303,15 @@ void end_proxy_args(struct configuration_spec * config) } /* In alphabetical order */ + SHOW_RCS(actions_h_rcs) + SHOW_RCS(actions_rcs) + SHOW_RCS(cgi_h_rcs) + SHOW_RCS(cgi_rcs) #ifdef __MINGW32__ SHOW_RCS(cygwin_h_rcs) #endif + SHOW_RCS(deanimate_h_rcs) + SHOW_RCS(deanimate_rcs) SHOW_RCS(encode_h_rcs) SHOW_RCS(encode_rcs) SHOW_RCS(errlog_h_rcs) @@ -353,10 +328,12 @@ void end_proxy_args(struct configuration_spec * config) SHOW_RCS(jbsockets_rcs) SHOW_RCS(jcc_h_rcs) SHOW_RCS(jcc_rcs) -#ifdef KILLPOPUPS +#ifdef FEATURE_KILL_POPUPS SHOW_RCS(killpopup_h_rcs) SHOW_RCS(killpopup_rcs) -#endif /* def KILLPOPUPS */ +#endif /* def FEATURE_KILL_POPUPS */ + SHOW_RCS(list_h_rcs) + SHOW_RCS(list_rcs) SHOW_RCS(loadcfg_h_rcs) SHOW_RCS(loadcfg_rcs) SHOW_RCS(loaders_h_rcs) @@ -365,10 +342,8 @@ void end_proxy_args(struct configuration_spec * config) SHOW_RCS(miscutil_rcs) SHOW_RCS(parsers_h_rcs) SHOW_RCS(parsers_rcs) -#ifdef PCRS SHOW_RCS(pcrs_rcs) SHOW_RCS(pcrs_h_rcs) -#endif /* def PCRS */ SHOW_RCS(project_h_rcs) SHOW_RCS(showargs_h_rcs) SHOW_RCS(showargs_rcs) @@ -379,8 +354,6 @@ void end_proxy_args(struct configuration_spec * config) SHOW_RCS(w32log_h_rcs) SHOW_RCS(w32log_rcs) SHOW_RCS(w32res_h_rcs) - SHOW_RCS(w32rulesdlg_h_rcs) - SHOW_RCS(w32rulesdlg_rcs) SHOW_RCS(w32taskbar_h_rcs) SHOW_RCS(w32taskbar_rcs) #endif /* ndef _WIN_CONSOLE */ @@ -390,122 +363,121 @@ void end_proxy_args(struct configuration_spec * config) #undef SHOW_RCS - b = strsav(b, "\n"); - - b = strsav(b, "
#define REGEX
- Support for regular expressions in the path specs.#undef REGEX
- No support for regular expressions in the path specs.#define PCRE
- Use PCRE rather than old GNU regex library.#undef PCRE
- Use old GNU regex library rather than PCRE.#define PCRS
- Enables arbitrary content modification regexps.#undef PCRS
- Disables arbitrary content modification regexps.#define TOGGLE
- Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.#undef TOGGLE
- Do not allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.#define FORCE_LOAD
- Enables bypassing filtering for a single page using the prefix \"" FORCE_PREFIX "\".#undef FORCE_LOAD
- Disables bypassing filtering for a single page.#define DENY_GZIP
- Prevents requests from being compressed - required for PCRS.#undef DENY_GZIP
- Allows requests to be compressed if the browser and server support it.#define STATISTICS
- Enables statistics function.#undef STATISTICS
- Disables statistics function.#define SPLIT_PROXY_ARGS
- Split this page up by placing the configuration files on separate pages.#undef SPLIT_PROXY_ARGS
- This page contains the text of the configuration files, they are not split onto separate pages.#define KILLPOPUPS
- Enables killing JavaScript popups.#undef KILLPOPUPS
- Disables killing JavaScript popups.#define WEBDAV
- Enables support for webDAV - e.g. stops Microsoft Outlook from accessing HotMail e-mail.#undef WEBDAV
- Disables support for webDAV - e.g. so Microsoft Outlook can access HotMail e-mail.#define DETECT_MSIE_IMAGES
- Enables detecting image requests automatically for MSIE.#undef DETECT_MSIE_IMAGES
- Disables detecting image requests automatically for MSIE.#define IMAGE_BLOCKING
- Enables sending \"blocked\" images instead of HTML.#undef IMAGE_BLOCKING
- Disables sending \"blocked\" images instead of HTML.#define ACL_FILES
- Enables the use of ACL files to control access to the proxy by IP address.#undef ACL_FILES
- Disables the use of ACL files to control access to the proxy by IP address.#define TRUST_FILES
- Enables the use of trust files.#undef TRUST_FILES
- Disables the use of trust files.#define JAR_FILES
- Enables the use of jar files to capture cookies.#undef JAR_FILES
- Disables the use of jar files to capture cookies.#define FAST_REDIRECTS
- Enables intercepting remote script redirects.#undef FAST_REDIRECTS
- Disables intercepting remote script redirects.\n" - "The " BANNER " Proxy - \n" - "" HOME_PAGE_URL "
\n"
- "Copyright © 2001 the SourceForge IJBSWA team
\n"
- "Copyright © 1997 \n" "Junkbusters Corporation
\n"
- "Copying and distribution permitted under the "
- "GNU General Public License.\n"
- ""
- "\n"
- );
-
- config->proxy_args_trailer = b;
+ return(b);
+}
+
+/*********************************************************************
+ *
+ * Function : show_defines
+ *
+ * Description : Create a string with all conditional #defines used
+ * when building
+ *
+ * Parameters : None
+ *
+ * Returns : string
+ *
+ *********************************************************************/
+void show_defines(struct map *exports)
+{
+#ifdef FEATURE_ACL
+ map_conditional(exports, "FEATURE_ACL", 1);
+#else /* ifndef FEATURE_ACL */
+ map_conditional(exports, "FEATURE_ACL", 0);
+#endif /* ndef FEATURE_ACL */
+
+#ifdef FEATURE_COOKIE_JAR
+ map_conditional(exports, "FEATURE_COOKIE_JAR", 1);
+#else /* ifndef FEATURE_COOKIE_JAR */
+ map_conditional(exports, "FEATURE_COOKIE_JAR", 0);
+#endif /* ndef FEATURE_COOKIE_JAR */
+
+#ifdef FEATURE_DENY_GZIP
+ map_conditional(exports, "FEATURE_DENY_GZIP", 1);
+#else /* ifndef FEATURE_DENY_GZIP */
+ map_conditional(exports, "FEATURE_DENY_GZIP", 0);
+#endif /* ndef FEATURE_DENY_GZIP */
+
+#ifdef FEATURE_FAST_REDIRECTS
+ map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1);
+#else /* ifndef FEATURE_FAST_REDIRECTS */
+ map_conditional(exports, "FEATURE_FAST_REDIRECTS", 0);
+#endif /* ndef FEATURE_FAST_REDIRECTS */
+
+#ifdef FEATURE_FORCE_LOAD
+ map_conditional(exports, "FEATURE_FORCE_LOAD", 1);
+#else /* ifndef FEATURE_FORCE_LOAD */
+ map_conditional(exports, "FEATURE_FORCE_LOAD", 0);
+#endif /* ndef FEATURE_FORCE_LOAD */
+
+#ifdef FEATURE_IMAGE_BLOCKING
+ map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 1);
+#else /* ifndef FEATURE_IMAGE_BLOCKING */
+ map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 0);
+#endif /* ndef FEATURE_IMAGE_BLOCKING */
+
+#ifdef FEATURE_IMAGE_DETECT_MSIE
+ map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 1);
+#else /* ifndef FEATURE_IMAGE_DETECT_MSIE */
+ map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 0);
+#endif /* ndef FEATURE_IMAGE_DETECT_MSIE */
+
+#ifdef FEATURE_KILL_POPUPS
+ map_conditional(exports, "FEATURE_KILL_POPUPS", 1);
+#else /* ifndef FEATURE_KILL_POPUPS */
+ map_conditional(exports, "FEATURE_KILL_POPUPS", 0);
+#endif /* ndef FEATURE_KILL_POPUPS */
+
+#ifdef FEATURE_PTHREAD
+ map_conditional(exports, "FEATURE_PTHREAD", 1);
+#else /* ifndef FEATURE_PTHREAD */
+ map_conditional(exports, "FEATURE_PTHREAD", 0);
+#endif /* ndef FEATURE_PTHREAD */
+
+#ifdef FEATURE_STATISTICS
+ map_conditional(exports, "FEATURE_STATISTICS", 1);
+#else /* ifndef FEATURE_STATISTICS */
+ map_conditional(exports, "FEATURE_STATISTICS", 0);
+#endif /* ndef FEATURE_STATISTICS */
+
+#ifdef FEATURE_TOGGLE
+ map_conditional(exports, "FEATURE_TOGGLE", 1);
+#else /* ifndef FEATURE_TOGGLE */
+ map_conditional(exports, "FEATURE_TOGGLE", 0);
+#endif /* ndef FEATURE_TOGGLE */
+
+#ifdef FEATURE_TRUST
+ map_conditional(exports, "FEATURE_TRUST", 1);
+#else /* ifndef FEATURE_TRUST */
+ map_conditional(exports, "FEATURE_TRUST", 0);
+#endif /* ndef FEATURE_TRUST */
+
+#ifdef REGEX_GNU
+ map_conditional(exports, "REGEX_GNU", 1);
+#else /* ifndef REGEX_GNU */
+ map_conditional(exports, "REGEX_GNU", 0);
+#endif /* def REGEX_GNU */
+
+#ifdef REGEX_PCRE
+ map_conditional(exports, "REGEX_PCRE", 1);
+#else /* ifndef REGEX_PCRE */
+ map_conditional(exports, "REGEX_PCRE", 0);
+#endif /* def REGEX_PCRE */
+
+#ifdef STATIC_PCRE
+ map_conditional(exports, "STATIC_PCRE", 1);
+#else /* ifndef STATIC_PCRE */
+ map_conditional(exports, "STATIC_PCRE", 0);
+#endif /* ndef STATIC_PCRE */
+
+#ifdef STATIC_PCRS
+ map_conditional(exports, "STATIC_PCRS", 1);
+#else /* ifndef STATIC_PCRS */
+ map_conditional(exports, "STATIC_PCRS", 0);
+#endif /* ndef STATIC_PCRS */
+
+ map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1);
}