X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=showargs.c;h=b80b199353492d1b87ed1383bd1f70e541800541;hp=6491418c1dc096e8798909e002a8425ede71991d;hb=7e5776d39d3c2dc3f1f341c96bbf8a6948de5682;hpb=9d8a8f5190b3addf42b8c9d137d27cdaa2a9eea4
diff --git a/showargs.c b/showargs.c
index 6491418c..b80b1993 100644
--- a/showargs.c
+++ b/showargs.c
@@ -1,10 +1,11 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.12 2001/06/04 10:41:52 swa 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 $
*
* 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,62 +34,57 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.12 2001/06/04 10:41:52 swa Exp
*
* Revisions :
* $Log: showargs.c,v $
- * 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
- * Makefile/in
- *
- * introduced cgi.c
- *
- * actions.c:
- *
- * adapted to new enlist_unique arg format
- *
- * conf loadcfg.c
- *
- * introduced confdir option
- *
- * filters.c filtrers.h
- *
- * extracted-CGI relevant stuff
- *
- * jbsockets.c
+ * Revision 1.23 2001/08/02 22:03:23 jongfoster
+ * Fixing an unterminated character constant.
*
- * filled comment
+ * Revision 1.22 2001/08/01 00:20:57 jongfoster
+ * Changing show_defines so that it doesn't contain any HTML.
*
- * jcc.c
+ * 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
*
- * support for new cgi mechansim
+ * Revision 1.20 2001/07/18 17:27:22 oes
+ * Adapted to new #defines
*
- * list.c list.h
+ * Revision 1.19 2001/07/13 14:11:36 oes
+ * - Included SHOW_RCS for deanimate.*
+ * - Removed all #ifdef PCRS
*
- * functions for new list type: "map"
- * extended enlist_unique
*
- * miscutil.c .h
- * introduced bindup()
+ * 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.
*
- * parsers.c parsers.h
+ * Revision 1.17 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
*
- * deleted const struct interceptors
+ * 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()
*
- * pcrs.c
- * added FIXME
+ * Revision 1.15 2001/06/09 10:55:28 jongfoster
+ * Changing BUFSIZ ==> BUFFER_SIZE
*
- * project.h
+ * Revision 1.14 2001/06/07 23:15:40 jongfoster
+ * Removing config->proxy_args_gateways
+ * Missing return statement added to end_proxy_args().
*
- * added struct map
- * added struct http_response
- * changes struct interceptors to struct cgi_dispatcher
- * moved HTML stuff to cgi.h
+ * Revision 1.13 2001/06/06 09:37:59 sarantis
+ * Fix misplaced comment start.
*
- * re_filterfile:
- *
- * changed
+ * Revision 1.12 2001/06/04 10:41:52 swa
+ * show version string of cgi.h and cgi.c
*
- * showargs.c
- * NO TIME LEFT
+ * 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]
@@ -216,6 +212,8 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.12 2001/06/04 10:41:52 swa Exp
#include "errlog.h"
#include "miscutil.h"
#include "gateway.h"
+#include "cgi.h"
+#include "list.h"
const char showargs_h_rcs[] = SHOWARGS_H_VERSION;
@@ -237,7 +235,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';
@@ -271,84 +269,32 @@ void savearg(char *c, char *o, struct configuration_spec * config)
strcat(buf, "
\n");
- config->proxy_args_invocation = strsav(config->proxy_args_invocation, buf);
-
-}
-
+ config->proxy_args = strsav(config->proxy_args, 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 = NULL;
- int i;
-
- freez(config->proxy_args_header);
- freez(config->proxy_args_gateways);
-
-
- for (i=0; i < argc; i++)
- {
- b = strsav(b, argv[i]);
- b = strsav(b, " ");
- }
- config->proxy_args_header = b;
-
- b = NULL;
- for (g = gateways; g->name; g++)
- {
- b = strsav(b, g->name);
- b = strsav(b, " ");
- }
- 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 : string with that bottom
+ * Returns : string
*
*********************************************************************/
-char *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, "
"); - #define SHOW_RCS(__x) \ { \ extern const char __x[]; \ @@ -364,6 +310,8 @@ char *end_proxy_args(struct configuration_spec * config) #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) @@ -380,10 +328,10 @@ char *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) @@ -394,10 +342,8 @@ char *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) @@ -408,8 +354,6 @@ char *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 */ @@ -419,110 +363,121 @@ char *end_proxy_args(struct configuration_spec * config) #undef SHOW_RCS - b = strsav(b, "\n"); - - b = strsav(b, "
#define REGEX
- Support for regular expressions in the path specs.#undef REGEX
- No support for regular expressions in the path specs.#define PCRE
- Use PCRE rather than old GNU regex library.#undef PCRE
- Use old GNU regex library rather than PCRE.#define PCRS
- Enables arbitrary content modification regexps.#undef PCRS
- Disables arbitrary content modification regexps.#define TOGGLE
- Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.#undef TOGGLE
- Do not allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.#define FORCE_LOAD
- Enables bypassing filtering for a single page using the prefix \"" FORCE_PREFIX "\".#undef FORCE_LOAD
- Disables bypassing filtering for a single page.#define DENY_GZIP
- Prevents requests from being compressed - required for PCRS.#undef DENY_GZIP
- Allows requests to be compressed if the browser and server support it.#define STATISTICS
- Enables statistics function.#undef STATISTICS
- Disables statistics function.#define SPLIT_PROXY_ARGS
- Split this page up by placing the configuration files on separate pages.#undef SPLIT_PROXY_ARGS
- This page contains the text of the configuration files, they are not split onto separate pages.#define KILLPOPUPS
- Enables killing JavaScript popups.#undef KILLPOPUPS
- Disables killing JavaScript popups.#define WEBDAV
- Enables support for webDAV - e.g. stops Microsoft Outlook from accessing HotMail e-mail.#undef WEBDAV
- Disables support for webDAV - e.g. so Microsoft Outlook can access HotMail e-mail.#define DETECT_MSIE_IMAGES
- Enables detecting image requests automatically for MSIE.#undef DETECT_MSIE_IMAGES
- Disables detecting image requests automatically for MSIE.#define IMAGE_BLOCKING
- Enables sending \"blocked\" images instead of HTML.#undef IMAGE_BLOCKING
- Disables sending \"blocked\" images instead of HTML.#define ACL_FILES
- Enables the use of ACL files to control access to the proxy by IP address.#undef ACL_FILES
- Disables the use of ACL files to control access to the proxy by IP address.#define TRUST_FILES
- Enables the use of trust files.#undef TRUST_FILES
- Disables the use of trust files.#define JAR_FILES
- Enables the use of jar files to capture cookies.#undef JAR_FILES
- Disables the use of jar files to capture cookies.#define FAST_REDIRECTS
- Enables intercepting remote script redirects.#undef FAST_REDIRECTS
- Disables intercepting remote script redirects.