--- rxvt-unicode/src/rxvtc.C	2004/04/08 20:31:45	1.11
+++ rxvt-unicode/src/rxvtc.C	2007/10/31 09:55:24	1.28
@@ -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
@@ -21,40 +21,53 @@
  *----------------------------------------------------------------------*/
 
 #include "../config.h"
-#include "rxvtdaemon.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>
 
+#include "rxvtdaemon.h"
+#include "libptytty.h"
+
+#include "rxvt.h"
+
+#define STATUS_SUCCESS           0
+#define STATUS_FAILURE           1
+#define STATUS_CONNECTION_FAILED 2
+
 struct client : rxvt_connection {
   client ();
 };
 
 client::client ()
 {
-  if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
+  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 (EXIT_FAILURE);
+      exit (STATUS_FAILURE);
     }
 
-  char *sockname = rxvt_connection::unix_sockname ();
-  sockaddr_un sa;
   sa.sun_family = AF_UNIX;
   strcpy (sa.sun_path, sockname);
   free (sockname);
 
   if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
     {
-      perror ("unable to connect to rxvtd");
-      exit (EXIT_FAILURE);
+      perror ("unable to connect to the rxvt-unicode daemon");
+      exit (STATUS_CONNECTION_FAILED);
     }
 }
 
@@ -64,29 +77,42 @@
 main (int argc, const char *const *argv)
 {
   client c;
-  char buf[PATH_MAX];
-
   {
     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*
-  c.send ("CWD"), c.send (getcwd (buf, sizeof (buf)));
+  char cwd[PATH_MAX];
 
-  for (char **var = environ; *environ; environ++)
-    c.send ("ENV"), c.send (*environ);
+  if (!getcwd (cwd, sizeof (cwd)))
+    {
+      perror ("unable to determine current working directory");
+      exit (STATUS_FAILURE);
+    }
 
-  for (int i = 0; i < argc; i++)
+  c.send ("CWD"), c.send (cwd);
+
+  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,18 +122,27 @@
       }
     else if (!strcmp (tok, "MSG") && c.recv (tok))
       fprintf (stderr, "%s", (const char *)tok);
+    else if (!strcmp (tok, "GETFD") && c.recv (cint))
+      {
+        if (!ptytty::send_fd (c.fd, cint))
+          {
+            fprintf (stderr, "unable to send fd %d: ", cint); perror (0);
+            exit (STATUS_FAILURE);
+          }
+      }
     else if (!strcmp (tok, "END"))
       {
         int success;
+
         if (c.recv (success))
-          exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
+          exit (success ? STATUS_SUCCESS : STATUS_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;
       }
 
-  return EXIT_FAILURE;
+  return STATUS_FAILURE;
 }