--- rxvt-unicode/src/rxvtd.C	2006/01/11 00:59:58	1.23
+++ rxvt-unicode/src/rxvtd.C	2006/01/22 00:36:59	1.26
@@ -73,7 +73,7 @@
 unix_listener::unix_listener (const char *sockname)
 : accept_ev (this, &unix_listener::accept_cb)
 {
-  if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
+  if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
     {
       perror ("unable to create listening socket");
       exit (EXIT_FAILURE);
@@ -120,13 +120,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
 }
 
 void server::log_msg (const char *msg)
@@ -172,7 +168,7 @@
               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))
@@ -180,7 +176,7 @@
                          (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");
             }
@@ -192,14 +188,12 @@
             
             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)
               {
@@ -228,6 +222,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"))
@@ -243,8 +239,6 @@
         }
     }
   
-  rxvt_init ();
-
   chdir ("/");
 
   if (opt_opendisplay)