X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=showargs.c;h=ea83855bebb872c8eac7d4d598fd749ce5b078f7;hb=4bb8225677e05ca9fe842f6343479fd4f875a022;hp=6491418c1dc096e8798909e002a8425ede71991d;hpb=9d8a8f5190b3addf42b8c9d137d27cdaa2a9eea4;p=privoxy.git
diff --git a/showargs.c b/showargs.c
index 6491418c..ea83855b 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.19 2001/07/13 14:11:36 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,62 +34,42 @@ 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
- *
- * filled comment
- *
- * jcc.c
- *
- * support for new cgi mechansim
+ * Revision 1.19 2001/07/13 14:11:36 oes
+ * - Included SHOW_RCS for deanimate.*
+ * - Removed all #ifdef PCRS
*
- * list.c list.h
*
- * functions for new list type: "map"
- * extended enlist_unique
+ * 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.
*
- * miscutil.c .h
- * introduced bindup()
+ * Revision 1.17 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
*
- * parsers.c parsers.h
+ * 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()
*
- * deleted const struct interceptors
+ * Revision 1.15 2001/06/09 10:55:28 jongfoster
+ * Changing BUFSIZ ==> BUFFER_SIZE
*
- * pcrs.c
- * added FIXME
+ * Revision 1.14 2001/06/07 23:15:40 jongfoster
+ * Removing config->proxy_args_gateways
+ * Missing return statement added to end_proxy_args().
*
- * project.h
+ * Revision 1.13 2001/06/06 09:37:59 sarantis
+ * Fix misplaced comment start.
*
- * added struct map
- * added struct http_response
- * changes struct interceptors to struct cgi_dispatcher
- * moved HTML stuff to cgi.h
- *
- * 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]
@@ -237,7 +218,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 +252,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.
+ * Function : show_rcs
*
- * 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
- *
- * 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 +293,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) @@ -394,10 +325,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) @@ -419,27 +348,54 @@ char *end_proxy_args(struct configuration_spec * config) #undef SHOW_RCS - b = strsav(b, "\n"); + return(b); +} - b = strsav(b, "
#define FEATURE_PTHREAD
- Support POSIX threads.#undef FEATURE_PTHREAD
- No support POSIX threads.#define REGEX_GNU
- Support for GNU style regular expressions in the path specs.#define REGEX
- Support for regular expressions in the path specs.#define REGEX_PCRE
- Support for pcre style 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 STATIC_PCRE
- Using static built-in pcre rather than libpcre.#undef STATIC_PCRE
- Using libpcre rather than static built-in pcre.#define PCRS
- Enables arbitrary content modification regexps.#undef PCRS
- Disables arbitrary content modification regexps.#define STATIC_PCRS
- Using static built-in pcrs rather than libpcrs.#undef STATIC_PCRS
- Using libpcrs rather than static built-in pcrs.#define TOGGLE
- Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.#define DENY_GZIP
- Prevents requests from being compressed - required for PCRS.#define DENY_GZIP
- Prevents requests from being compressed - required for PCRS on some sites.#undef DENY_GZIP
- Allows requests to be compressed if the browser and server support it.#undef FAST_REDIRECTS
- Disables intercepting remote script redirects.