--- rxvt-unicode/src/rxvtc.C	2004/04/08 20:31:45	1.11
+++ rxvt-unicode/src/rxvtc.C	2004/12/20 16:44:31	1.14
@@ -27,9 +27,10 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
+#include <csignal>
 
 #include <unistd.h>
-#include <signal.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
@@ -53,7 +54,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);
     }
 }
@@ -81,7 +82,11 @@
   for (char **var = environ; *environ; environ++)
     c.send ("ENV"), c.send (*environ);
 
-  for (int i = 0; i < argc; i++)
+  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");