X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=showargs.c;h=ea83855bebb872c8eac7d4d598fd749ce5b078f7;hb=4bb8225677e05ca9fe842f6343479fd4f875a022;hp=1b0afe6333ecda5c2dd7a9d772ab57cb802aa95d;hpb=12f52e6af55d51d4b268af7956d97c772eebbb5c;p=privoxy.git
diff --git a/showargs.c b/showargs.c
index 1b0afe63..ea83855b 100644
--- a/showargs.c
+++ b/showargs.c
@@ -1,10 +1,11 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.7 2001/05/26 00:28:36 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 $
*
* 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,73 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.7 2001/05/26 00:28:36 jongfoste
*
* 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
+ *
+ * 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
+ *
+ * Revision 1.8 2001/05/29 09:50:24 jongfoster
+ * Unified blocklist/imagelist/permissionslist.
+ * File format is still under discussion, but the internal changes
+ * are (mostly) done.
+ *
+ * Also modified interceptor behaviour:
+ * - We now intercept all URLs beginning with one of the following
+ * prefixes (and *only* these prefixes):
+ * * http://i.j.b/
+ * * http://ijbswa.sf.net/config/
+ * * http://ijbswa.sourceforge.net/config/
+ * - New interceptors "home page" - go to http://i.j.b/ to see it.
+ * - Internal changes so that intercepted and fast redirect pages
+ * are not replaced with an image.
+ * - Interceptors now have the option to send a binary page direct
+ * to the client. (i.e. ijb-send-banner uses this)
+ * - Implemented show-url-info interceptor. (Which is why I needed
+ * the above interceptors changes - a typical URL is
+ * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif".
+ * The previous mechanism would not have intercepted that, and
+ * if it had been intercepted then it then it would have replaced
+ * it with an image.)
+ *
* Revision 1.7 2001/05/26 00:28:36 jongfoster
* Automatic reloading of config file.
* Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32).
@@ -132,66 +200,6 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.7 2001/05/26 00:28:36 jongfoste
const char showargs_h_rcs[] = SHOWARGS_H_VERSION;
-/*********************************************************************
- *
- * Function : strsav
- *
- * Description : Reallocate "old" and append text to it. This makes
- * it easier to append to malloc'd strings.
- *
- * Parameters :
- * 1 : old = Old text that is to be extended. Will be
- * free()d by this routine.
- * 2 : text_to_append = Text to be appended to old.
- *
- * Returns : Pointer to newly malloc'ed appended string.
- * If there is no text to append, return old. Caller
- * must free().
- *
- *********************************************************************/
-char *strsav(char *old, const char *text_to_append)
-{
- int old_len, new_len;
- char *p;
-
- if (( text_to_append == NULL) || (*text_to_append == '\0'))
- {
- return(old);
- }
-
- if (NULL != old)
- {
- old_len = strlen(old);
- }
- else
- {
- old_len = 0;
- }
-
- new_len = old_len + strlen(text_to_append) + 1;
-
- if (old)
- {
- if ((p = realloc(old, new_len)) == NULL)
- {
- log_error(LOG_LEVEL_FATAL, "realloc(%d) bytes for proxy_args failed!", new_len);
- /* Never get here - LOG_LEVEL_FATAL causes program exit */
- }
- }
- else
- {
- if ((p = (char *)malloc(new_len)) == NULL)
- {
- log_error(LOG_LEVEL_FATAL, "malloc(%d) bytes for proxy_args failed!", new_len);
- /* Never get here - LOG_LEVEL_FATAL causes program exit */
- }
- }
-
- strcpy(p + old_len, text_to_append);
- return(p);
-
-}
-
/*********************************************************************
*
@@ -210,7 +218,7 @@ char *strsav(char *old, const char *text_to_append)
*********************************************************************/
void savearg(char *c, char *o, struct configuration_spec * config)
{
- char buf[BUFSIZ];
+ char buf[BUFFER_SIZE];
*buf = '\0';
@@ -244,125 +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.
- *
- * Parameters :
- * 1 : argc = argument count (same as in main)
- * 2 : argv[] = program arguments (same as in main)
+ * Function : show_rcs
*
- * 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"
-
- ""
- "
\n" - ); - - b = strsav(b, - "
"); - #define SHOW_RCS(__x) \ { \ extern const char __x[]; \ @@ -371,9 +286,15 @@ 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) @@ -394,6 +315,8 @@ void end_proxy_args(struct configuration_spec * config) SHOW_RCS(killpopup_h_rcs) SHOW_RCS(killpopup_rcs) #endif /* def KILLPOPUPS */ + SHOW_RCS(list_h_rcs) + SHOW_RCS(list_rcs) SHOW_RCS(loadcfg_h_rcs) SHOW_RCS(loadcfg_rcs) SHOW_RCS(loaders_h_rcs) @@ -402,10 +325,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) @@ -427,27 +348,54 @@ void 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.#define FAST_REDIRECTS
- Enables intercepting remote script redirects.#undef FAST_REDIRECTS
- Disables intercepting remote script redirects.\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;
+#endif /* ndef FAST_REDIRECTS */
+ return b;
}