Run latex

[egate.git] / www / wproto.c

diff --git a/www/wproto.c b/www/wproto.c
index eedbe74..b1e0d1f 100644 (file)
--- a/www/wproto.c
+++ b/www/wproto.c
@@ -41,6 +41,16 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wproto.c,v $
+ * Revision 1.26  1997/12/15 15:05:02  adam
+ * Enhanced the code that deals with FORM variables.
+ *
+ * Revision 1.25  1997/02/10 10:15:38  adam
+ * Bug fix: egw_source <file> <var> didn't work properly.
+ *
+ * Revision 1.24  1997/01/31 11:16:00  adam
+ * Enhanced the egw_source command. An optional parameter specifies the
+ * name of a variable in which the HTML output is stored.
+ *
  * 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.
@@ -156,14 +166,17 @@ static void wproto_uncache(WCLIENT wc, int level);
 
 static char *mod = "wproto";
 
+void wo_expand (WCLIENT wc, size_t len)
+{
+    assert (wc->outbuffer);
+    wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
+          ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
+}
+
 void wo_write (WCLIENT wc, const char *s, size_t len)
 {
     if (wc->outbuffer_offset + len >= wc->outbuffer_size)
-    {
-        assert (wc->outbuffer);
-        wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
-               ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
-    }
+        wo_expand (wc, len);
     memcpy(wc->outbuffer + wc->outbuffer_offset, s, len);
     wc->outbuffer_offset += len;
 }
@@ -231,11 +244,27 @@ int wo_flush(WCLIENT wc)
 int wo_overflow(WCLIENT wc, char ch)
 {
     gw_log (GW_LOG_DEBUG, mod, "wo_overflow");
-    if (wo_flush(wc) < 0)
+    if (wc->save_level)
+        wo_expand (wc, 0);
+    else if (wo_flush(wc) < 0)
        return -1;
     return wo_putc(wc, ch);
 }
 
+void destroy_form (wform_data *p)
+{
+    while (p)
+    {
+        wform_data *p_next = p->next;
+
+        free (p->name);
+        free (p->value);
+        free (p);
+
+        p = p_next;
+    }
+}
+
 int wo_finish(WCLIENT wc)
 {
     int fd;
@@ -243,8 +272,7 @@ int wo_finish(WCLIENT wc)
 
     wo_putc (wc, 0);
     if (wo_flush(wc) < 0)
-       return -1;
-
+        gw_log (GW_LOG_WARN, mod, "wo_flush failed in wo_finish");
     fd = open (wc->wf_serverf, O_RDONLY);
     if (fd != -1)
     {
@@ -263,6 +291,9 @@ int wo_finish(WCLIENT wc)
        close(wc->cache_fd);
        wc->cache_fd = -1;
     }
+    free (wc->wf_parms);
+    destroy_form (wc->wf_data);
+    destroy_form (wc->wf_parms_var);
     return 0;
 }
 
@@ -295,37 +326,45 @@ static void descramble(char *t, const char *o)
     *t = '\0';
 }
 
-static void decode_form(wform_data *form, char *buf)
+wform_data *decode_form(char *buf)
 {
-    int i = 0;
-    char *p;
-    char tmp[512];
+    wform_data *p, **pp = &p;
+    char tmp[4096];
 
     while (*buf)
     {
-       for (p = form[i].name; *buf && *buf != '='; buf++)
-           *(p++) = *buf;
-       *p = '\0';
+        int l;
+
+        *pp = malloc (sizeof(**pp));
+       for (l = 0; *buf && *buf != '='; buf++)
+           if (l < (sizeof(tmp)-1))
+                tmp[l++] = *buf;
+        tmp[l] = '\0';
+        (*pp)->name = malloc (strlen(tmp)+1);
+        strcpy ((*pp)->name, tmp);
        if (*buf)
            buf++;
-       for (p = tmp; *buf && *buf != '&'; buf++)
-           *(p++) = *buf;
-       *p = '\0';
-       descramble(form[i].value, tmp);
+       for (l = 0; *buf && *buf != '&'; buf++)
+           if (l < (sizeof(tmp)-1))
+               tmp[l++] = *buf;
+       tmp[l] = '\0';
+       (*pp)->value = malloc (strlen(tmp)+1);
+       descramble((*pp)->value, tmp);
        if (*buf)
            buf++;
-       i++;
+       pp = &(*pp)->next;
     }
-    *form[i].name = '\0';
+    *pp = NULL;
+    return p;
 }
 
 char *wgetval(WCLIENT wc, char *name)
 {
-    int i;
+    wform_data *p;
 
-    for (i = 0; *wc->wf_data[i].name; i++)
-       if (!strcmp(name, wc->wf_data[i].name))
-           return wc->wf_data[i].value;
+    for (p = wc->wf_data; p; p = p->next)
+       if (!strcmp(name, p->name))
+           return p->value;
     return 0;
 }
 
@@ -387,12 +426,14 @@ int wproto_process(WCLIENT wc, int timeout)
         *t = '\0';
         if (*p)
             p++;
-        decode_form (wc->wf_parms_var, p);
-       for (t = wc->wf_parms; (*t = *p); t++, p++);
+        wc->wf_parms_var = decode_form (p);
+        wc->wf_parms = malloc (strlen(p)+1);
+       for (t = wc->wf_parms; (*t = *p); t++, p++)
+            ;
        p++;
        p++;         /* we don't deal with envvars yet */
         wc->raw_data = p;
-       decode_form(wc->wf_data, p);
+       wc->wf_data = decode_form (p);
        if (wc->lineout < 0)
         {
             gw_log (GW_LOG_DEBUG, mod, "open %s", wc->wf_serverp);
@@ -404,7 +445,7 @@ int wproto_process(WCLIENT wc, int timeout)
            }
         }
        /* look in cache only if request carries no forms data. */
-       if (!*wc->wf_data[0].name && (level = wproto_findcache(wc,
+       if (!wc->wf_data && (level = wproto_findcache(wc,
            wc->wf_parms)) >= 0)
        {
            gw_log (GW_LOG_DEBUG, mod, "wproto_dumpcache");
@@ -478,6 +519,7 @@ WCLIENT wproto_init (const char *fifoDir, const char *prog)
     newp->outbuffer_offset = 0;
     newp->cache_level = -1;
     newp->cache_fd = -1;
+    newp->save_level = 0;
     return newp;
 }
 
@@ -527,6 +569,25 @@ static int wproto_findcache(WCLIENT wc, char *name)
     return -1;
 }
 
+int wproto_save_push (WCLIENT wc)
+{
+    wc->save_level++;
+    return wc->outbuffer_offset;
+}
+
+char *wproto_save_pop (WCLIENT wc, int offset)
+{
+    char *cp;
+    if (!wc->save_level)
+        return NULL;
+    --(wc->save_level);
+    assert (offset <= wc->outbuffer_offset);
+    cp = wc->outbuffer + offset;
+    wc->outbuffer[wc->outbuffer_offset] = '\0';
+    wc->outbuffer_offset = offset;
+    return cp;
+}
+
 static int wproto_dumpcache(WCLIENT wc, int level)
 {
     int fd, rd;