Clean up a little CRLF unpleasantness that suddenly appeared

diff --git a/cgisimple.c b/cgisimple.c
index 53634c8..527db0e 100644 (file)
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.12 2002/01/23 01:03:32 jongfoster Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.13 2002/02/21 00:10:37 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.12 2002/01/23 01:03:32 jongfo
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
+ *    Revision 1.13  2002/02/21 00:10:37  jongfoster
+ *    Adding send-banner?type=auto option
+ *
  *    Revision 1.12  2002/01/23 01:03:32  jongfoster
  *    Fixing gcc [CygWin] compiler warnings
  *
@@ -312,8 +315,8 @@ jb_err cgi_show_request(struct client_state *csp,
  *
  * CGI Parameters :
  *           type : Selects the type of banner between "trans", "logo",
- *                  and "auto". Defaults to "logo" if absent or invalid.\r
- *                  "auto" means to select as if we were image-blocking.\r
+ *                  and "auto". Defaults to "logo" if absent or invalid.
+ *                  "auto" means to select as if we were image-blocking.
  *                  (Only the first character really counts).
  *
  * Returns     :  JB_ERR_OK on success
@@ -323,28 +326,28 @@ jb_err cgi_show_request(struct client_state *csp,
 jb_err cgi_send_banner(struct client_state *csp,
                        struct http_response *rsp,
                        const struct map *parameters)
-{\r
+{
    char imagetype = lookup(parameters, "type")[0];
-\r
-   if (imagetype == 'a') /* auto */\r
-   {\r
-      /* Default to logo */\r
-      imagetype = 'l';\r
-#ifdef FEATURE_IMAGE_BLOCKING\r
-      if ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)\r
-      {\r
-         /* determine HOW images should be blocked */\r
-         const char * p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER];\r
-\r
-         /* and handle accordingly: */\r
-         if ((p != NULL) && (0 == strcmpic(p, "blank")))\r
-         {\r
-            imagetype = 't';\r
-         }\r
-      }\r
-#endif /* def FEATURE_IMAGE_BLOCKING */\r
-   }\r
-      \r
+
+   if (imagetype == 'a') /* auto */
+   {
+      /* Default to logo */
+      imagetype = 'l';
+#ifdef FEATURE_IMAGE_BLOCKING
+      if ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)
+      {
+         /* determine HOW images should be blocked */
+         const char * p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER];
+
+         /* and handle accordingly: */
+         if ((p != NULL) && (0 == strcmpic(p, "blank")))
+         {
+            imagetype = 't';
+         }
+      }
+#endif /* def FEATURE_IMAGE_BLOCKING */
+   }
+      
    if ((imagetype != 't') && (imagetype != 'b')) /* transparant/blank */
    {
       rsp->body = bindup(image_junkbuster_gif_data, image_junkbuster_gif_length);

diff --git a/jcc.c b/jcc.c
index e9df2f3..46c6db4 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.61 2002/01/17 21:01:52 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.62 2002/02/20 23:17:23 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.61 2002/01/17 21:01:52 jongfoster Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.62  2002/02/20 23:17:23  jongfoster
+ *    Detecting some out-of memory conditions and exiting with a log message.
+ *
  *    Revision 1.61  2002/01/17 21:01:52  jongfoster
  *    Moving all our URL and URL pattern parsing code to urlmatch.c.
  *
@@ -955,12 +958,12 @@ static void chat(struct client_state *csp)
    log_error(LOG_LEVEL_CONNECT, "OK");
 
    hdr = sed(client_patterns, add_client_headers, csp);
-   if (hdr == NULL)\r
-   {\r
-      /* FIXME Should handle error properly */\r
-      log_error(LOG_LEVEL_FATAL, "Out of memory parsing client header");\r
-   }\r
-\r
+   if (hdr == NULL)
+   {
+      /* FIXME Should handle error properly */
+      log_error(LOG_LEVEL_FATAL, "Out of memory parsing client header");
+   }
+
    list_remove_all(csp->headers);
 
    if (fwd->forward_host || (http->ssl == 0))
@@ -1149,12 +1152,12 @@ static void chat(struct client_state *csp)
                   }
 
                   hdr = sed(server_patterns, add_server_headers, csp);
-                  if (hdr == NULL)\r
-                  {\r
-                     /* FIXME Should handle error properly */\r
-                     log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header");\r
-                  }\r
-\r
+                  if (hdr == NULL)
+                  {
+                     /* FIXME Should handle error properly */
+                     log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header");
+                  }
+
                   n = strlen(hdr);
 
                   if ((write_socket(csp->cfd, hdr, n) != n)
@@ -1209,12 +1212,12 @@ static void chat(struct client_state *csp)
                   log_error(LOG_LEVEL_ERROR, "Buffer size limit reached! Flushing and stepping back.");
 
                   hdr = sed(server_patterns, add_server_headers, csp);
-                  if (hdr == NULL)\r
-                  {\r
-                     /* FIXME Should handle error properly */\r
-                     log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header");\r
-                  }\r
-\r
+                  if (hdr == NULL)
+                  {
+                     /* FIXME Should handle error properly */
+                     log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header");
+                  }
+
                   n   = strlen(hdr);
                   byte_count += n;
 
@@ -1303,12 +1306,12 @@ static void chat(struct client_state *csp)
              */
 
             hdr = sed(server_patterns, add_server_headers, csp);
-            if (hdr == NULL)\r
-            {\r
-               /* FIXME Should handle error properly */\r
-               log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header");\r
-            }\r
-\r
+            if (hdr == NULL)
+            {
+               /* FIXME Should handle error properly */
+               log_error(LOG_LEVEL_FATAL, "Out of memory parsing server header");
+            }
+
             n   = strlen(hdr);
 
             /* write the server's (modified) header to