--- rxvt-unicode/src/rxvtc.C	2006/02/01 18:07:18	1.23
+++ rxvt-unicode/src/rxvtc.C	2008/06/15 13:54:15	1.32
@@ -1,9 +1,9 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:	rxvtc.C
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,20 +39,28 @@
 #define STATUS_FAILURE           1
 #define STATUS_CONNECTION_FAILED 2
 
-struct client : rxvt_connection {
+struct client : rxvt_connection
+{
   client ();
 };
 
 client::client ()
 {
+  sockaddr_un sa;
+  char *sockname = rxvt_connection::unix_sockname ();
+
+  if (strlen (sockname) >= sizeof (sa.sun_path))
+    {
+      fputs ("socket name too long, aborting.\n", stderr);
+      exit (STATUS_FAILURE);
+    }
+
   if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
     {
       perror ("unable to create communications socket");
       exit (STATUS_FAILURE);
     }
 
-  char *sockname = rxvt_connection::unix_sockname ();
-  sockaddr_un sa;
   sa.sun_family = AF_UNIX;
   strcpy (sa.sun_path, sockname);
   free (sockname);
@@ -69,28 +77,28 @@
 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;
 
     sigemptyset (&ss);
     sigaddset (&ss, SIGHUP);
+    sigaddset (&ss, SIGPIPE);
     sigprocmask (SIG_BLOCK, &ss, 0);
   }
 
   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);
 
@@ -98,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]);