X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=showargs.c;h=77172e7a0af224baba2ff78811e9fb094a335d8b;hp=0a7cc2c8a22f89c7aeeaab8c80aec39ff5668312;hb=bcb66fd2d9147c58039e5d562c66c7332c1cd7e7;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7
diff --git a/showargs.c b/showargs.c
index 0a7cc2c8..77172e7a 100644
--- a/showargs.c
+++ b/showargs.c
@@ -1,7 +1,7 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.1 2001/05/13 21:57:07 administrator Exp $";
+const char showargs_rcs[] = "$Id: showargs.c,v 1.4 2001/05/20 16:44:47 jongfoster Exp $";
/*********************************************************************
*
- * File : $Source: /home/administrator/cvs/ijb/showargs.c,v $
+ * File : $Source: /cvsroot/ijbswa/current/showargs.c,v $
*
* Purpose : Contains various utility routines needed to
* generate the show-proxy-args page.
@@ -33,6 +33,28 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.1 2001/05/13 21:57:07 administr
*
* Revisions :
* $Log: showargs.c,v $
+ * Revision 1.4 2001/05/20 16:44:47 jongfoster
+ * Removing last hardcoded JunkBusters.com URLs.
+ *
+ * Revision 1.3 2001/05/20 01:21:20 jongfoster
+ * Version 2.9.4 checkin.
+ * - Merged popupfile and cookiefile, and added control over PCRS
+ * filtering, in new "permissionsfile".
+ * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration
+ * file error you now get a message box (in the Win32 GUI) rather
+ * than the program exiting with no explanation.
+ * - Made killpopup use the PCRS MIME-type checking and HTTP-header
+ * skipping.
+ * - Removed tabs from "config"
+ * - Moved duplicated url parsing code in "loaders.c" to a new funcition.
+ * - Bumped up version number.
+ *
+ * Revision 1.2 2001/05/17 23:01:01 oes
+ * - Cleaned CRLF's from the sources and related files
+ *
+ * Revision 1.1.1.1 2001/05/15 13:59:03 oes
+ * Initial import of version 2.9.3 source tree
+ *
*
*********************************************************************/
@@ -97,16 +119,16 @@ char *strsav(char *old, const char *text_to_append)
{
if ((p = realloc(old, new_len)) == NULL)
{
- log_error(LOG_LEVEL_ERROR, "realloc(%d) bytes for proxy_args failed!", new_len);
- exit(1);
+ 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_ERROR, "malloc(%d) bytes for proxy_args failed!", new_len);
- exit(1);
+ log_error(LOG_LEVEL_FATAL, "malloc(%d) bytes for proxy_args failed!", new_len);
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
}
}
@@ -212,7 +234,7 @@ void init_proxy_args(int argc, const char *argv[])
"\n"
"You are using the " BANNER " TM
\n"
"Version: " VERSION "\n"
- "
Home page: " HOME_PAGE_URL "\n"
+ "
Home page: " HOME_PAGE_URL "\n"
"\n"
);
@@ -329,7 +351,8 @@ void end_proxy_args(void)
SHOW_RCS(showargs_rcs)
SHOW_RCS(ssplit_h_rcs)
SHOW_RCS(ssplit_rcs)
-#ifdef _WIN32
+#ifdef _WIN32
+#ifndef _WIN_CONSOLE
SHOW_RCS(w32log_h_rcs)
SHOW_RCS(w32log_rcs)
SHOW_RCS(w32res_h_rcs)
@@ -337,6 +360,7 @@ void end_proxy_args(void)
SHOW_RCS(w32rulesdlg_rcs)
SHOW_RCS(w32taskbar_h_rcs)
SHOW_RCS(w32taskbar_rcs)
+#endif /* ndef _WIN_CONSOLE */
SHOW_RCS(win32_h_rcs)
SHOW_RCS(win32_rcs)
#endif /* def _WIN32 */
@@ -352,30 +376,30 @@ void end_proxy_args(void)
#else /* ifndef REGEX */
b = strsav(b, "
#undef REGEX - No support for regular expressions in the path specs.\n");
#endif /* ndef REGEX */
-
-#ifdef PCRE
- b = strsav(b, " #define PCRE - Use PCRE rather than old GNU regex library.\n");
-#else /* ifndef PCRE */
- b = strsav(b, " #undef PCRE - Use old GNU regex library rather than PCRE.\n");
-#endif /* ndef PCRE */
+
+#ifdef PCRE
+ b = strsav(b, " #define PCRE - Use PCRE rather than old GNU regex library.\n");
+#else /* ifndef PCRE */
+ b = strsav(b, " #undef PCRE - Use old GNU regex library rather than PCRE.\n");
+#endif /* ndef PCRE */
#ifdef PCRS
b = strsav(b, " #define PCRS - Enables arbitrary content modification regexps.\n");
#else /* ifndef PCRS */
b = strsav(b, " #undef PCRS - Disables arbitrary content modification regexps.\n");
#endif /* ndef PCRS */
-
-#ifdef TOGGLE
- b = strsav(b, " #define TOGGLE - Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.\n");
-#else /* ifndef TOGGLE */
- b = strsav(b, " #undef TOGGLE - Do not allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.\n");
-#endif /* ndef TOGGLE */
-
-#ifdef FORCE_LOAD
- b = strsav(b, " #define FORCE_LOAD - Enables bypassing filtering for a single page using the prefix \"" FORCE_PREFIX "\".\n");
-#else /* ifndef FORCE_LOAD */
- b = strsav(b, " #undef FORCE_LOAD - Disables bypassing filtering for a single page.\n");
-#endif /* ndef FORCE_LOAD */
+
+#ifdef TOGGLE
+ b = strsav(b, " #define TOGGLE - Allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.\n");
+#else /* ifndef TOGGLE */
+ b = strsav(b, " #undef TOGGLE - Do not allow JunkBuster to be \"disabled\" so it is just a normal non-blocking non-anonymizing proxy.\n");
+#endif /* ndef TOGGLE */
+
+#ifdef FORCE_LOAD
+ b = strsav(b, " #define FORCE_LOAD - Enables bypassing filtering for a single page using the prefix \"" FORCE_PREFIX "\".\n");
+#else /* ifndef FORCE_LOAD */
+ b = strsav(b, " #undef FORCE_LOAD - Disables bypassing filtering for a single page.\n");
+#endif /* ndef FORCE_LOAD */
#ifdef DENY_GZIP
b = strsav(b, " #define DENY_GZIP - Prevents requests from being compressed - required for PCRS.\n");
@@ -424,34 +448,36 @@ void end_proxy_args(void)
#else /* ifndef ACL_FILES */
b = strsav(b, " #undef ACL_FILES - Disables the use of ACL files to control access to the proxy by IP address.\n");
#endif /* ndef ACL_FILES */
-
+
#ifdef TRUST_FILES
b = strsav(b, " #define TRUST_FILES - Enables the use of trust files.\n");
#else /* ifndef TRUST_FILES */
b = strsav(b, " #undef TRUST_FILES - Disables the use of trust files.\n");
#endif /* ndef TRUST_FILES */
-#ifdef JAR_FILES
- b = strsav(b, " #define JAR_FILES - Enables the use of jar files to capture cookies.\n");
-#else /* ifndef JAR_FILES */
- b = strsav(b, " #undef JAR_FILES - Disables the use of jar files to capture cookies.\n");
-#endif /* ndef JAR_FILES */
+#ifdef JAR_FILES
+ b = strsav(b, " #define JAR_FILES - Enables the use of jar files to capture cookies.\n");
+#else /* ifndef JAR_FILES */
+ b = strsav(b, " #undef JAR_FILES - Disables the use of jar files to capture cookies.\n");
+#endif /* ndef JAR_FILES */
+
+#ifdef FAST_REDIRECTS
+ b = strsav(b, " #define FAST_REDIRECTS - Enables intercepting remote script redirects.\n");
+#else /* ifndef FAST_REDIRECTS */
+ b = strsav(b, " #undef FAST_REDIRECTS - Disables intercepting remote script redirects.\n");
+#endif ndef /* FAST_REDIRECTS */
b = strsav(b, "\n
\n");
b = strsav(b,
"\n"
- "Code and documentation of the " BANNER " Proxy"
- "TM\n"
- "\n" "Copyright© 1997 Junkbusters Corporation\n"
- "TM
\n"
- "Copying and distribution permitted under the"
- "\n"
- "GNU "
- "General Public License.\n"
- ""
- "
webmaster@junkbusters.com"
- ""
+ "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"
+ ""
"