X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=showargs.c;h=016eb63b58366ff25560c69f6cd820e3278930f9;hp=fa4163f97b5c1647125f61b1cdc38b0c61e1f244;hb=7679acc0d466f9ed8e0007d5c472b5e2e527c255;hpb=b28e9205bb0d4ac98d591c6e506219438799d56c
diff --git a/showargs.c b/showargs.c
index fa4163f9..016eb63b 100644
--- a/showargs.c
+++ b/showargs.c
@@ -1,4 +1,4 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.16 2001/06/29 13:35:07 oes Exp $";
+const char showargs_rcs[] = "$Id: showargs.c,v 1.20 2001/07/18 17:27:22 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/showargs.c,v $
@@ -34,6 +34,21 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.16 2001/06/29 13:35:07 oes Exp
*
* Revisions :
* $Log: showargs.c,v $
+ * 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
@@ -281,6 +296,8 @@ char *show_rcs(void)
#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)
@@ -297,10 +314,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)
@@ -311,10 +328,8 @@ char *show_rcs(void)
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)
@@ -325,8 +340,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 */
@@ -355,101 +368,101 @@ char *show_defines(void)
{
char *b = NULL;
-#ifdef REGEX
- b = strsav(b, " #define REGEX - Support for regular expressions in the path specs.\n");
-#else /* ifndef REGEX */
+#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
+
+#ifdef REGEX_GNU
+ b = strsav(b, " #define REGEX_GNU - Support for GNU style regular expressions in the path specs.\n");
+#endif /* def REGEX_GNU */
+
+#ifdef REGEX_PCRE
+ b = strsav(b, " #define REGEX_PCRE - Support for pcre style regular expressions in the path specs.\n");
+#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 PCRE
- b = strsav(b, " #define PCRE - Use PCRE rather than old GNU regex library.\n");
-#else /* ifndef PCRE */
- b = strsav(b, " #undef PCRE - Use old GNU regex library rather than PCRE.\n");
-#endif /* ndef PCRE */
-
-#ifdef PCRS
- b = strsav(b, " #define PCRS - Enables arbitrary content modification regexps.\n");
-#else /* ifndef PCRS */
- b = strsav(b, " #undef PCRS - Disables arbitrary content modification regexps.\n");
-#endif /* ndef 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.\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 */
+#ifdef STATIC_PCRE
+ b = strsav(b, " #define STATIC_PCRE - Using static built-in pcre rather than libpcre.\n");
+#else /* ifndef STATIC_PCRE */
+ b = strsav(b, " #undef STATIC_PCRE - Using libpcre rather than static built-in pcre.\n");
+#endif /* ndef STATIC_PCRE */
+
+#ifdef STATIC_PCRS
+ b = strsav(b, " #define STATIC_PCRS - Using static built-in pcrs rather than libpcrs.\n");
+#else /* ifndef STATIC_PCRS */
+ b = strsav(b, " #undef STATIC_PCRS - Using libpcrs rather than static built-in pcrs.\n");
+#endif /* ndef STATIC_PCRS */
+
+#ifdef FEATURE_TOGGLE
+ b = strsav(b, " #define FEATURE_TOGGLE - Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.\n");
+#else /* ifndef FEATURE_TOGGLE */
+ b = strsav(b, " #undef FEATURE_TOGGLE - Do not allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.\n");
+#endif /* ndef FEATURE_TOGGLE */
+
+#ifdef FEATURE_FORCE_LOAD
+ b = strsav(b, " #define FEATURE_FORCE_LOAD - Enables bypassing filtering for a single page using the prefix \"" FORCE_PREFIX "\".\n");
+#else /* ifndef FEATURE_FORCE_LOAD */
+ b = strsav(b, " #undef FEATURE_FORCE_LOAD - Disables bypassing filtering for a single page.\n");
+#endif /* ndef FEATURE_FORCE_LOAD */
+
+#ifdef FEATURE_DENY_GZIP
+ b = strsav(b, " #define FEATURE_DENY_GZIP - Prevents requests from being compressed - required for PCRS on some sites.\n");
+#else /* ifndef FEATURE_DENY_GZIP */
+ b = strsav(b, " #undef FEATURE_DENY_GZIP - Allows requests to be compressed if the browser and server support it.\n");
+#endif /* ndef FEATURE_DENY_GZIP */
+
+#ifdef FEATURE_STATISTICS
+ b = strsav(b, " #define FEATURE_STATISTICS - Enables statistics function.\n");
+#else /* ifndef FEATURE_STATISTICS */
+ b = strsav(b, " #undef FEATURE_STATISTICS - Disables statistics function.\n");
+#endif /* ndef FEATURE_STATISTICS */
+
+#ifdef FEATURE_KILL_POPUPS
+ b = strsav(b, " #define FEATURE_KILL_POPUPS - Enables killing JavaScript popups.\n");
+#else /* ifndef FEATURE_KILL_POPUPS */
+ b = strsav(b, " #undef FEATURE_KILL_POPUPS - Disables killing JavaScript popups.\n");
+#endif /* ndef FEATURE_KILL_POPUPS */
+
+#ifdef FEATURE_IMAGE_DETECT_MSIE
+ b = strsav(b, " #define FEATURE_IMAGE_DETECT_MSIE - Enables detecting image requests automatically for MSIE.\n");
+#else /* ifndef FEATURE_IMAGE_DETECT_MSIE */
+ b = strsav(b, " #undef FEATURE_IMAGE_DETECT_MSIE - Disables detecting image requests automatically for MSIE.\n");
+#endif /* ndef FEATURE_IMAGE_DETECT_MSIE */
+
+#ifdef FEATURE_IMAGE_BLOCKING
+ b = strsav(b, " #define FEATURE_IMAGE_BLOCKING - Enables sending \"blocked\" images instead of HTML.\n");
+#else /* ifndef FEATURE_IMAGE_BLOCKING */
+ b = strsav(b, " #undef FEATURE_IMAGE_BLOCKING - Disables sending \"blocked\" images instead of HTML.\n");
+#endif /* ndef FEATURE_IMAGE_BLOCKING */
+
+#ifdef FEATURE_ACL
+ b = strsav(b, " #define FEATURE_ACL - Enables the use of ACL files to control access to the proxy by IP address.\n");
+#else /* ifndef FEATURE_ACL */
+ b = strsav(b, " #undef FEATURE_ACL - Disables the use of ACL files to control access to the proxy by IP address.\n");
+#endif /* ndef FEATURE_ACL */
+
+#ifdef FEATURE_TRUST
+ b = strsav(b, " #define FEATURE_TRUST - Enables the use of trust files.\n");
+#else /* ifndef FEATURE_TRUST */
+ b = strsav(b, " #undef FEATURE_TRUST - Disables the use of trust files.\n");
+#endif /* ndef FEATURE_TRUST */
+
+#ifdef FEATURE_COOKIE_JAR
+ b = strsav(b, " #define FEATURE_COOKIE_JAR - Enables the use of jar files to capture cookies.\n");
+#else /* ifndef FEATURE_COOKIE_JAR */
+ b = strsav(b, " #undef FEATURE_COOKIE_JAR - Disables the use of jar files to capture cookies.\n");
+#endif /* ndef FEATURE_COOKIE_JAR */
+
+#ifdef FEATURE_FAST_REDIRECTS
+ b = strsav(b, " #define FEATURE_FAST_REDIRECTS - Enables intercepting remote script redirects.\n");
+#else /* ifndef FEATURE_FAST_REDIRECTS */
+ b = strsav(b, " #undef FEATURE_FAST_REDIRECTS - Disables intercepting remote script redirects.\n");
+#endif /* ndef FEATURE_FAST_REDIRECTS */
return b;
}