X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=showargs.c;h=ea83855bebb872c8eac7d4d598fd749ce5b078f7;hb=ffa11e6cc708137ca152a78fcfa4bdd03bfa81c1;hp=d7e9ca296a487d706a2910480069ba05da9260ed;hpb=92c05ed6c1d429ca1decfa3b8cca1b6914e60b82;p=privoxy.git

diff --git a/showargs.c b/showargs.c
index d7e9ca29..ea83855b 100644
--- a/showargs.c
+++ b/showargs.c
@@ -1,4 +1,4 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.15 2001/06/09 10:55:28 jongfoster Exp $";
+const char showargs_rcs[] = "$Id: showargs.c,v 1.19 2001/07/13 14:11:36 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/showargs.c,v $
@@ -34,6 +34,27 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.15 2001/06/09 10:55:28 jongfost
  *
  * Revisions   :
  *    $Log: showargs.c,v $
+ *    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
  *
@@ -272,6 +293,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)
@@ -302,10 +325,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)
@@ -327,7 +348,7 @@ char *show_rcs(void)
 
 #undef SHOW_RCS
 
-	return(b);
+   return(b);
 }
 
 /*********************************************************************
@@ -346,23 +367,35 @@ char *show_defines(void)
 {
    char *b = NULL;
 
-#ifdef REGEX
-   b = strsav(b, "  <li><code>#define <b>REGEX</b></code> - Support for regular expressions in the path specs.</li>\n");
-#else /* ifndef REGEX */
+#ifdef FEATURE_PTHREAD
+   b = strsav(b, "  <li><code>#define <b>FEATURE_PTHREAD</b></code> - Support POSIX threads.</li>\n");
+#else
+   b = strsav(b, "  <li><code>#undef <b>FEATURE_PTHREAD</b></code> - No support POSIX threads.</li>\n");
+#endif
+
+#ifdef REGEX_GNU
+   b = strsav(b, "  <li><code>#define <b>REGEX_GNU</b></code> - Support for GNU style regular expressions in the path specs.</li>\n");
+#endif /* def REGEX_GNU */
+
+#ifdef REGEX_PCRE
+   b = strsav(b, "  <li><code>#define <b>REGEX_PCRE</b></code> - Support for pcre style regular expressions in the path specs.</li>\n");
+#endif /* def REGEX_PCRE */
+
+#ifndef REGEX
    b = strsav(b, "  <li><code>#undef <b>REGEX</b></code> - No support for regular expressions in the path specs.</li>\n");
 #endif /* ndef REGEX */
 
-#ifdef PCRE
-   b = strsav(b, "  <li><code>#define <b>PCRE</b></code> - Use PCRE rather than old GNU regex library.</li>\n");
-#else /* ifndef PCRE */
-   b = strsav(b, "  <li><code>#undef <b>PCRE</b></code> - Use old GNU regex library rather than PCRE.</li>\n");
-#endif /* ndef PCRE */
+#ifdef STATIC_PCRE
+   b = strsav(b, "  <li><code>#define <b>STATIC_PCRE</b></code> - Using static built-in pcre rather than libpcre.</li>\n");
+#else /* ifndef STATIC_PCRE */
+   b = strsav(b, "  <li><code>#undef <b>STATIC_PCRE</b></code> - Using libpcre rather than static built-in pcre.</li>\n");
+#endif /* ndef STATIC_PCRE */
 
-#ifdef PCRS
-   b = strsav(b, "  <li><code>#define <b>PCRS</b></code> - Enables arbitrary content modification regexps.</li>\n");
-#else /* ifndef PCRS */
-   b = strsav(b, "  <li><code>#undef <b>PCRS</b></code> - Disables arbitrary content modification regexps.</li>\n");
-#endif /* ndef PCRS */
+#ifdef STATIC_PCRS
+   b = strsav(b, "  <li><code>#define <b>STATIC_PCRS</b></code> - Using static built-in pcrs rather than libpcrs.</li>\n");
+#else /* ifndef STATIC_PCRS */
+   b = strsav(b, "  <li><code>#undef <b>STATIC_PCRS</b></code> - Using libpcrs rather than static built-in pcrs.</li>\n");
+#endif /* ndef STATIC_PCRS */
 
 #ifdef TOGGLE
    b = strsav(b, "  <li><code>#define <b>TOGGLE</b></code> - Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.</li>\n");
@@ -377,7 +410,7 @@ char *show_defines(void)
 #endif /* ndef FORCE_LOAD */
 
 #ifdef DENY_GZIP
-   b = strsav(b, "  <li><code>#define <b>DENY_GZIP</b></code> - Prevents requests from being compressed - required for PCRS.</li>\n");
+   b = strsav(b, "  <li><code>#define <b>DENY_GZIP</b></code> - Prevents requests from being compressed - required for PCRS on some sites.</li>\n");
 #else /* ifndef DENY_GZIP */
    b = strsav(b, "  <li><code>#undef <b>DENY_GZIP</b></code> - Allows requests to be compressed if the browser and server support it.</li>\n");
 #endif /* ndef DENY_GZIP */