X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Fwproto.c;h=a90223ebe49da92b7157a8e9dfed07af393fb08c;hb=fa0ddb755d3a836e4e13cc05a6ba3eb6b0010958;hp=ff283ded13c5c35c55d5fa9cff540b67ccc922e2;hpb=b52740e82ab92e99a6982bf5c99a30ac404bd557;p=egate.git

diff --git a/www/wproto.c b/www/wproto.c
index ff283de..a90223e 100644
--- a/www/wproto.c
+++ b/www/wproto.c
@@ -41,7 +41,40 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wproto.c,v $
- * Revision 1.8  1995/11/13 15:41:45  adam
+ * Revision 1.16  1996/01/24 10:13:56  adam
+ * Bug fix: in function wo_write realloc is used only when memory is already
+ * allocated with malloc.
+ *
+ * Revision 1.15  1996/01/24  08:25:32  adam
+ * Buf fix: Uninitialized outbuffer_offset member.
+ *
+ * Revision 1.14  1996/01/12  13:08:07  adam
+ * CGI script passes name of lock file to the shell. The server will not close
+ * the response FIFO until this file becomes unlocked. This method handles
+ * cancel operations much better.
+ *
+ * Revision 1.13  1996/01/12  10:05:20  adam
+ * If script name ends with ';' HTTP/GET/Expires will be defined.
+ * The cgi interface only reads final handshake if response from
+ * server (shell) was zero-terminated [If it isn't it probably died].
+ *
+ * Revision 1.12  1996/01/05  16:35:02  adam
+ * Minor changes.
+ *
+ * Revision 1.11  1996/01/05  16:21:21  adam
+ * Bug fix: shell (wproto) sometimes closed server FIFO before cgi
+ * program opened it - solution: cgi sends OK when response has been read.
+ *
+ * Revision 1.10  1995/12/22  14:21:16  adam
+ * More work on scan. The search.egw script takes care of cached
+ * query page (doesn't always increment nextSetNo). To make new search set
+ * either 'New query' must be selected or the query page must be reloaded.
+ * The msearch script doesn't do this yet, however.
+ *
+ * Revision 1.9  1995/11/14  16:31:36  adam
+ * Temporary remove of ccl entry.
+ *
+ * Revision 1.8  1995/11/13  15:41:45  adam
  * Arrow gifs.
  * Gateway uses record element set names B(rief) and F(ull).
  * Bug fix. Didn't save idAuthentication correctly.
@@ -75,6 +108,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -96,8 +130,14 @@ static char *mod = "wproto";
 void wo_write (WCLIENT wc, const char *s, size_t len)
 {
     if (wc->outbuffer_offset + len >= wc->outbuffer_size)
-    	wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
-	OUTBUFFER_CHUNK);
+    {
+	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));
+    }
     memcpy(wc->outbuffer + wc->outbuffer_offset, s, len);
     wc->outbuffer_offset += len;
 }
@@ -118,12 +158,11 @@ void wo_printf (WCLIENT wc, const char *fmt, ...)
     va_end(ap);
 }
 
-void wo_clear (WCLIENT wc, char *type)
+void wo_clear (WCLIENT wc, const char *type)
 {
-    if (!wc->outbuffer)
-    	wc->outbuffer = malloc(wc->outbuffer_size = OUTBUFFER_CHUNK);
     wc->outbuffer_offset = 0;
-    wo_printf(wc, "Content-type: %s\n\n", type);
+    if (type)
+        wo_printf(wc, "Content-type: %s\n\n", type);
 }
 
 int wo_puthtml (WCLIENT wc, char *name)
@@ -196,11 +235,24 @@ int wo_overflow(WCLIENT wc, char ch)
 
 int wo_finish(WCLIENT wc)
 {
+    int fd;
     gw_log (GW_LOG_DEBUG, mod, "wo_finish");
-  
+
     wo_putc (wc, 0);
     if (wo_flush(wc) < 0)
     	return -1;
+
+    fd = open (wc->wf_serverf, O_RDONLY);
+    if (fd != -1)
+    {
+        struct flock area;
+        area.l_type = F_RDLCK;
+        area.l_whence = SEEK_SET;
+        area.l_start = 0L;
+        area.l_len = 0L;
+        fcntl (fd, F_SETLKW, &area);
+        close (fd);
+    }
     close(wc->lineout);
     wc->lineout = -1;
     if (wc->cache_fd >= 0)
@@ -326,22 +378,30 @@ int wproto_process(WCLIENT wc, int timeout)
 	p = combuf;
 	for (t = wc->wf_serverp; (*t = *p); t++, p++);
 	p++;
+	for (t = wc->wf_serverf; (*t = *p); t++, p++);
+	p++;
 	for (t = wc->wf_parms; (*t = *p); t++, p++);
 	p++;
 	p++;         /* we don't deal with envvars yet */
 	decode_form(wc->wf_data, p);
-	if (wc->lineout < 0 && (wc->lineout = open(wc->wf_serverp, O_WRONLY))
-	    < 0)
-	{
-	    gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open %s", wc->wf_serverp);
-	    exit(1);
-	}
+	if (wc->lineout < 0)
+        {
+            gw_log (GW_LOG_DEBUG, mod, "open %s", wc->wf_serverp);
+            if ((wc->lineout = open(wc->wf_serverp, O_WRONLY)) < 0)
+	    {
+	        gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open %s", 
+                        wc->wf_serverp);
+	        exit(1);
+	    }
+        }
 	/* look in cache only if request carries no forms data. */
 	if (!*wc->wf_data[0].name && (level = wproto_findcache(wc,
 	    wc->wf_parms)) >= 0)
 	{
+	    gw_log (GW_LOG_DEBUG, mod, "wproto_dumpcache");
 	    wproto_dumpcache(wc, level);
 	    wo_finish(wc);
+            
 	}
 	else
         {
@@ -398,6 +458,8 @@ WCLIENT wproto_init(void)
     	exit(1);
     }
     new->outbuffer = 0;
+    new->outbuffer_size = 0;
+    new->outbuffer_offset = 0;
     new->cache_level = -1;
     new->cache_fd = -1;
     return new;