X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=showargs.c;h=0dd2ef3404ad85d4f001aba11aa3524730e66223;hp=3889b8c62d5f2e573da6b747e7635299074a3d75;hb=5e64295a7ed3662f734abfb34d50a0f1a9dc5377;hpb=43da0ce639b1cf540198b2f63e790d9127725343 diff --git a/showargs.c b/showargs.c index 3889b8c6..0dd2ef34 100644 --- a/showargs.c +++ b/showargs.c @@ -1,4 +1,4 @@ -const char showargs_rcs[] = "$Id: showargs.c,v 1.6 2001/05/25 22:32:56 jongfoster Exp $"; +const char showargs_rcs[] = "$Id: showargs.c,v 1.11 2001/06/03 11:03:48 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/showargs.c,v $ @@ -33,6 +33,97 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.6 2001/05/25 22:32:56 jongfoste * * Revisions : * $Log: showargs.c,v $ + * 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 + * + * list.c list.h + * + * functions for new list type: "map" + * extended enlist_unique + * + * miscutil.c .h + * introduced bindup() + * + * parsers.c parsers.h + * + * deleted const struct interceptors + * + * pcrs.c + * added FIXME + * + * project.h + * + * added struct map + * added struct http_response + * changes struct interceptors to struct cgi_dispatcher + * moved HTML stuff to cgi.h + * + * re_filterfile: + * + * changed + * + * showargs.c + * NO TIME LEFT + * + * 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). + * Most of the global variables have been moved to a new + * struct configuration_spec, accessed through csp->config->globalname + * Most of the globals remaining are used by the Win32 GUI. + * * Revision 1.6 2001/05/25 22:32:56 jongfoster * CRLF->LF * @@ -125,66 +216,6 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.6 2001/05/25 22:32:56 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); - -} - /********************************************************************* * @@ -237,7 +268,7 @@ 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_invocation = strsav(config->proxy_args_invocation, buf); } @@ -258,68 +289,27 @@ void savearg(char *c, char *o, struct configuration_spec * config) void init_proxy_args(int argc, const char *argv[], struct configuration_spec * config) { const struct gateway *g; - char * b; + char * b = NULL; int i; - freez(config->proxy_args->header); - freez(config->proxy_args->invocation); - freez(config->proxy_args->gateways); - freez(config->proxy_args->trailer); + freez(config->proxy_args_header); + freez(config->proxy_args_gateways); + - - 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" - ); - + config->proxy_args_header = b; + 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->gateways = b; + config->proxy_args_gateways = b; } @@ -331,10 +321,10 @@ void init_proxy_args(int argc, const char *argv[], struct configuration_spec * c * * Parameters : None * - * Returns : N/A + * Returns : string with that bottom * *********************************************************************/ -void end_proxy_args(struct configuration_spec * config) +char *end_proxy_args(struct configuration_spec * config) { char *b = NULL; char buf[BUFSIZ]; @@ -364,6 +354,10 @@ 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 @@ -387,6 +381,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) @@ -490,11 +486,11 @@ void end_proxy_args(struct configuration_spec * config) b = strsav(b, "
  • #undef DETECT_MSIE_IMAGES - Disables detecting image requests automatically for MSIE.
    • \n"); #endif /* ndef DETECT_MSIE_IMAGES */ -#ifdef USE_IMAGE_LIST - b = strsav(b, "
  • #define USE_IMAGE_LIST - Enables using image list to detect images.
    • \n"); -#else /* ifndef USE_IMAGE_LIST */ - b = strsav(b, "
  • #undef USE_IMAGE_LIST - Disables using image list to detect images.
    • \n"); -#endif /* ndef USE_IMAGE_LIST */ +#ifdef IMAGE_BLOCKING + b = strsav(b, "
  • #define IMAGE_BLOCKING - Enables sending \"blocked\" images instead of HTML.
    • \n"); +#else /* ifndef IMAGE_BLOCKING */ + b = strsav(b, "
  • #undef IMAGE_BLOCKING - Disables sending \"blocked\" images instead of HTML.
    • \n"); +#endif /* ndef IMAGE_BLOCKING */ #ifdef ACL_FILES b = strsav(b, "
  • #define ACL_FILES - Enables the use of ACL files to control access to the proxy by IP address.
    • \n"); @@ -522,19 +518,7 @@ void end_proxy_args(struct configuration_spec * config) b = strsav(b, "\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; + config->proxy_args_trailer = b; }