From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 10 Feb 1997 10:15:38 +0000 (+0000)
Subject: Bug fix: egw_source <file> <var> didn't work properly.
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=0cad10a308d1f636ff5661ac543b38251e74d323;p=egate.git

Bug fix: egw_source <file> <var> didn't work properly.
---

diff --git a/www/wproto.c b/www/wproto.c
index 992d800..7042755 100644
--- a/www/wproto.c
+++ b/www/wproto.c
@@ -41,6 +41,9 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wproto.c,v $
+ * 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.
@@ -539,8 +542,8 @@ static int wproto_findcache(WCLIENT wc, char *name)
 
 int wproto_save_push (WCLIENT wc)
 {
-    return wc->outbuffer_offset;
     wc->save_level++;
+    return wc->outbuffer_offset;
 }
 
 char *wproto_save_pop (WCLIENT wc, int offset)
diff --git a/www/wproto.h b/www/wproto.h
index 5fb5a8c..6beb5ed 100644
--- a/www/wproto.h
+++ b/www/wproto.h
@@ -41,6 +41,9 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wproto.h,v $
+ * Revision 1.15  1997/02/10 10:15:40  adam
+ * Bug fix: egw_source <file> <var> didn't work properly.
+ *
  * Revision 1.14  1997/01/31 11:16:01  adam
  * Enhanced the egw_source command. An optional parameter specifies the
  * name of a variable in which the HTML output is stored.
@@ -154,7 +157,7 @@ typedef struct wclient_data
 } *WCLIENT, wclient_data;
 
 #define wo_putc(wc, ch)   \
-    ((wc)->outbuffer_offset >= OUTBUFFER_CHUNK ? wo_overflow((wc), (ch)) :  \
+    ((wc)->outbuffer_offset>=(wc)->outbuffer_size ? wo_overflow((wc), (ch)):  \
     (*((wc)->outbuffer + (wc)->outbuffer_offset++) = (char) (ch)), 0)
 
 char *wgetval (WCLIENT wc, char *name);
diff --git a/www/wtcl.c b/www/wtcl.c
index 8772adc..69d0ab4 100644
--- a/www/wtcl.c
+++ b/www/wtcl.c
@@ -41,6 +41,9 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wtcl.c,v $
+ * Revision 1.21  1997/02/10 10:15:40  adam
+ * Bug fix: egw_source <file> <var> didn't work properly.
+ *
  * Revision 1.20  1997/01/31 11:16:01  adam
  * Enhanced the egw_source command. An optional parameter specifies the
  * name of a variable in which the HTML output is stored.
@@ -319,7 +322,7 @@ static int proc_enc (ClientData clientData, Tcl_Interp *interp,
         while (*cp)
         { 
             if (*cp < ' ' || *cp >= 127 || *cp == '&' || *cp == '?'
-                || *cp == '%' || *cp == '+')
+                || *cp == '%' || *cp == '+' || *cp == '"')
             {
                 sprintf (buf1+1, "%02X", *cp & 0xff);
                 Tcl_AppendResult (interp, buf1, NULL);