- Cleaned CRLF's from the sources and related files

diff --git a/jbsockets.c b/jbsockets.c
index c5f73c9..ee4f583 100644 (file)
--- a/jbsockets.c
+++ b/jbsockets.c
@@ -1,7 +1,7 @@
-const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1 2001/05/13 21:57:06 administrator Exp $";
+const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1.1.1 2001/05/15 13:58:54 oes Exp $";

 /*********************************************************************
  *
 /*********************************************************************
  *

- * File        :  $Source: /home/administrator/cvs/ijb/jbsockets.c,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/jbsockets.c,v $

  *
  * Purpose     :  Contains wrappers for system-specific sockets code,
  *                so that the rest of JunkBuster can be more
  *
  * Purpose     :  Contains wrappers for system-specific sockets code,
  *                so that the rest of JunkBuster can be more


@@ -35,6 +35,9 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.1 2001/05/13 21:57:06 adminis
  *
  * Revisions   :
  *    $Log: jbsockets.c,v $
  *
  * Revisions   :
  *    $Log: jbsockets.c,v $

+ *    Revision 1.1.1.1  2001/05/15 13:58:54  oes
+ *    Initial import of version 2.9.3 source tree
+ *

  *
  *********************************************************************/
 \f
  *
  *********************************************************************/
 \f


@@ -154,7 +157,7 @@ int connect_to(char *host, int portnum, struct client_state *csp)
    }
 #endif /* def TCP_NODELAY */
 
    }
 #endif /* def TCP_NODELAY */
 

-#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)\r
+#if !defined(_WIN32) && !defined(__BEOS__) && !defined(AMIGA)

    if ((flags = fcntl(fd, F_GETFL, 0)) != -1)
    {
       flags |= O_NDELAY;
    if ((flags = fcntl(fd, F_GETFL, 0)) != -1)
    {
       flags |= O_NDELAY;


@@ -293,8 +296,8 @@ void close_socket(int fd)
 {
 #if defined(_WIN32) || defined(__BEOS__)
    closesocket(fd);
 {
 #if defined(_WIN32) || defined(__BEOS__)
    closesocket(fd);

-#elif defined(AMIGA)\r
-   CloseSocket(fd); \r
+#elif defined(AMIGA)
+   CloseSocket(fd); 

 #else
    close(fd);
 #endif
 #else
    close(fd);
 #endif

diff --git a/loadcfg.c b/loadcfg.c
index f29d665..d58e961 100644 (file)
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,7 +1,7 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.1 2001/05/13 21:57:06 administrator Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.1.1.1 2001/05/15 13:58:58 oes Exp $";

 /*********************************************************************
  *
 /*********************************************************************
  *

- * File        :  $Source: /home/administrator/cvs/ijb/loadcfg.c,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $

  *
  * Purpose     :  Loads settings from the configuration file into
  *                global variables.  This file contains both the 
  *
  * Purpose     :  Loads settings from the configuration file into
  *                global variables.  This file contains both the 


@@ -35,6 +35,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.1 2001/05/13 21:57:06 administrat
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $

+ *    Revision 1.1.1.1  2001/05/15 13:58:58  oes
+ *    Initial import of version 2.9.3 source tree
+ *

  *
  *********************************************************************/
 \f
  *
  *********************************************************************/
 \f


@@ -119,7 +122,7 @@ int multi_threaded      = 1;
 
 #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
 int tinygif             = 0;
 
 #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
 int tinygif             = 0;

-const char *tinygifurl  = NULL;\r
+const char *tinygifurl  = NULL;

 #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
 
 const char *logfile     = NULL;
 #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
 
 const char *logfile     = NULL;


@@ -309,7 +312,7 @@ void load_config( int signum )
    multi_threaded    = 1;
 
 #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
    multi_threaded    = 1;
 
 #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)

-   tinygif           = 0;\r
+   tinygif           = 0;

    freez((char *)tinygifurl);
 #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
 
    freez((char *)tinygifurl);
 #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
 


@@ -443,7 +446,7 @@ void load_config( int signum )
          switch( hash_string( cmd ) )
          {
 #ifdef TRUST_FILES
          switch( hash_string( cmd ) )
          {
 #ifdef TRUST_FILES

-            case hash_trustfile :\r
+            case hash_trustfile :

                freez((char *)trustfile);
                trustfile = strdup(arg);
                continue;
                freez((char *)trustfile);
                trustfile = strdup(arg);
                continue;


@@ -458,37 +461,37 @@ void load_config( int signum )
                continue;
 
 #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
                continue;
 
 #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)

-            case hash_tinygif :\r
+            case hash_tinygif :

                freez((char *)tinygifurl);
                tinygif = atoi(arg);
                freez((char *)tinygifurl);
                tinygif = atoi(arg);

-               if(3 == tinygif)\r
-               {\r
-                  p = arg;\r
-                  while((*p >= '0') && (*p <= '9'))\r
-                  {\r
-                     p++;\r
-                  }\r
-                  while((*p == ' ') || (*p == '\t'))\r
-                  {\r
-                     p++;\r
-                  }\r
-                  if (*p)\r
-                  {\r
-                     q = malloc(strlen(p) + 5);\r
-                     if (q)\r
-                     {\r
-                        strcpy(q, p);\r
-                        strcat(q, "\r\n\r\n");\r
-                        tinygifurl = q;\r
-                     }\r
-                  }\r
-               }\r
-               if ((tinygif != 1) && \r
-                   (tinygif != 2) && \r
-                   ((tinygif != 3) || (tinygifurl==NULL)) )\r
-               {\r
-                  log_error(LOG_LEVEL_ERROR, "tinygif setting invalid.");\r
-               }\r
+               if(3 == tinygif)
+               {
+                  p = arg;
+                  while((*p >= '0') && (*p <= '9'))
+                  {
+                     p++;
+                  }
+                  while((*p == ' ') || (*p == '\t'))
+                  {
+                     p++;
+                  }
+                  if (*p)
+                  {
+                     q = malloc(strlen(p) + 5);
+                     if (q)
+                     {
+                        strcpy(q, p);
+                        strcat(q, "\r\n\r\n");
+                        tinygifurl = q;
+                     }
+                  }
+               }
+               if ((tinygif != 1) && 
+                   (tinygif != 2) && 
+                   ((tinygif != 3) || (tinygifurl==NULL)) )
+               {
+                  log_error(LOG_LEVEL_ERROR, "tinygif setting invalid.");
+               }

                continue;
 #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
 
                continue;
 #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
 


@@ -512,54 +515,54 @@ void load_config( int signum )
                enlist(xtra_list, arg);
                continue;
 
                enlist(xtra_list, arg);
                continue;
 

-            case hash_cookiefile :\r
+            case hash_cookiefile :

                freez((char *)cookiefile);
                cookiefile = strdup(arg);
                continue;
 
                freez((char *)cookiefile);
                cookiefile = strdup(arg);
                continue;
 

-            case hash_logfile :\r
+            case hash_logfile :

                freez((char *)logfile);
                logfile = strdup(arg);
                continue;
 
                freez((char *)logfile);
                logfile = strdup(arg);
                continue;
 

-            case hash_blockfile :\r
+            case hash_blockfile :

                freez((char *)blockfile);
                blockfile = strdup(arg);
                continue;
 
 #ifdef USE_IMAGE_LIST
                freez((char *)blockfile);
                blockfile = strdup(arg);
                continue;
 
 #ifdef USE_IMAGE_LIST

-            case hash_imagefile :\r
+            case hash_imagefile :

                freez((char *)imagefile);
                imagefile = strdup(arg);
                continue;
 #endif /* def USE_IMAGE_LIST */
 
 #ifdef JAR_FILES
                freez((char *)imagefile);
                imagefile = strdup(arg);
                continue;
 #endif /* def USE_IMAGE_LIST */
 
 #ifdef JAR_FILES

-            case hash_jarfile :\r
+            case hash_jarfile :

                freez((char *)jarfile);
                jarfile = strdup(arg);
                continue;
 #endif /* def JAR_FILES */
 
                freez((char *)jarfile);
                jarfile = strdup(arg);
                continue;
 #endif /* def JAR_FILES */
 

-            case hash_listen_address :\r
+            case hash_listen_address :

                freez((char *)haddr);
                haddr = strdup(arg);
                continue;
 
                freez((char *)haddr);
                haddr = strdup(arg);
                continue;
 

-            case hash_forwardfile :\r
+            case hash_forwardfile :

                freez((char *)forwardfile);
                forwardfile = strdup(arg);
                continue;
 
 #ifdef ACL_FILES
                freez((char *)forwardfile);
                forwardfile = strdup(arg);
                continue;
 
 #ifdef ACL_FILES

-            case hash_aclfile :\r
+            case hash_aclfile :

                freez((char *)aclfile);
                aclfile = strdup(arg);
                continue;
 #endif /* def ACL_FILES */
 
 #ifdef KILLPOPUPS
                freez((char *)aclfile);
                aclfile = strdup(arg);
                continue;
 #endif /* def ACL_FILES */
 
 #ifdef KILLPOPUPS

-            case hash_popupfile :\r
+            case hash_popupfile :

                freez((char *)popupfile);
                popupfile = strdup(arg);
                continue;
                freez((char *)popupfile);
                popupfile = strdup(arg);
                continue;


@@ -570,7 +573,7 @@ void load_config( int signum )
 #endif /* def KILLPOPUPS */
 
 #ifdef PCRS
 #endif /* def KILLPOPUPS */
 
 #ifdef PCRS

-            case hash_re_filterfile :\r
+            case hash_re_filterfile :

                freez((char *)re_filterfile);
                re_filterfile = strdup(arg);
                continue;
                freez((char *)re_filterfile);
                re_filterfile = strdup(arg);
                continue;


@@ -582,7 +585,7 @@ void load_config( int signum )
                continue;
 #endif /* def PCRS */
 
                continue;
 #endif /* def PCRS */
 

-            case hash_user_agent :\r
+            case hash_user_agent :

                freez((char *)uagent);
                uagent = strdup(arg);
                continue;
                freez((char *)uagent);
                uagent = strdup(arg);
                continue;


@@ -592,12 +595,12 @@ void load_config( int signum )
                 * or the misspelling used in the HTTP spec.
                 */
             case hash_referrer :
                 * or the misspelling used in the HTTP spec.
                 */
             case hash_referrer :

-            case hash_referer :\r
+            case hash_referer :

                freez((char *)referrer);
                referrer = strdup(arg);
                continue;
 
                freez((char *)referrer);
                referrer = strdup(arg);
                continue;
 

-            case hash_from :\r
+            case hash_from :

                freez((char *)from);
                from = strdup(arg);
                continue;
                freez((char *)from);
                from = strdup(arg);
                continue;

diff --git a/loadcfg.h b/loadcfg.h
index e567b7e..941fa41 100644 (file)
--- a/loadcfg.h
+++ b/loadcfg.h
@@ -1,9 +1,9 @@
 #ifndef _LOADCFG_H
 #define _LOADCFG_H
 #ifndef _LOADCFG_H
 #define _LOADCFG_H

-#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.1 2001/05/13 21:57:06 administrator Exp $"
+#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.1.1.1 2001/05/15 13:58:58 oes Exp $"

 /*********************************************************************
  *
 /*********************************************************************
  *

- * File        :  $Source: /home/administrator/cvs/ijb/loadcfg.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.h,v $

  *
  * Purpose     :  Loads settings from the configuration file into
  *                global variables.  This file contains both the 
  *
  * Purpose     :  Loads settings from the configuration file into
  *                global variables.  This file contains both the 


@@ -37,6 +37,9 @@
  *
  * Revisions   :
  *    $Log: loadcfg.h,v $
  *
  * Revisions   :
  *    $Log: loadcfg.h,v $

+ *    Revision 1.1.1.1  2001/05/15 13:58:58  oes
+ *    Initial import of version 2.9.3 source tree
+ *

  *
  *********************************************************************/
 \f
  *
  *********************************************************************/
 \f


@@ -63,7 +66,7 @@ extern int multi_threaded;
 
 #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
 extern int tinygif;
 
 #if defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST)
 extern int tinygif;

-extern const char *tinygifurl;\r
+extern const char *tinygifurl;

 #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
 
 extern const char *logfile;
 #endif /* defined(DETECT_MSIE_IMAGES) || defined(USE_IMAGE_LIST) */
 
 extern const char *logfile;

diff --git a/loaders.c b/loaders.c
index 71ff3fa..f3ea5a1 100644 (file)
--- a/loaders.c
+++ b/loaders.c
@@ -1,7 +1,7 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.1 2001/05/13 21:57:06 administrator Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.1.1.1 2001/05/15 13:58:59 oes Exp $";

 /*********************************************************************
  *
 /*********************************************************************
  *

- * File        :  $Source: /home/administrator/cvs/ijb/loaders.c,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $

  *
  * Purpose     :  Functions to load and unload the various
  *                configuration files.  Also contains code to manage
  *
  * Purpose     :  Functions to load and unload the various
  *                configuration files.  Also contains code to manage


@@ -35,6 +35,9 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.1 2001/05/13 21:57:06 administrat
  *
  * Revisions   :
  *    $Log: loaders.c,v $
  *
  * Revisions   :
  *    $Log: loaders.c,v $

+ *    Revision 1.1.1.1  2001/05/15 13:58:59  oes
+ *    Initial import of version 2.9.3 source tree
+ *

  *
  *********************************************************************/
 \f
  *
  *********************************************************************/
 \f


@@ -603,11 +606,11 @@ static int check_file_changed(const struct file_list * current,
       char * p = html_encode(filename);
       if (p)
       {
       char * p = html_encode(filename);
       if (p)
       {

-         fs->proxy_args = strsav(fs->proxy_args, "<h2>The file `");\r
-         fs->proxy_args = strsav(fs->proxy_args, p);\r
-         fs->proxy_args = strsav(fs->proxy_args, \r
-            "' contains the following patterns</h2>\n");\r
-         freez(p);\r
+         fs->proxy_args = strsav(fs->proxy_args, "<h2>The file `");
+         fs->proxy_args = strsav(fs->proxy_args, p);
+         fs->proxy_args = strsav(fs->proxy_args, 
+            "' contains the following patterns</h2>\n");
+         freez(p);

       }
       fs->proxy_args = strsav(fs->proxy_args, "<pre>");
    }
       }
       fs->proxy_args = strsav(fs->proxy_args, "<pre>");
    }

diff --git a/project.h b/project.h
index 5f4324a..4941582 100644 (file)
--- a/project.h
+++ b/project.h
@@ -1,9 +1,9 @@
 #ifndef _PROJECT_H
 #define _PROJECT_H
 #ifndef _PROJECT_H
 #define _PROJECT_H

-#define PROJECT_H_VERSION "$Id: project.h,v 1.1 2001/05/13 21:57:07 administrator Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.1.1.1 2001/05/15 13:59:03 oes Exp $"

 /*********************************************************************
  *
 /*********************************************************************
  *

- * File        :  $Source: /home/administrator/cvs/ijb/project.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $

  *
  * Purpose     :  Defines data structures which are widely used in the
  *                project.  Does not define any variables or functions
  *
  * Purpose     :  Defines data structures which are widely used in the
  *                project.  Does not define any variables or functions


@@ -36,6 +36,9 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
  *
  * Revisions   :
  *    $Log: project.h,v $

+ *    Revision 1.1.1.1  2001/05/15 13:59:03  oes
+ *    Initial import of version 2.9.3 source tree
+ *

  *
  *********************************************************************/
 \f
  *
  *********************************************************************/
 \f


@@ -420,15 +423,15 @@ struct access_control_list
 #define BANNER    "<strong>Internet J<small>UNK<i><font color=\"red\">BUSTER</font></i></small></strong>"
 
 #ifdef FORCE_LOAD
 #define BANNER    "<strong>Internet J<small>UNK<i><font color=\"red\">BUSTER</font></i></small></strong>"
 
 #ifdef FORCE_LOAD

-/*\r
- * FIXME: Unfortunately, IE lowercases the domain name.  JunkBuster does\r
- * a case-sensitive compare.  JunkBuster should be modified to do a\r
- * case-insensitive compatison.  As a temporary workaround, I've lowercased\r
- * the FORCE_PREFIX.\r
- *\r
- * #define FORCE_PREFIX "IJB-FORCE-LOAD-"\r
- */\r
-#define FORCE_PREFIX "ijb-force-load-"\r
+/*
+ * FIXME: Unfortunately, IE lowercases the domain name.  JunkBuster does
+ * a case-sensitive compare.  JunkBuster should be modified to do a
+ * case-insensitive compatison.  As a temporary workaround, I've lowercased
+ * the FORCE_PREFIX.
+ *
+ * #define FORCE_PREFIX "IJB-FORCE-LOAD-"
+ */
+#define FORCE_PREFIX "ijb-force-load-"

 #endif /* def FORCE_LOAD */
 
 #define HOME_PAGE_URL  "http://ijbswa.sourceforge.net/"
 #endif /* def FORCE_LOAD */
 
 #define HOME_PAGE_URL  "http://ijbswa.sourceforge.net/"

diff --git a/showargs.c b/showargs.c
index 0a7cc2c..98d9044 100644 (file)
--- 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.1.1.1 2001/05/15 13:59:03 oes 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.
  *
  * Purpose     :  Contains various utility routines needed to 
  *                generate the show-proxy-args page.


@@ -33,6 +33,9 @@ const char showargs_rcs[] = "$Id: showargs.c,v 1.1 2001/05/13 21:57:07 administr
  *
  * Revisions   :
  *    $Log: showargs.c,v $
  *
  * Revisions   :
  *    $Log: showargs.c,v $

+ *    Revision 1.1.1.1  2001/05/15 13:59:03  oes
+ *    Initial import of version 2.9.3 source tree
+ *

  *
  *********************************************************************/
 \f
  *
  *********************************************************************/
 \f


@@ -212,7 +215,7 @@ void init_proxy_args(int argc, const char *argv[])
       "</h1></center>\n"
       "<h2>You are using the " BANNER " <sup><small><small>TM</small></small></sup></h2>\n"
       "Version: " VERSION "\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"\r
+      "<br>Home page: <a href=\"" HOME_PAGE_URL "\">" HOME_PAGE_URL "</a>\n"

       "<p>\n"
    );
 
       "<p>\n"
    );
 


@@ -352,30 +355,30 @@ void end_proxy_args(void)
 #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 */
 #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 */

-\r
-#ifdef PCRE\r
-   b = strsav(b, "  <li><code>#define <b>PCRE</b></code> - Use PCRE rather than old GNU regex library.</li>\n");\r
-#else /* ifndef PCRE */\r
-   b = strsav(b, "  <li><code>#undef <b>PCRE</b></code> - Use old GNU regex library rather than PCRE.</li>\n");\r
-#endif /* ndef PCRE */\r
+
+#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 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 */

-\r
-#ifdef TOGGLE\r
-   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");\r
-#else /* ifndef TOGGLE */\r
-   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");\r
-#endif /* ndef TOGGLE */\r
-\r
-#ifdef FORCE_LOAD\r
-   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");\r
-#else /* ifndef FORCE_LOAD */\r
-   b = strsav(b, "  <li><code>#undef <b>FORCE_LOAD</b></code> - Disables bypassing filtering for a single page.</li>\n");\r
-#endif /* ndef FORCE_LOAD */\r
+
+#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");
 
 #ifdef DENY_GZIP
    b = strsav(b, "  <li><code>#define <b>DENY_GZIP</b></code> - Prevents requests from being compressed - required for PCRS.</li>\n");


@@ -424,18 +427,18 @@ void end_proxy_args(void)
 #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 */
 #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 */

-\r
+

 #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 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\r
-   b = strsav(b, "  <li><code>#define <b>JAR_FILES</b></code> - Enables the use of jar files to capture cookies.</li>\n");\r
-#else /* ifndef JAR_FILES */\r
-   b = strsav(b, "  <li><code>#undef <b>JAR_FILES</b></code> - Disables the use of jar files to capture cookies.</li>\n");\r
-#endif /* ndef JAR_FILES */\r
+#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 */

 
    b = strsav(b, "</ul>\n<br>\n");
 
 
    b = strsav(b, "</ul>\n<br>\n");
 

diff --git a/ssplit.c b/ssplit.c
index 81246fd..6dcde3a 100644 (file)
--- a/ssplit.c
+++ b/ssplit.c
@@ -1,7 +1,7 @@
-const char ssplit_rcs[] = "$Id: ssplit.c,v 1.1 2001/05/13 21:57:07 administrator Exp $";
+const char ssplit_rcs[] = "$Id: ssplit.c,v 1.1.1.1 2001/05/15 13:59:04 oes Exp $";

 /*********************************************************************
  *
 /*********************************************************************
  *

- * File        :  $Source: /home/administrator/cvs/ijb/ssplit.c,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/ssplit.c,v $

  *
  * Purpose     :  A function to split a string at specified deliminters.
  *
  *
  * Purpose     :  A function to split a string at specified deliminters.
  *


@@ -32,6 +32,9 @@ const char ssplit_rcs[] = "$Id: ssplit.c,v 1.1 2001/05/13 21:57:07 administrator
  *
  * Revisions   :
  *    $Log: ssplit.c,v $
  *
  * Revisions   :
  *    $Log: ssplit.c,v $

+ *    Revision 1.1.1.1  2001/05/15 13:59:04  oes
+ *    Initial import of version 2.9.3 source tree
+ *

  *
  *********************************************************************/
 \f
  *
  *********************************************************************/
 \f


@@ -39,7 +42,7 @@ const char ssplit_rcs[] = "$Id: ssplit.c,v 1.1 2001/05/13 21:57:07 administrator
 #include "config.h"
 
 #include <string.h>
 #include "config.h"
 
 #include <string.h>

-#include <stdlib.h>\r
+#include <stdlib.h>

 
 #ifdef _WIN32
 #include <malloc.h>
 
 #ifdef _WIN32
 #include <malloc.h>