Implemented a new command, egw_clear, to clear http output cache.

[egate.git] / www / wproto.c

diff --git a/www/wproto.c b/www/wproto.c
index 5d3fc37..eedbe74 100644 (file)
--- a/www/wproto.c
+++ b/www/wproto.c
@@ -41,6 +41,15 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wproto.c,v $
+ * Revision 1.23  1997/01/27 11:27:14  adam
+ * Implemented a new command, egw_clear, to clear http output cache.
+ * Changed prototype for function wo_clear.
+ *
+ * Revision 1.22  1997/01/24 13:13:11  adam
+ * Implemnted egw_source and added a "raw" option to the URL.
+ * Fixed a bug in the buffering system of wproto; the macro wo_putc could
+ * override memory if it was the first HTML generating function called.
+ *
  * Revision 1.21  1996/05/23 15:53:11  adam
  * Bug fix: egw_enc failed on 8-bit chars.
  * New command: egw_parms.
@@ -137,6 +146,7 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <errno.h>
+#include <assert.h>
 
 #include "wproto.h"
 
@@ -150,12 +160,9 @@ void wo_write (WCLIENT wc, const char *s, size_t len)
 {
     if (wc->outbuffer_offset + len >= wc->outbuffer_size)
     {
-       if (!wc->outbuffer)
-           wc->outbuffer = malloc (wc->outbuffer_size += 
-              ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
-       else
-           wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
-              ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
+        assert (wc->outbuffer);
+        wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
+               ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
     }
     memcpy(wc->outbuffer + wc->outbuffer_offset, s, len);
     wc->outbuffer_offset += len;
@@ -177,34 +184,11 @@ void wo_printf (WCLIENT wc, const char *fmt, ...)
     va_end(ap);
 }
 
-void wo_clear (WCLIENT wc, const char *type)
+void wo_clear (WCLIENT wc)
 {
+    if (!wc->outbuffer)
+        wc->outbuffer = malloc (wc->outbuffer_size = OUTBUFFER_CHUNK);
     wc->outbuffer_offset = 0;
-    if (type)
-        wo_printf(wc, "Content-type: %s\n\n", type);
-}
-
-int wo_puthtml (WCLIENT wc, char *name)
-{
-    FILE *f; 
-    char ch;
-
-    wo_clear(wc, "text/html");
-    if (!(f = fopen(name, "r")))
-    {
-       wo_printf(wc, "<BR>Failed to open file: %s<BR>", name);
-       return 0;
-    }
-    while (ch = getc(f), !feof(f))
-    {
-       if (wo_putc(wc, ch) < 0)
-       {
-           fclose(f);
-           return -1;
-       }
-    }
-    fclose(f);
-    return 0;
 }
 
 int wo_flush(WCLIENT wc)
@@ -438,11 +422,11 @@ int wproto_process(WCLIENT wc, int timeout)
 WCLIENT wproto_init (const char *fifoDir, const char *prog)
 {
     char *val, path2[256];
-    wclient_data *new;
+    wclient_data *newp;
 
     gw_log (GW_LOG_DEBUG, mod, "wproto_init");
     close(1);    /* release us from the wserver */
-    if (!(new = malloc(sizeof(*new))))
+    if (!(newp = malloc(sizeof(*newp))))
     {
         gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "malloc");
         exit (1);
@@ -452,49 +436,49 @@ WCLIENT wproto_init (const char *fifoDir, const char *prog)
         gw_log (GW_LOG_FATAL, mod, "GWID not set");
         exit (1);
     }
-    if (!(new->prog = malloc (strlen(prog)+1)))
+    if (!(newp->prog = malloc (strlen(prog)+1)))
     {
         gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "malloc");
         exit (1);
     }
-    strcpy (new->prog, prog);
-    new->fifoDir = fifoDir;
-    new->id = atoi (val);
-    sprintf(new->path, "%s/clt%d", new->fifoDir, new->id);
-    if (mkfifo(new->path, 0666 | S_IFIFO) < 0)
-       gw_log (GW_LOG_WARN|GW_LOG_ERRNO, mod, "mkfifo(%s)", new->path);
+    strcpy (newp->prog, prog);
+    newp->fifoDir = fifoDir;
+    newp->id = atoi (val);
+    sprintf(newp->path, "%s/clt%d", newp->fifoDir, newp->id);
+    if (mkfifo(newp->path, 0666 | S_IFIFO) < 0)
+       gw_log (GW_LOG_WARN|GW_LOG_ERRNO, mod, "mkfifo(%s)", newp->path);
     gw_log (GW_LOG_DEBUG, mod, "Synchronizing with server.");
-    sprintf(path2, "%s/srv%d", new->fifoDir, getppid());
-    if ((new->lineout = open(path2, O_WRONLY)) < 0)
+    sprintf(path2, "%s/srv%d", newp->fifoDir, getppid());
+    if ((newp->lineout = open(path2, O_WRONLY)) < 0)
     {
        gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open out %s", path2);
        exit(1);
     }
-    if (write(new->lineout, "OK", 2) < 2)
+    if (write(newp->lineout, "OK", 2) < 2)
     {
        gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "write");
        exit(1);
     }
     gw_log (GW_LOG_DEBUG, mod, "Synchronized.");
-    if ((new->linein = open(new->path, O_RDONLY)) < 0)
+    if ((newp->linein = open(newp->path, O_RDONLY)) < 0)
     {
-       gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open input %s", new->path);
+       gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open input %s", newp->path);
        exit(1);
     }
     gw_log (GW_LOG_DEBUG, mod, "init. linein=%d lineout=%d",
-            new->linein, new->lineout);
+            newp->linein, newp->lineout);
     /* we put a handle on this so we get a blocking read when no peer */
-    if (open(new->path, O_WRONLY | O_NDELAY) < 0)
+    if (open(newp->path, O_WRONLY | O_NDELAY) < 0)
     {
-       gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open dummy %s", new->path);
+       gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open dummy %s", newp->path);
        exit(1);
     }
-    new->outbuffer = 0;
-    new->outbuffer_size = 0;
-    new->outbuffer_offset = 0;
-    new->cache_level = -1;
-    new->cache_fd = -1;
-    return new;
+    newp->outbuffer = 0;
+    newp->outbuffer_size = 0;
+    newp->outbuffer_offset = 0;
+    newp->cache_level = -1;
+    newp->cache_fd = -1;
+    return newp;
 }
 
 static void wproto_uncache(WCLIENT wc, int level)