--- rxvt-unicode/src/rxvtc.C	2006/02/20 22:42:00	1.25
+++ rxvt-unicode/src/rxvtc.C	2007/11/18 00:21:34	1.30
@@ -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,26 +77,27 @@
 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++)