From 8fafe5eacd4f39b62b623a3f645d06fe9444057c Mon Sep 17 00:00:00 2001 From: oes Date: Sun, 3 Jun 2001 19:13:05 +0000 Subject: [PATCH] moved stuff to cgi.c --- showargs.c | 122 +++++++++++++++++++++++++++-------------------------- showargs.h | 62 ++++++++++++++++++++++++++- 2 files changed, 123 insertions(+), 61 deletions(-) diff --git a/showargs.c b/showargs.c index 141b58ff..80247e24 100644 --- a/showargs.c +++ b/showargs.c @@ -1,4 +1,4 @@ -const char showargs_rcs[] = "$Id: showargs.c,v 1.9 2001/05/29 23:11:38 oes 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,63 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.9 2001/05/29 23:11:38 oes Exp $ * * 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 @@ -232,67 +289,26 @@ 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); + - - 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" - ); - + 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; } @@ -305,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]; @@ -500,18 +516,6 @@ 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; } diff --git a/showargs.h b/showargs.h index e42a954e..1892db99 100644 --- a/showargs.h +++ b/showargs.h @@ -1,6 +1,6 @@ #ifndef _SHOWARGS_H #define _SHOWARGS_H -#define SHOWARGS_H_VERSION "$Id: showargs.h,v 1.2 2001/05/26 00:28:36 jongfoster Exp $" +#define SHOWARGS_H_VERSION "$Id: showargs.h,v 1.4 2001/06/03 11:03:48 oes Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/showargs.h,v $ @@ -35,6 +35,64 @@ * * Revisions : * $Log: showargs.h,v $ + * Revision 1.4 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.3 2001/05/29 23:11:38 oes + * + * - Moved strsav() from showargs to miscutil + * * Revision 1.2 2001/05/26 00:28:36 jongfoster * Automatic reloading of config file. * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32). @@ -57,7 +115,7 @@ extern "C" { extern void savearg(char *c, char *o, struct configuration_spec * config); extern void init_proxy_args(int argc, const char *argv[], struct configuration_spec * config); -extern void end_proxy_args(struct configuration_spec * config); +extern char *end_proxy_args(struct configuration_spec * config); /* Revision control strings from this header and associated .c file */ extern const char showargs_rcs[]; -- 2.39.2