X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=www%2Fwproto.c;h=f649de68c16682cc28d2d68a507cdb5dc351dd20;hb=90d9b8fc5a7b5cdbf67e6cdad8e1ab098c0ebef7;hp=a90223ebe49da92b7157a8e9dfed07af393fb08c;hpb=73041203f9c387b4596185203b1daebe2f4f30e9;p=egate.git

diff --git a/www/wproto.c b/www/wproto.c
index a90223e..f649de6 100644
--- a/www/wproto.c
+++ b/www/wproto.c
@@ -41,7 +41,19 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wproto.c,v $
- * Revision 1.16  1996/01/24 10:13:56  adam
+ * Revision 1.19  1996/03/14 11:48:39  adam
+ * New function egw_prog that returns name of shell.
+ *
+ * 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.
  *
@@ -358,12 +370,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");
@@ -410,7 +421,7 @@ int wproto_process(WCLIENT wc, int timeout)
     }
 }
 
-WCLIENT wproto_init(void)
+WCLIENT wproto_init (const char *fifoDir, const char *prog)
 {
     char *val, path2[256];
     wclient_data *new;
@@ -427,12 +438,19 @@ WCLIENT wproto_init(void)
         gw_log (GW_LOG_FATAL, mod, "GWID not set");
         exit (1);
     }
+    if (!(new->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/%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);
@@ -473,6 +491,7 @@ static void wproto_uncache(WCLIENT wc, int level)
 
 void wproto_terminate(WCLIENT wc)
 {
+    free (wc->prog);
     close(wc->linein);
     unlink(wc->path);
     wproto_uncache(wc, 0);
@@ -490,7 +509,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);