X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=showargs.c;h=016eb63b58366ff25560c69f6cd820e3278930f9;hp=141b58fff1840fa7f697c644ec018fcdbfd3462f;hb=7679acc0d466f9ed8e0007d5c472b5e2e527c255;hpb=b11d8cca53e86b87952f74e55063bffe3640ed03 diff --git a/showargs.c b/showargs.c index 141b58ff..016eb63b 100644 --- a/showargs.c +++ b/showargs.c @@ -1,10 +1,11 @@ -const char showargs_rcs[] = "$Id: showargs.c,v 1.9 2001/05/29 23:11:38 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 $ * * 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,49 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.9 2001/05/29 23:11:38 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 + * - 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 @@ -177,7 +221,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'; @@ -211,125 +255,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" - - "" - "" - "Internet Junkbuster Proxy Status" - "\n" - "\n" - "
\n" - "

" BANNER "\n" - "Proxy Status\n" - "

\n" - "

You are using the " BANNER " TM

\n" - "Version: " VERSION "\n" - "
Home page: " HOME_PAGE_URL "\n" - "

\n" - ); - - b = strsav(b, - "

The program was invoked as follows

\n"); - - for (i=0; i < argc; i++) - { - b = strsav(b, argv[i]); - b = strsav(b, " "); - } - b = strsav(b, "
\n"); - - config->proxy_args_header = b; - - config->proxy_args_invocation = strsav( - config->proxy_args_invocation, - "
\n" - "and the following options were set in the configuration file" - "

\n" - ); - - b = NULL; - - b = strsav(b, - "

It supports the following gateway protocols:

\n"); - - for (g = gateways; g->name; g++) - { - b = strsav(b, g->name); - b = strsav(b, " "); - } - b = strsav(b, "
\n"); + config->proxy_args = strsav(config->proxy_args, buf); - config->proxy_args_gateways = b; } /********************************************************************* * - * Function : end_proxy_args + * Function : show_rcs * - * Description : Create the "bottom" of the show-proxy-args page. + * Description : Create a string with the rcs info for all sourcefiles * * Parameters : None * - * Returns : N/A + * Returns : string * *********************************************************************/ -void end_proxy_args(struct configuration_spec * config) +char *show_rcs(void) { char *b = NULL; - char buf[BUFSIZ]; + char buf[BUFFER_SIZE]; /* Instead of including *all* dot h's in the project (thus creating a * tremendous amount of dependencies), I will concede to declaring them * as extern's. This forces the developer to add to this list, but oh well. */ -#ifndef SPLIT_PROXY_ARGS - if (suppress_blocklists && suppress_message!=NULL) - { - b = strsav(b, "

File contents

\n"); - b = strsav(b, suppress_message); - b = strsav(b, "\n"); - } -#endif /* ndef SPLIT_PROXY_ARGS */ - - b = strsav(b, "

Source versions:

\n"); - b = strsav(b, "
");
-
 #define SHOW_RCS(__x)            \
    {                             \
       extern const char __x[];   \
@@ -340,9 +291,13 @@ 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)
@@ -359,10 +314,10 @@ 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)
@@ -373,10 +328,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)
@@ -387,8 +340,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 */
@@ -398,122 +349,122 @@ void end_proxy_args(struct configuration_spec * config)
 
 #undef SHOW_RCS
 
-   b = strsav(b, "
\n"); + return(b); +} + +/********************************************************************* + * + * Function : show_defines + * + * Description : Create a string with all conditional #defines used + * when building + * + * Parameters : None + * + * Returns : string + * + *********************************************************************/ +char *show_defines(void) +{ + char *b = NULL; - b = strsav(b, "

Conditional defines:

\n\n
\n"); - - b = strsav(b, - "

\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; - +#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; }