--- rxvt-unicode/src/rxvtc.C	2007/10/31 09:55:24	1.28
+++ rxvt-unicode/src/rxvtc.C	2008/06/15 13:54:15	1.32
@@ -39,7 +39,8 @@
 #define STATUS_FAILURE           1
 #define STATUS_CONNECTION_FAILED 2
 
-struct client : rxvt_connection {
+struct client : rxvt_connection
+{
   client ();
 };
 
@@ -48,7 +49,7 @@
   sockaddr_un sa;
   char *sockname = rxvt_connection::unix_sockname ();
 
-  if (strlen(sockname) >= sizeof(sa.sun_path))
+  if (strlen (sockname) >= sizeof (sa.sun_path))
     {
       fputs ("socket name too long, aborting.\n", stderr);
       exit (STATUS_FAILURE);
@@ -76,7 +77,17 @@
 int
 main (int argc, const char *const *argv)
 {
+  // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
+  char cwd[PATH_MAX];
+
+  if (!getcwd (cwd, sizeof (cwd)))
+    {
+      perror ("unable to determine current working directory");
+      exit (STATUS_FAILURE);
+    }
+
   client c;
+
   {
     sigset_t ss;
 
@@ -88,17 +99,6 @@
 
   c.send ("NEW");
 
-  // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
-  char cwd[PATH_MAX];
-
-  if (!getcwd (cwd, sizeof (cwd)))
-    {
-      perror ("unable to determine current working directory");
-      exit (STATUS_FAILURE);
-    }
-
-  c.send ("CWD"), c.send (cwd);
-
   for (char **var = environ; *var; var++)
     c.send ("ENV"), c.send (*var);
 
@@ -106,6 +106,9 @@
   base = base ? base + 1 : argv[0];
   c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
 
+  c.send ("ARG"), c.send ("-cd");
+  c.send ("ARG"), c.send (cwd);
+
   for (int i = 1; i < argc; i++)
     c.send ("ARG"), c.send (argv[i]);