--- rxvt-unicode/src/rxvtd.C	2005/12/23 14:46:35	1.22
+++ rxvt-unicode/src/rxvtd.C	2007/10/31 09:55:24	1.33
@@ -1,9 +1,9 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:	rxvtd.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,11 +21,6 @@
  *----------------------------------------------------------------------*/
 
 #include "../config.h"
-#include "rxvt.h"
-#include "rxvtdaemon.h"
-#include "fdpass.h"
-#include "iom.h"
-
 #include <cstdio>
 #include <cstdlib>
 #include <cstdarg>
@@ -40,7 +35,10 @@
 
 #include <cerrno>
 
-extern char **environ;
+#include "rxvt.h"
+#include "rxvtdaemon.h"
+#include "libptytty.h"
+#include "iom.h"
 
 struct server : rxvt_connection {
   log_callback log_cb;
@@ -73,7 +71,15 @@
 unix_listener::unix_listener (const char *sockname)
 : accept_ev (this, &unix_listener::accept_cb)
 {
-  if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
+  sockaddr_un sa;
+
+  if (strlen (sockname) >= sizeof(sa.sun_path))
+    {
+      fputs ("socket name too long, aborting.\n", stderr);
+      exit (EXIT_FAILURE);
+    }
+
+  if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
     {
       perror ("unable to create listening socket");
       exit (EXIT_FAILURE);
@@ -81,8 +87,6 @@
 
   fcntl (fd, F_SETFD, FD_CLOEXEC);
 
-  sockaddr_un sa;
-
   sa.sun_family = AF_UNIX;
   strcpy (sa.sun_path, sockname);
 
@@ -120,13 +124,9 @@
 
 int server::getfd (int remote_fd)
 {
-#if ENABLE_FRILLS && HAVE_UNIX_FDPASS
   send ("GETFD");
   send (remote_fd);
-  return rxvt_recv_fd (fd);
-#else
-  return -1;
-#endif
+  return ptytty::recv_fd (fd);
 }
 
 void server::log_msg (const char *msg)
@@ -145,10 +145,10 @@
       vsnprintf (err, 1024, format, ap);
       va_end (ap);
 
-      send ("MSG"), send (err);
+      log_msg (err);
     }
 
-  send ("END", 0);
+  send ("END"), send (0);
   close (fd);
   delete this;
 }
@@ -163,7 +163,7 @@
         {
           stringvec *argv = new stringvec;
           stringvec *envv = new stringvec;
-            
+
           for (;;)
             {
               if (!recv (tok))
@@ -172,37 +172,36 @@
               if (!strcmp (tok, "END"))
                 break;
               else if (!strcmp (tok, "ENV") && recv (tok))
-                envv->push_back (tok.get ());
+                envv->push_back (strdup (tok));
               else if (!strcmp (tok, "CWD") && recv (tok))
                 {
                   if (chdir (tok))
-                    err ("unable to change to working directory to '%s': %s",
-                         (char *)tok, strerror (errno));
+                    {
+                      delete envv;
+                      delete argv;
+                      return err ("unable to change to working directory to '%s', aborting: %s.\n",
+                                  (char *)tok, strerror (errno));
+                    }
                 }
               else if (!strcmp (tok, "ARG") && recv (tok))
-                argv->push_back (tok.get ());
+                argv->push_back (strdup (tok));
               else
-                return err ("protocol error: unexpected NEW token");
+                return err ("protocol error: unexpected NEW token.\n");
             }
 
           envv->push_back (0);
 
           {
-            char **old_environ = environ;
-            environ = envv->begin ();
-
             rxvt_term *term = new rxvt_term;
-            
+
             term->log_hook = &log_cb;
             term->getfd_hook = &getfd_cb;
-            term->argv = argv;
-            term->envv = envv;
 
             bool success;
-            
+
             try
               {
-                success = term->init (argv->size (), argv->begin ());
+                success = term->init (argv, envv);
               }
             catch (const class rxvt_failure_exception &e)
               {
@@ -211,7 +210,6 @@
 
             term->log_hook = 0;
 
-            environ = old_environ;
             chdir ("/");
 
             if (!success)
@@ -221,7 +219,7 @@
           }
         }
       else
-        return err ("protocol error: request '%s' unsupported.", (char *)tok);
+        return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
     }
   else
     return err ();
@@ -232,6 +230,8 @@
 int
 main (int argc, const char *const *argv)
 {
+  rxvt_init ();
+
   for (int i = 1; i < argc; i++)
     {
       if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
@@ -246,8 +246,6 @@
           return EXIT_FAILURE;
         }
     }
-  
-  rxvt_init ();
 
   chdir ("/");