X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=showargs.c;h=f958ca1896dbdacfb2bf733a4de14930eeaab0fb;hb=4d8b69fc32edd48072ac1dedc02a24b98fe1e6e5;hp=6bd486092b72ce62ec03b36d5c4f5e4f5d00a244;hpb=67eb2fc00b66255750de74c6cbc883cef5d0da3a;p=privoxy.git diff --git a/showargs.c b/showargs.c index 6bd48609..f958ca18 100644 --- a/showargs.c +++ b/showargs.c @@ -1,10 +1,11 @@ -const char showargs_rcs[] = "$Id: showargs.c,v 1.13 2001/06/06 09:37:59 sarantis Exp $"; +const char showargs_rcs[] = "$Id: showargs.c,v 1.17 2001/06/29 21:45:41 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,25 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.13 2001/06/06 09:37:59 sarantis * * Revisions : * $Log: showargs.c,v $ + * 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. * @@ -40,58 +60,7 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.13 2001/06/06 09:37:59 sarantis * 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 - * - * 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 + * moved stuff to cgi.c * * Revision 1.10 2001/05/31 21:36:07 jongfoster * Added RCS for actions.[ch] and list.[ch] @@ -240,7 +209,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'; @@ -274,74 +243,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) -{ - char * b = NULL; - int i; + config->proxy_args = strsav(config->proxy_args, buf); - freez(config->proxy_args_header); - - - for (i=0; i < argc; i++) - { - b = strsav(b, argv[i]); - b = strsav(b, " "); - } - config->proxy_args_header = 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, "

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[];   \
@@ -412,9 +339,24 @@ char *end_proxy_args(struct configuration_spec * config)
 
 #undef SHOW_RCS
 
-   b = strsav(b, "
\n"); + return(b); +} - b = strsav(b, "

Conditional defines:

\n\n
\n"); - - config->proxy_args_trailer = b; - return b; }