Removing last hardcoded JunkBusters.com URLs.

[privoxy.git] / showargs.c

diff --git a/showargs.c b/showargs.c
index 98d9044..d803538 100644 (file)
--- a/showargs.c
+++ b/showargs.c
@@ -1,4 +1,4 @@
-const char showargs_rcs[] = "$Id: showargs.c,v 1.1.1.1 2001/05/15 13:59:03 oes Exp $";
+const char showargs_rcs[] = "$Id: showargs.c,v 1.3 2001/05/20 01:21:20 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/showargs.c,v $
@@ -33,6 +33,22 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.1.1.1 2001/05/15 13:59:03 oes E
  *
  * Revisions   :
  *    $Log: showargs.c,v $
+ *    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
  *
@@ -100,16 +116,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 */\r
       }
    }
    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 */\r
       }
    }
 
@@ -332,7 +348,8 @@ void end_proxy_args(void)
    SHOW_RCS(showargs_rcs)
    SHOW_RCS(ssplit_h_rcs)
    SHOW_RCS(ssplit_rcs)
-#ifdef _WIN32
+#ifdef _WIN32\r
+#ifndef _WIN_CONSOLE\r
    SHOW_RCS(w32log_h_rcs)
    SHOW_RCS(w32log_rcs)
    SHOW_RCS(w32res_h_rcs)
@@ -340,6 +357,7 @@ void end_proxy_args(void)
    SHOW_RCS(w32rulesdlg_rcs)
    SHOW_RCS(w32taskbar_h_rcs)
    SHOW_RCS(w32taskbar_rcs)
+#endif /* ndef _WIN_CONSOLE */\r
    SHOW_RCS(win32_h_rcs)
    SHOW_RCS(win32_rcs)
 #endif /* def _WIN32 */
@@ -444,17 +462,13 @@ void end_proxy_args(void)
 
    b = strsav(b,
       "<small><small><p>\n"
-      "Code and documentation of the " BANNER " Proxy"
-      "<sup><small>TM</small></sup>\n"
-      "<a href=\"http://www.junkbusters.com/ht/en/legal.html#copy\">\n" "Copyright</a>&#169; 1997 Junkbusters Corporation\n"
-      "<a href=\"http://www.junkbusters.com/ht/en/legal.html#marks\"><sup><small>TM</small></sup></a><br>\n"
-      "Copying and distribution permitted under the"
-      "<a href=\"http://www.gnu.org/copyleft/gpl.html\">\n"
-      "<small>GNU</small></a> "
-      "General Public License.\n"
-      "</small>"
-      "<address><kbd>webmaster@junkbusters.com</kbd></address>"
-      "</small>"
+      "The " BANNER " Proxy - \n"\r
+      "<a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a><p>\n"\r
+      "Copyright &#169; 2001 <a href=\"" HOME_PAGE_URL "\">the SourceForge IJBSWA team</a><br>\n"\r
+      "Copyright &#169; 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"
    );