X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=showargs.c;h=b80b199353492d1b87ed1383bd1f70e541800541;hp=ea83855bebb872c8eac7d4d598fd749ce5b078f7;hb=18443d8f7bc4ac6147ad0cc2e84878fa074502b6;hpb=ad0fac0c7dd70bb15f97799f885459c6b0cf2d51
diff --git a/showargs.c b/showargs.c
index ea83855b..b80b1993 100644
--- a/showargs.c
+++ b/showargs.c
@@ -1,4 +1,4 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.19 2001/07/13 14:11:36 oes 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 $
@@ -34,6 +34,21 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.19 2001/07/13 14:11:36 oes Exp
*
* 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
@@ -197,6 +212,8 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.19 2001/07/13 14:11:36 oes Exp
#include "errlog.h"
#include "miscutil.h"
#include "gateway.h"
+#include "cgi.h"
+#include "list.h"
const char showargs_h_rcs[] = SHOWARGS_H_VERSION;
@@ -311,10 +328,10 @@ char *show_rcs(void)
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)
@@ -337,8 +354,6 @@ char *show_rcs(void)
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 */
@@ -363,119 +378,106 @@ char *show_rcs(void)
* Returns : string
*
*********************************************************************/
-char *show_defines(void)
+void show_defines(struct map *exports)
{
- char *b = NULL;
+
+#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
- b = strsav(b, " #define FEATURE_PTHREAD - Support POSIX threads.\n");
-#else
- b = strsav(b, " #undef FEATURE_PTHREAD - No support POSIX threads.\n");
-#endif
+ 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
- b = strsav(b, " #define REGEX_GNU - Support for GNU style regular expressions in the path specs.\n");
+ map_conditional(exports, "REGEX_GNU", 1);
+#else /* ifndef REGEX_GNU */
+ map_conditional(exports, "REGEX_GNU", 0);
#endif /* def REGEX_GNU */
#ifdef REGEX_PCRE
- b = strsav(b, " #define REGEX_PCRE - Support for pcre style regular expressions in the path specs.\n");
+ map_conditional(exports, "REGEX_PCRE", 1);
+#else /* ifndef REGEX_PCRE */
+ map_conditional(exports, "REGEX_PCRE", 0);
#endif /* def REGEX_PCRE */
-#ifndef REGEX
- b = strsav(b, " #undef REGEX - No support for regular expressions in the path specs.\n");
-#endif /* ndef REGEX */
-
#ifdef STATIC_PCRE
- b = strsav(b, " #define STATIC_PCRE - Using static built-in pcre rather than libpcre.\n");
+ map_conditional(exports, "STATIC_PCRE", 1);
#else /* ifndef STATIC_PCRE */
- b = strsav(b, " #undef STATIC_PCRE - Using libpcre rather than static built-in pcre.\n");
+ map_conditional(exports, "STATIC_PCRE", 0);
#endif /* ndef STATIC_PCRE */
#ifdef STATIC_PCRS
- b = strsav(b, " #define STATIC_PCRS - Using static built-in pcrs rather than libpcrs.\n");
+ map_conditional(exports, "STATIC_PCRS", 1);
#else /* ifndef STATIC_PCRS */
- b = strsav(b, " #undef STATIC_PCRS - Using libpcrs rather than static built-in pcrs.\n");
+ map_conditional(exports, "STATIC_PCRS", 0);
#endif /* ndef STATIC_PCRS */
-#ifdef TOGGLE
- b = strsav(b, " #define TOGGLE - Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.\n");
-#else /* ifndef TOGGLE */
- b = strsav(b, " #undef TOGGLE - Do not allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.\n");
-#endif /* ndef TOGGLE */
-
-#ifdef FORCE_LOAD
- b = strsav(b, " #define FORCE_LOAD - Enables bypassing filtering for a single page using the prefix \"" FORCE_PREFIX "\".\n");
-#else /* ifndef FORCE_LOAD */
- b = strsav(b, " #undef FORCE_LOAD - Disables bypassing filtering for a single page.\n");
-#endif /* ndef FORCE_LOAD */
-
-#ifdef DENY_GZIP
- b = strsav(b, " #define DENY_GZIP - Prevents requests from being compressed - required for PCRS on some sites.\n");
-#else /* ifndef DENY_GZIP */
- b = strsav(b, " #undef DENY_GZIP - Allows requests to be compressed if the browser and server support it.\n");
-#endif /* ndef DENY_GZIP */
-
-#ifdef STATISTICS
- b = strsav(b, " #define STATISTICS - Enables statistics function.\n");
-#else /* ifndef STATISTICS */
- b = strsav(b, " #undef STATISTICS - Disables statistics function.\n");
-#endif /* ndef STATISTICS */
-
-#ifdef SPLIT_PROXY_ARGS
- b = strsav(b, " #define SPLIT_PROXY_ARGS - Split this page up by placing the configuration files on separate pages.\n");
-#else /* ifndef SPLIT_PROXY_ARGS */
- b = strsav(b, " #undef SPLIT_PROXY_ARGS - This page contains the text of the configuration files, they are not split onto separate pages.\n");
-#endif /* ndef SPLIT_PROXY_ARGS */
-
-#ifdef KILLPOPUPS
- b = strsav(b, " #define KILLPOPUPS - Enables killing JavaScript popups.\n");
-#else /* ifndef KILLPOPUPS */
- b = strsav(b, " #undef KILLPOPUPS - Disables killing JavaScript popups.\n");
-#endif /* ndef KILLPOPUPS */
-
-#ifdef WEBDAV
- b = strsav(b, " #define WEBDAV - Enables support for webDAV - e.g. stops Microsoft Outlook from accessing HotMail e-mail.\n");
-#else /* ifndef WEBDAV */
- b = strsav(b, " #undef WEBDAV - Disables support for webDAV - e.g. so Microsoft Outlook can access HotMail e-mail.\n");
-#endif /* ndef WEBDAV */
-
-#ifdef DETECT_MSIE_IMAGES
- b = strsav(b, " #define DETECT_MSIE_IMAGES - Enables detecting image requests automatically for MSIE.\n");
-#else /* ifndef DETECT_MSIE_IMAGES */
- b = strsav(b, " #undef DETECT_MSIE_IMAGES - Disables detecting image requests automatically for MSIE.\n");
-#endif /* ndef DETECT_MSIE_IMAGES */
-
-#ifdef IMAGE_BLOCKING
- b = strsav(b, " #define IMAGE_BLOCKING - Enables sending \"blocked\" images instead of HTML.\n");
-#else /* ifndef IMAGE_BLOCKING */
- b = strsav(b, " #undef IMAGE_BLOCKING - Disables sending \"blocked\" images instead of HTML.\n");
-#endif /* ndef IMAGE_BLOCKING */
-
-#ifdef ACL_FILES
- b = strsav(b, " #define ACL_FILES - Enables the use of ACL files to control access to the proxy by IP address.\n");
-#else /* ifndef ACL_FILES */
- b = strsav(b, " #undef ACL_FILES - Disables the use of ACL files to control access to the proxy by IP address.\n");
-#endif /* ndef ACL_FILES */
-
-#ifdef TRUST_FILES
- b = strsav(b, " #define TRUST_FILES - Enables the use of trust files.\n");
-#else /* ifndef TRUST_FILES */
- b = strsav(b, " #undef TRUST_FILES - Disables the use of trust files.\n");
-#endif /* ndef TRUST_FILES */
-
-#ifdef JAR_FILES
- b = strsav(b, " #define JAR_FILES - Enables the use of jar files to capture cookies.\n");
-#else /* ifndef JAR_FILES */
- b = strsav(b, " #undef JAR_FILES - Disables the use of jar files to capture cookies.\n");
-#endif /* ndef JAR_FILES */
-
-#ifdef FAST_REDIRECTS
- b = strsav(b, " #define FAST_REDIRECTS - Enables intercepting remote script redirects.\n");
-#else /* ifndef FAST_REDIRECTS */
- b = strsav(b, " #undef FAST_REDIRECTS - Disables intercepting remote script redirects.\n");
-#endif /* ndef FAST_REDIRECTS */
-
- return b;
+ map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1);
}