[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtc.C

Comparing rxvt-unicode/src/rxvtc.C (file contents):
Revision 1.11 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.15 by root, Mon Feb 14 20:46:47 2005 UTC

 #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>
 struct client : rxvt_connection {
   client ();
   strcpy (sa.sun_path, sockname);
   free (sockname);
   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);
     }
 }
 extern char **environ;
 int
 main (int argc, const char *const *argv)
 {
   client c;
-  char buf[PATH_MAX];
   {
     sigset_t ss;
     sigemptyset (&ss);
     sigaddset (&ss, SIGHUP);
     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];
+  if (!getcwd (cwd, sizeof (cwd)))
+    {
+      perror ("unable to determine current working directory");
+      exit (EXIT_FAILURE);
+    }
+  c.send ("CWD"), c.send (cwd);
   for (char **var = environ; *environ; environ++)
     c.send ("ENV"), c.send (*environ);
+  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 = 0; i < argc; i++)
+  for (int i = 1; i < argc; i++)
     c.send ("ARG"), c.send (argv[i]);
   c.send ("END");
   auto_str tok;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines