From: jongfoster Date: Wed, 1 Aug 2001 00:20:57 +0000 (+0000) Subject: Changing show_defines so that it doesn't contain any HTML. X-Git-Tag: v_2_9_9~166 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=c53b1d365affbaa1a32b6fcb9fedb23180b03d3f Changing show_defines so that it doesn't contain any HTML. --- diff --git a/showargs.c b/showargs.c index 016eb63b..11632961 100644 --- a/showargs.c +++ b/showargs.c @@ -1,4 +1,4 @@ -const char showargs_rcs[] = "$Id: showargs.c,v 1.20 2001/07/18 17:27:22 oes Exp $"; +const char showargs_rcs[] = "$Id: showargs.c,v 1.21 2001/07/30 22:08:36 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/showargs.c,v $ @@ -34,6 +34,12 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.20 2001/07/18 17:27:22 oes Exp * * Revisions : * $Log: showargs.c,v $ + * 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 * @@ -200,6 +206,8 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.20 2001/07/18 17:27:22 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; @@ -364,107 +372,108 @@ char *show_rcs(void) * Returns : string * *********************************************************************/ -char *show_defines(void) +struct map * show_defines(struct map *exports) { - char *b = NULL; - -#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 FEATURE_ACL + exports = map_conditional(exports, "FEATURE_ACL", 1); +#else /* ifndef FEATURE_ACL */ + exports = map_conditional(exports, "FEATURE_ACL", 0); +#endif /* ndef FEATURE_ACL */ -#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 FEATURE_COOKIE_JAR + exports = map_conditional(exports, "FEATURE_COOKIE_JAR", 1); +#else /* ifndef FEATURE_COOKIE_JAR */ + exports = map_conditional(exports, "FEATURE_COOKIE_JAR", 0); +#endif /* ndef FEATURE_COOKIE_JAR */ -#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_DENY_GZIP + exports = map_conditional(exports, "FEATURE_DENY_GZIP", 1); +#else /* ifndef FEATURE_DENY_GZIP */ + exports = map_conditional(exports, "FEATURE_DENY_GZIP", 0); +#endif /* ndef FEATURE_DENY_GZIP */ -#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_FAST_REDIRECTS + exports = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1); +#else /* ifndef FEATURE_FAST_REDIRECTS */ + exports = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 0); +#endif /* ndef FEATURE_FAST_REDIRECTS */ #ifdef FEATURE_FORCE_LOAD - b = strsav(b, "
  • #define FEATURE_FORCE_LOAD - Enables bypassing filtering for a single page using the prefix \"" FORCE_PREFIX "\".
    • \n"); + exports = map_conditional(exports, "FEATURE_FORCE_LOAD", 1); #else /* ifndef FEATURE_FORCE_LOAD */ - b = strsav(b, "
  • #undef FEATURE_FORCE_LOAD - Disables bypassing filtering for a single page.
    • \n"); + exports = map_conditional(exports, "FEATURE_FORCE_LOAD", 0); #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_IMAGE_BLOCKING + exports = map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 1); +#else /* ifndef FEATURE_IMAGE_BLOCKING */ + exports = map_conditional(exports, "FEATURE_IMAGE_BLOCKING, 0); +#endif /* ndef FEATURE_IMAGE_BLOCKING */ -#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_IMAGE_DETECT_MSIE + exports = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 1); +#else /* ifndef FEATURE_IMAGE_DETECT_MSIE */ + exports = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 0); +#endif /* ndef FEATURE_IMAGE_DETECT_MSIE */ #ifdef FEATURE_KILL_POPUPS - b = strsav(b, "
  • #define FEATURE_KILL_POPUPS - Enables killing JavaScript popups.
    • \n"); + exports = map_conditional(exports, "FEATURE_KILL_POPUPS", 1); #else /* ifndef FEATURE_KILL_POPUPS */ - b = strsav(b, "
  • #undef FEATURE_KILL_POPUPS - Disables killing JavaScript popups.
    • \n"); + exports = map_conditional(exports, "FEATURE_KILL_POPUPS", 0); #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_PTHREAD + exports = map_conditional(exports, "FEATURE_PTHREAD", 1); +#else /* ifndef FEATURE_PTHREAD */ + exports = map_conditional(exports, "FEATURE_PTHREAD", 0); +#endif /* ndef FEATURE_PTHREAD */ -#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_STATISTICS + exports = map_conditional(exports, "FEATURE_STATISTICS", 1); +#else /* ifndef FEATURE_STATISTICS */ + exports = map_conditional(exports, "FEATURE_STATISTICS", 0); +#endif /* ndef FEATURE_STATISTICS */ -#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_TOGGLE + exports = map_conditional(exports, "FEATURE_TOGGLE", 1); +#else /* ifndef FEATURE_TOGGLE */ + exports = map_conditional(exports, "FEATURE_TOGGLE", 0); +#endif /* ndef FEATURE_TOGGLE */ #ifdef FEATURE_TRUST - b = strsav(b, "
  • #define FEATURE_TRUST - Enables the use of trust files.
    • \n"); + exports = map_conditional(exports, "FEATURE_TRUST", 1); #else /* ifndef FEATURE_TRUST */ - b = strsav(b, "
  • #undef FEATURE_TRUST - Disables the use of trust files.
    • \n"); + exports = map_conditional(exports, "FEATURE_TRUST", 0); #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 REGEX_GNU + exports = map_conditional(exports, "REGEX_GNU", 1); +#else /* ifndef REGEX_GNU */ + exports = map_conditional(exports, "REGEX_GNU", 0); +#endif /* def REGEX_GNU */ -#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 */ +#ifdef REGEX_PCRE + exports = map_conditional(exports, "REGEX_PCRE", 1); +#else /* ifndef REGEX_PCRE */ + exports = map_conditional(exports, "REGEX_PCRE", 0); +#endif /* def REGEX_PCRE */ + +#ifdef STATIC_PCRE + exports = map_conditional(exports, "STATIC_PCRE", 1); +#else /* ifndef STATIC_PCRE */ + exports = map_conditional(exports, "STATIC_PCRE", 0); +#endif /* ndef STATIC_PCRE */ + +#ifdef STATIC_PCRS + exports = map_conditional(exports, "STATIC_PCRS", 1); +#else /* ifndef STATIC_PCRS */ + exports = map_conditional(exports, "STATIC_PCRS", 0); +#endif /* ndef STATIC_PCRS */ + + exports = map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1); - return b; + return exports; }