--- rxvt-unicode/src/rxvtc.C	2004/04/08 20:31:45	1.11
+++ rxvt-unicode/src/rxvtc.C	2006/01/10 04:23:39	1.19
@@ -22,14 +22,16 @@
 
 #include "../config.h"
 #include "rxvtdaemon.h"
+#include "fdpass.h"
 
 #include "rxvt.h"
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
+#include <csignal>
 
 #include <unistd.h>
-#include <signal.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
@@ -53,7 +55,7 @@
 
   if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
     {
-      perror ("unable to connect to rxvtd");
+      perror ("unable to connect to the rxvt-unicode daemon");
       exit (EXIT_FAILURE);
     }
 }
@@ -64,8 +66,6 @@
 main (int argc, const char *const *argv)
 {
   client c;
-  char buf[PATH_MAX];
-
   {
     sigset_t ss;
 
@@ -75,18 +75,32 @@
   }
 
   c.send ("NEW");
+
   // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
-  c.send ("CWD"), c.send (getcwd (buf, sizeof (buf)));
+  char cwd[PATH_MAX];
+
+  if (!getcwd (cwd, sizeof (cwd)))
+    {
+      perror ("unable to determine current working directory");
+      exit (EXIT_FAILURE);
+    }
 
-  for (char **var = environ; *environ; environ++)
-    c.send ("ENV"), c.send (*environ);
+  c.send ("CWD"), c.send (cwd);
 
-  for (int i = 0; i < argc; i++)
+  for (char **var = environ; *var; var++)
+    c.send ("ENV"), c.send (*var);
+
+  const char *base = strrchr (argv[0], '/');
+  base = base ? base + 1 : argv[0];
+  c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
+
+  for (int i = 1; i < argc; i++)
     c.send ("ARG"), c.send (argv[i]);
 
   c.send ("END");
 
   auto_str tok;
+  int cint;
 
   for (;;)
     if (!c.recv (tok))
@@ -96,15 +110,26 @@
       }
     else if (!strcmp (tok, "MSG") && c.recv (tok))
       fprintf (stderr, "%s", (const char *)tok);
+#if ENABLE_FRILLS && HAVE_UNIX_FDPASS
+    else if (!strcmp (tok, "GETFD") && c.recv (cint))
+      {
+        if (rxvt_send_fd (c.fd, cint) < 0)
+          {
+            fprintf (stderr, "unable to send fd %d: ", cint); perror (0);
+            exit (EXIT_FAILURE);
+          }
+      }
+#endif
     else if (!strcmp (tok, "END"))
       {
         int success;
+
         if (c.recv (success))
           exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
       }
     else
       {
-        fprintf (stderr, "protocol error: received illegal token '%s'.\n", (const char *)tok);
+        fprintf (stderr, "protocol error: received unsupported token '%s'.\n", (const char *)tok);
         break;
       }