-const char showargs_rcs[] = "$Id: showargs.c,v 1.11 2001/06/03 11:03:48 oes 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
*
* 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
+ * Revision 1.19 2001/07/13 14:11:36 oes
+ * - Included SHOW_RCS for deanimate.*
+ * - Removed all #ifdef PCRS
*
- * miscutil.c .h
- * introduced bindup()
*
- * parsers.c parsers.h
+ * 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.
*
- * deleted const struct interceptors
+ * Revision 1.17 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
*
- * pcrs.c
- * added FIXME
+ * 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()
*
- * project.h
+ * Revision 1.15 2001/06/09 10:55:28 jongfoster
+ * Changing BUFSIZ ==> BUFFER_SIZE
*
- * added struct map
- * added struct http_response
- * changes struct interceptors to struct cgi_dispatcher
- * moved HTML stuff to cgi.h
+ * Revision 1.14 2001/06/07 23:15:40 jongfoster
+ * Removing config->proxy_args_gateways
+ * Missing return statement added to end_proxy_args().
*
- * re_filterfile:
+ * Revision 1.13 2001/06/06 09:37:59 sarantis
+ * Fix misplaced comment start.
*
- * 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]
*********************************************************************/
void savearg(char *c, char *o, struct configuration_spec * config)
{
- char buf[BUFSIZ];
+ char buf[BUFFER_SIZE];
*buf = '\0';
strcat(buf, "<br>\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)
- *
- * 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
+ * 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, "<h2>File contents</h2>\n");
- b = strsav(b, suppress_message);
- b = strsav(b, "\n");
- }
-#endif /* ndef SPLIT_PROXY_ARGS */
-
- b = strsav(b, "<h2>Source versions:</h2>\n");
- b = strsav(b, "<pre>");
-
#define SHOW_RCS(__x) \
{ \
extern const char __x[]; \
/* 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)
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)
#undef SHOW_RCS
- b = strsav(b, "</pre>\n");
+ return(b);
+}
- b = strsav(b, "<h2>Conditional defines:</h2>\n<ul>");
+/*********************************************************************
+ *
+ * Function : show_defines
+ *
+ * Description : Create a string with all conditional #defines used
+ * when building
+ *
+ * Parameters : None
+ *
+ * Returns : string
+ *
+ *********************************************************************/
+char *show_defines(void)
+{
+ char *b = NULL;
-#ifdef REGEX
- b = strsav(b, " <li><code>#define <b>REGEX</b></code> - Support for regular expressions in the path specs.</li>\n");
-#else /* ifndef REGEX */
+#ifdef FEATURE_PTHREAD
+ b = strsav(b, " <li><code>#define <b>FEATURE_PTHREAD</b></code> - Support POSIX threads.</li>\n");
+#else
+ b = strsav(b, " <li><code>#undef <b>FEATURE_PTHREAD</b></code> - No support POSIX threads.</li>\n");
+#endif
+
+#ifdef REGEX_GNU
+ b = strsav(b, " <li><code>#define <b>REGEX_GNU</b></code> - Support for GNU style regular expressions in the path specs.</li>\n");
+#endif /* def REGEX_GNU */
+
+#ifdef REGEX_PCRE
+ b = strsav(b, " <li><code>#define <b>REGEX_PCRE</b></code> - Support for pcre style regular expressions in the path specs.</li>\n");
+#endif /* def REGEX_PCRE */
+
+#ifndef REGEX
b = strsav(b, " <li><code>#undef <b>REGEX</b></code> - No support for regular expressions in the path specs.</li>\n");
#endif /* ndef REGEX */
-#ifdef PCRE
- b = strsav(b, " <li><code>#define <b>PCRE</b></code> - Use PCRE rather than old GNU regex library.</li>\n");
-#else /* ifndef PCRE */
- b = strsav(b, " <li><code>#undef <b>PCRE</b></code> - Use old GNU regex library rather than PCRE.</li>\n");
-#endif /* ndef PCRE */
+#ifdef STATIC_PCRE
+ b = strsav(b, " <li><code>#define <b>STATIC_PCRE</b></code> - Using static built-in pcre rather than libpcre.</li>\n");
+#else /* ifndef STATIC_PCRE */
+ b = strsav(b, " <li><code>#undef <b>STATIC_PCRE</b></code> - Using libpcre rather than static built-in pcre.</li>\n");
+#endif /* ndef STATIC_PCRE */
-#ifdef PCRS
- b = strsav(b, " <li><code>#define <b>PCRS</b></code> - Enables arbitrary content modification regexps.</li>\n");
-#else /* ifndef PCRS */
- b = strsav(b, " <li><code>#undef <b>PCRS</b></code> - Disables arbitrary content modification regexps.</li>\n");
-#endif /* ndef PCRS */
+#ifdef STATIC_PCRS
+ b = strsav(b, " <li><code>#define <b>STATIC_PCRS</b></code> - Using static built-in pcrs rather than libpcrs.</li>\n");
+#else /* ifndef STATIC_PCRS */
+ b = strsav(b, " <li><code>#undef <b>STATIC_PCRS</b></code> - Using libpcrs rather than static built-in pcrs.</li>\n");
+#endif /* ndef STATIC_PCRS */
#ifdef TOGGLE
b = strsav(b, " <li><code>#define <b>TOGGLE</b></code> - Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.</li>\n");
#endif /* ndef FORCE_LOAD */
#ifdef DENY_GZIP
- b = strsav(b, " <li><code>#define <b>DENY_GZIP</b></code> - Prevents requests from being compressed - required for PCRS.</li>\n");
+ b = strsav(b, " <li><code>#define <b>DENY_GZIP</b></code> - Prevents requests from being compressed - required for PCRS on some sites.</li>\n");
#else /* ifndef DENY_GZIP */
b = strsav(b, " <li><code>#undef <b>DENY_GZIP</b></code> - Allows requests to be compressed if the browser and server support it.</li>\n");
#endif /* ndef DENY_GZIP */
b = strsav(b, " <li><code>#define <b>FAST_REDIRECTS</b></code> - Enables intercepting remote script redirects.</li>\n");
#else /* ifndef FAST_REDIRECTS */
b = strsav(b, " <li><code>#undef <b>FAST_REDIRECTS</b></code> - Disables intercepting remote script redirects.</li>\n");
-#endif ndef /* FAST_REDIRECTS */
-
- b = strsav(b, "</ul>\n<br>\n");
-
- config->proxy_args_trailer = b;
+#endif /* ndef FAST_REDIRECTS */
+ return b;
}
projects / privoxy.git / blobdiff