X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fwproto.c;h=0cbeeb197249502aa41b048613d87744d5b1b857;hb=4938d0c2e8f4e1eec397c2bfbbc7e23fd150c369;hp=35479b36235b600c50f59cdaa51bfe2942dc192f;hpb=95847d2bfe19cbe5533cd25df3e6a64f9bd4b062;p=egate.git

diff --git a/www/wproto.c b/www/wproto.c
index 35479b3..0cbeeb1 100644
--- a/www/wproto.c
+++ b/www/wproto.c
@@ -41,7 +41,20 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wproto.c,v $
- * Revision 1.15  1996/01/24 08:25:32  adam
+ * Revision 1.18  1996/02/12 10:09:23  adam
+ * New parameter to wproto_init: directory root for the FIFOs (instead
+ * of using preprocessor defines FIFODIR/FIFOROOT).
+ *
+ * Revision 1.17  1996/01/26  09:02:22  adam
+ * Open of client FIFO called with O_NDELAY when reconnecting to shell
+ * in order to prevent serious lock if previous shell died without
+ * unlinking client FIFO.
+ *
+ * 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
@@ -126,8 +139,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 +=
-	((len >= OUTBUFFER_CHUNK) ? len*2 : 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;
 }
@@ -348,12 +367,11 @@ int wproto_process(WCLIENT wc, int timeout)
 	if (rs == 0)
 	{
 	    gw_log (GW_LOG_STAT, mod, 
-                    "wproto_process returning 0 after %d second timeout.",
+                    "select %d second timeout.",
 		    timeout);
             unlink (wc->wf_serverp);
 	    return 0;
 	}
-        /* determine handle (fifo or user) */
 	if (read(wc->linein, &toread, sizeof(toread)) < sizeof(toread))
 	{
 	    gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "wp_proc:len read failed");
@@ -400,7 +418,7 @@ int wproto_process(WCLIENT wc, int timeout)
     }
 }
 
-WCLIENT wproto_init(void)
+WCLIENT wproto_init (const char *fifoDir)
 {
     char *val, path2[256];
     wclient_data *new;
@@ -417,12 +435,13 @@ WCLIENT wproto_init(void)
         gw_log (GW_LOG_FATAL, mod, "GWID not set");
         exit (1);
     }
+    new->fifoDir = fifoDir;
     new->id = atoi (val);
-    sprintf(new->path, "%s/%s/clt%d", FIFOROOT, FIFODIR, new->id);
+    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);
     gw_log (GW_LOG_DEBUG, mod, "Synchronizing with server.");
-    sprintf(path2, "%s/%s/srv%d", FIFOROOT, FIFODIR, getppid());
+    sprintf(path2, "%s/srv%d", new->fifoDir, getppid());
     if ((new->lineout = open(path2, O_WRONLY)) < 0)
     {
     	gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open out %s", path2);
@@ -480,7 +499,7 @@ int wproto_cache(WCLIENT wc, int level)
     }
     wproto_uncache(wc, level);
     p = &wc->cache[++wc->cache_level];
-    sprintf(p->path, "%s/%s/csh%d.%d", FIFOROOT, FIFODIR, wc->id, level);
+    sprintf(p->path, "%s/csh%d.%d", wc->fifoDir, wc->id, level);
     if ((wc->cache_fd = open(p->path, O_WRONLY|O_CREAT|O_TRUNC, 0600)) < 0)
     {
     	gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open %s", p->path);