Minor changes.

[egate.git] / www / wproto.c

diff --git a/www/wproto.c b/www/wproto.c
index 0cbeeb1..5d3fc37 100644 (file)
--- a/www/wproto.c
+++ b/www/wproto.c
@@ -41,7 +41,17 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wproto.c,v $
- * Revision 1.18  1996/02/12 10:09:23  adam
+ * Revision 1.21  1996/05/23 15:53:11  adam
+ * Bug fix: egw_enc failed on 8-bit chars.
+ * New command: egw_parms.
+ *
+ * Revision 1.20  1996/05/21  14:53:04  adam
+ * Tcl command wform extented; options -raw and -exists added.
+ *
+ * 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).
  *
@@ -388,9 +398,16 @@ int wproto_process(WCLIENT wc, int timeout)
        p++;
        for (t = wc->wf_serverf; (*t = *p); t++, p++);
        p++;
+        for (t = wc->wf_script; *p && *p != '/'; t++, p++)
+            *t = *p;
+        *t = '\0';
+        if (*p)
+            p++;
+        decode_form (wc->wf_parms_var, p);
        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);
        if (wc->lineout < 0)
         {
@@ -418,7 +435,7 @@ int wproto_process(WCLIENT wc, int timeout)
     }
 }
 
-WCLIENT wproto_init (const char *fifoDir)
+WCLIENT wproto_init (const char *fifoDir, const char *prog)
 {
     char *val, path2[256];
     wclient_data *new;
@@ -435,6 +452,12 @@ WCLIENT wproto_init (const char *fifoDir)
         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/clt%d", new->fifoDir, new->id);
@@ -482,6 +505,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);