X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Frc.c;h=721c6133d1b99fb9779c34d2f61f1db9a1aacb55;hb=8386a57458aceb768f0e59aa090a15a544f7466e;hp=e637fc6ca8f77270fda66abfa9a5a8ff0f1822d9;hpb=6391d1a7cfa10337a75465c72d49df3c9ebc65ca;p=libguestfs.git

diff --git a/fish/rc.c b/fish/rc.c
index e637fc6..721c613 100644
--- a/fish/rc.c
+++ b/fish/rc.c
@@ -198,7 +198,12 @@ rc_listen (void)
 
   if (pid > 0) {
     /* Parent process. */
-    printf ("export GUESTFISH_PID=%d\n", pid);
+
+    if (!remote_control_csh)
+      printf ("GUESTFISH_PID=%d; export GUESTFISH_PID\n", pid);
+    else
+      printf ("setenv GUESTFISH_PID %d\n", pid);
+
     fflush (stdout);
     _exit (0);
   }
@@ -279,7 +284,7 @@ rc_listen (void)
         }
 
         /* Run the command. */
-        reply.r = issue_command (call.cmd, argv, NULL);
+        reply.r = issue_command (call.cmd, argv, NULL, 0);
 
         xdr_free ((xdrproc_t) xdr_guestfish_call, (char *) &call);