-const char showargs_rcs[] = "$Id: showargs.c,v 1.8 2001/05/29 09:50:24 jongfoster Exp $";
+const char showargs_rcs[] = "$Id: showargs.c,v 1.21 2001/07/30 22:08:36 jongfoster 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.21 2001/07/30 22:08:36 jongfoster
+ * Tidying up #defines:
+ * - All feature #defines are now of the form FEATURE_xxx
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ * Revision 1.20 2001/07/18 17:27:22 oes
+ * Adapted to new #defines
+ *
+ * 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
#include "errlog.h"
#include "miscutil.h"
#include "gateway.h"
+#include "cgi.h"
+#include "list.h"
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';
strcat(buf, "<br>\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)
-{
- 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"
-
- "<html>"
- "<head>"
- "<title>Internet Junkbuster Proxy Status</title>"
- "</head>\n"
- "<body bgcolor=\"#f8f8f0\" link=\"#000078\" alink=\"#ff0022\" vlink=\"#787878\">\n"
- "<center>\n"
- "<h1>" BANNER "\n"
- "<a href=\"" REDIRECT_URL "faq#show\">Proxy Status</a>\n"
- "</h1></center>\n"
- "<h2>You are using the " BANNER " <sup><small><small>TM</small></small></sup></h2>\n"
- "Version: " VERSION "\n"
- "<br>Home page: <a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a>\n"
- "<p>\n"
- );
-
- b = strsav(b,
- "<h2>The program was invoked as follows</h2>\n");
-
- for (i=0; i < argc; i++)
- {
- b = strsav(b, argv[i]);
- b = strsav(b, " ");
- }
- b = strsav(b, "<br>\n");
-
- config->proxy_args_header = b;
-
- config->proxy_args_invocation = strsav(
- config->proxy_args_invocation,
- "<br>\n"
- "and the following options were set in the configuration file"
- "<br><br>\n"
- );
-
- b = NULL;
+ config->proxy_args = strsav(config->proxy_args, buf);
- b = strsav(b,
- "<h2>It supports the following gateway protocols:</h2>\n");
-
- for (g = gateways; g->name; g++)
- {
- b = strsav(b, g->name);
- b = strsav(b, " ");
- }
- b = strsav(b, "<br>\n");
-
- 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 : N/A
+ * Returns : string
*
*********************************************************************/
-void 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(jbsockets_rcs)
SHOW_RCS(jcc_h_rcs)
SHOW_RCS(jcc_rcs)
-#ifdef KILLPOPUPS
+#ifdef FEATURE_KILL_POPUPS
SHOW_RCS(killpopup_h_rcs)
SHOW_RCS(killpopup_rcs)
-#endif /* def KILLPOPUPS */
+#endif /* def FEATURE_KILL_POPUPS */
+ SHOW_RCS(list_h_rcs)
+ SHOW_RCS(list_rcs)
SHOW_RCS(loadcfg_h_rcs)
SHOW_RCS(loadcfg_rcs)
SHOW_RCS(loaders_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)
SHOW_RCS(w32log_h_rcs)
SHOW_RCS(w32log_rcs)
SHOW_RCS(w32res_h_rcs)
- SHOW_RCS(w32rulesdlg_h_rcs)
- SHOW_RCS(w32rulesdlg_rcs)
SHOW_RCS(w32taskbar_h_rcs)
SHOW_RCS(w32taskbar_rcs)
#endif /* ndef _WIN_CONSOLE */
#undef SHOW_RCS
- b = strsav(b, "</pre>\n");
-
- b = strsav(b, "<h2>Conditional defines:</h2>\n<ul>");
-
-#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 */
- 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 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 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");
-#else /* ifndef TOGGLE */
- b = strsav(b, " <li><code>#undef <b>TOGGLE</b></code> - Do not allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.</li>\n");
-#endif /* ndef TOGGLE */
-
-#ifdef FORCE_LOAD
- b = strsav(b, " <li><code>#define <b>FORCE_LOAD</b></code> - Enables bypassing filtering for a single page using the prefix \"" FORCE_PREFIX "\".</li>\n");
-#else /* ifndef FORCE_LOAD */
- b = strsav(b, " <li><code>#undef <b>FORCE_LOAD</b></code> - Disables bypassing filtering for a single page.</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");
-#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 */
-
-#ifdef STATISTICS
- b = strsav(b, " <li><code>#define <b>STATISTICS</b></code> - Enables statistics function.</li>\n");
-#else /* ifndef STATISTICS */
- b = strsav(b, " <li><code>#undef <b>STATISTICS</b></code> - Disables statistics function.</li>\n");
-#endif /* ndef STATISTICS */
-
-#ifdef SPLIT_PROXY_ARGS
- b = strsav(b, " <li><code>#define <b>SPLIT_PROXY_ARGS</b></code> - Split this page up by placing the configuration files on separate pages.</li>\n");
-#else /* ifndef SPLIT_PROXY_ARGS */
- b = strsav(b, " <li><code>#undef <b>SPLIT_PROXY_ARGS</b></code> - This page contains the text of the configuration files, they are not split onto separate pages.</li>\n");
-#endif /* ndef SPLIT_PROXY_ARGS */
-
-#ifdef KILLPOPUPS
- b = strsav(b, " <li><code>#define <b>KILLPOPUPS</b></code> - Enables killing JavaScript popups.</li>\n");
-#else /* ifndef KILLPOPUPS */
- b = strsav(b, " <li><code>#undef <b>KILLPOPUPS</b></code> - Disables killing JavaScript popups.</li>\n");
-#endif /* ndef KILLPOPUPS */
-
-#ifdef WEBDAV
- b = strsav(b, " <li><code>#define <b>WEBDAV</b></code> - Enables support for webDAV - e.g. stops Microsoft Outlook from accessing HotMail e-mail.</li>\n");
-#else /* ifndef WEBDAV */
- b = strsav(b, " <li><code>#undef <b>WEBDAV</b></code> - Disables support for webDAV - e.g. so Microsoft Outlook can access HotMail e-mail.</li>\n");
-#endif /* ndef WEBDAV */
-
-#ifdef DETECT_MSIE_IMAGES
- b = strsav(b, " <li><code>#define <b>DETECT_MSIE_IMAGES</b></code> - Enables detecting image requests automatically for MSIE.</li>\n");
-#else /* ifndef DETECT_MSIE_IMAGES */
- b = strsav(b, " <li><code>#undef <b>DETECT_MSIE_IMAGES</b></code> - Disables detecting image requests automatically for MSIE.</li>\n");
-#endif /* ndef DETECT_MSIE_IMAGES */
-
-#ifdef IMAGE_BLOCKING
- b = strsav(b, " <li><code>#define <b>IMAGE_BLOCKING</b></code> - Enables sending \"blocked\" images instead of HTML.</li>\n");
-#else /* ifndef IMAGE_BLOCKING */
- b = strsav(b, " <li><code>#undef <b>IMAGE_BLOCKING</b></code> - Disables sending \"blocked\" images instead of HTML.</li>\n");
-#endif /* ndef IMAGE_BLOCKING */
-
-#ifdef ACL_FILES
- b = strsav(b, " <li><code>#define <b>ACL_FILES</b></code> - Enables the use of ACL files to control access to the proxy by IP address.</li>\n");
-#else /* ifndef ACL_FILES */
- b = strsav(b, " <li><code>#undef <b>ACL_FILES</b></code> - Disables the use of ACL files to control access to the proxy by IP address.</li>\n");
-#endif /* ndef ACL_FILES */
-
-#ifdef TRUST_FILES
- b = strsav(b, " <li><code>#define <b>TRUST_FILES</b></code> - Enables the use of trust files.</li>\n");
-#else /* ifndef TRUST_FILES */
- b = strsav(b, " <li><code>#undef <b>TRUST_FILES</b></code> - Disables the use of trust files.</li>\n");
-#endif /* ndef TRUST_FILES */
-
-#ifdef JAR_FILES
- b = strsav(b, " <li><code>#define <b>JAR_FILES</b></code> - Enables the use of jar files to capture cookies.</li>\n");
-#else /* ifndef JAR_FILES */
- b = strsav(b, " <li><code>#undef <b>JAR_FILES</b></code> - Disables the use of jar files to capture cookies.</li>\n");
-#endif /* ndef JAR_FILES */
-
-#ifdef FAST_REDIRECTS
- 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");
-
- b = strsav(b,
- "<small><small><p>\n"
- "The " BANNER " Proxy - \n"
- "<a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a><p>\n"
- "Copyright © 2001 <a href=\"" HOME_PAGE_URL "\">the SourceForge IJBSWA team</a><br>\n"
- "Copyright © 1997 <a href=\"http://www.junkbusters.com/\">\n" "Junkbusters Corporation</a><br>\n"
- "Copying and distribution permitted under the "
- "<a href=\"http://www.gnu.org/copyleft/gpl.html\">GNU General Public License.</a>\n"
- "</small></small>"
- "</body></html>\n"
- );
-
- config->proxy_args_trailer = b;
+ return(b);
+}
+
+/*********************************************************************
+ *
+ * Function : show_defines
+ *
+ * Description : Create a string with all conditional #defines used
+ * when building
+ *
+ * Parameters : None
+ *
+ * Returns : string
+ *
+ *********************************************************************/
+struct map * show_defines(struct map *exports)
+{
+#ifdef FEATURE_ACL
+ exports = map_conditional(exports, "FEATURE_ACL", 1);
+#else /* ifndef FEATURE_ACL */
+ exports = map_conditional(exports, "FEATURE_ACL", 0);
+#endif /* ndef FEATURE_ACL */
+
+#ifdef FEATURE_COOKIE_JAR
+ exports = map_conditional(exports, "FEATURE_COOKIE_JAR", 1);
+#else /* ifndef FEATURE_COOKIE_JAR */
+ exports = map_conditional(exports, "FEATURE_COOKIE_JAR", 0);
+#endif /* ndef FEATURE_COOKIE_JAR */
+
+#ifdef FEATURE_DENY_GZIP
+ exports = map_conditional(exports, "FEATURE_DENY_GZIP", 1);
+#else /* ifndef FEATURE_DENY_GZIP */
+ exports = map_conditional(exports, "FEATURE_DENY_GZIP", 0);
+#endif /* ndef FEATURE_DENY_GZIP */
+
+#ifdef FEATURE_FAST_REDIRECTS
+ exports = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1);
+#else /* ifndef FEATURE_FAST_REDIRECTS */
+ exports = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 0);
+#endif /* ndef FEATURE_FAST_REDIRECTS */
+
+#ifdef FEATURE_FORCE_LOAD
+ exports = map_conditional(exports, "FEATURE_FORCE_LOAD", 1);
+#else /* ifndef FEATURE_FORCE_LOAD */
+ exports = map_conditional(exports, "FEATURE_FORCE_LOAD", 0);
+#endif /* ndef FEATURE_FORCE_LOAD */
+
+#ifdef FEATURE_IMAGE_BLOCKING
+ exports = map_conditional(exports, "FEATURE_IMAGE_BLOCKING", 1);
+#else /* ifndef FEATURE_IMAGE_BLOCKING */
+ exports = map_conditional(exports, "FEATURE_IMAGE_BLOCKING, 0);
+#endif /* ndef FEATURE_IMAGE_BLOCKING */
+
+#ifdef FEATURE_IMAGE_DETECT_MSIE
+ exports = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 1);
+#else /* ifndef FEATURE_IMAGE_DETECT_MSIE */
+ exports = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 0);
+#endif /* ndef FEATURE_IMAGE_DETECT_MSIE */
+
+#ifdef FEATURE_KILL_POPUPS
+ exports = map_conditional(exports, "FEATURE_KILL_POPUPS", 1);
+#else /* ifndef FEATURE_KILL_POPUPS */
+ exports = map_conditional(exports, "FEATURE_KILL_POPUPS", 0);
+#endif /* ndef FEATURE_KILL_POPUPS */
+
+#ifdef FEATURE_PTHREAD
+ exports = map_conditional(exports, "FEATURE_PTHREAD", 1);
+#else /* ifndef FEATURE_PTHREAD */
+ exports = map_conditional(exports, "FEATURE_PTHREAD", 0);
+#endif /* ndef FEATURE_PTHREAD */
+
+#ifdef FEATURE_STATISTICS
+ exports = map_conditional(exports, "FEATURE_STATISTICS", 1);
+#else /* ifndef FEATURE_STATISTICS */
+ exports = map_conditional(exports, "FEATURE_STATISTICS", 0);
+#endif /* ndef FEATURE_STATISTICS */
+
+#ifdef FEATURE_TOGGLE
+ exports = map_conditional(exports, "FEATURE_TOGGLE", 1);
+#else /* ifndef FEATURE_TOGGLE */
+ exports = map_conditional(exports, "FEATURE_TOGGLE", 0);
+#endif /* ndef FEATURE_TOGGLE */
+
+#ifdef FEATURE_TRUST
+ exports = map_conditional(exports, "FEATURE_TRUST", 1);
+#else /* ifndef FEATURE_TRUST */
+ exports = map_conditional(exports, "FEATURE_TRUST", 0);
+#endif /* ndef FEATURE_TRUST */
+
+#ifdef REGEX_GNU
+ exports = map_conditional(exports, "REGEX_GNU", 1);
+#else /* ifndef REGEX_GNU */
+ exports = map_conditional(exports, "REGEX_GNU", 0);
+#endif /* def REGEX_GNU */
+
+#ifdef REGEX_PCRE
+ exports = map_conditional(exports, "REGEX_PCRE", 1);
+#else /* ifndef REGEX_PCRE */
+ exports = map_conditional(exports, "REGEX_PCRE", 0);
+#endif /* def REGEX_PCRE */
+
+#ifdef STATIC_PCRE
+ exports = map_conditional(exports, "STATIC_PCRE", 1);
+#else /* ifndef STATIC_PCRE */
+ exports = map_conditional(exports, "STATIC_PCRE", 0);
+#endif /* ndef STATIC_PCRE */
+
+#ifdef STATIC_PCRS
+ exports = map_conditional(exports, "STATIC_PCRS", 1);
+#else /* ifndef STATIC_PCRS */
+ exports = map_conditional(exports, "STATIC_PCRS", 0);
+#endif /* ndef STATIC_PCRS */
+
+ exports = map(exports, "FORCE_PREFIX", 1, FORCE_PREFIX, 1);
+
+ return exports;
}
projects / privoxy.git / blobdiff