--- rxvt-unicode/src/rxvtd.C	2003/11/27 10:12:10	1.5
+++ rxvt-unicode/src/rxvtd.C	2004/02/13 13:28:17	1.9
@@ -1,4 +1,5 @@
-#include "rxvtlib.h"
+#include "../config.h"
+#include "rxvt.h"
 #include "rxvtdaemon.h"
 #include "iom.h"
 
@@ -107,8 +108,8 @@
     {
       if (!strcmp (tok, "NEW"))
         {
-          stringvec argv;
-          stringvec envv;
+          stringvec *argv = new stringvec;
+          stringvec *envv = new stringvec;
             
           for (;;)
             {
@@ -118,7 +119,7 @@
               if (!strcmp (tok, "END"))
                 break;
               else if (!strcmp (tok, "ENV") && recv (tok))
-                envv.push_back (tok.get ());
+                envv->push_back (tok.get ());
               else if (!strcmp (tok, "CWD") && recv (tok))
                 {
                   if (chdir (tok))
@@ -126,21 +127,23 @@
                          (char *)tok, strerror (errno));
                 }
               else if (!strcmp (tok, "ARG") && recv (tok))
-                argv.push_back (tok.get ());
+                argv->push_back (tok.get ());
               else
                 return err ("protocol error: unexpected NEW token");
             }
 
-          envv.push_back (0);
+          envv->push_back (0);
 
           {
             char **old_environ = environ;
-            environ = envv.begin ();
+            environ = envv->begin ();
 
-            rxvt_init (argv.size (), argv.begin ());
+            rxvt_term *term = rxvt_init (argv->size (), argv->begin ());
+
+            term->argv = argv;
+            term->envv = envv;
 
             environ = old_environ;
-            envv.clear (); // can't yet save the env 'cause rxvt modifies it :(
           }
         }
       else
@@ -151,16 +154,8 @@
 }
 
 int
-main(int argc, const char *const *argv)
+main (int argc, const char *const *argv)
 {
-  {
-    sigset_t ss;
-
-    sigaddset (&ss, SIGHUP);
-    sigaddset (&ss, SIGPIPE);
-    sigprocmask (SIG_BLOCK, &ss, 0);
-  }
-
   rxvt_init_signals ();
 
   char *sockname = rxvt_connection::unix_sockname ();
@@ -171,11 +166,12 @@
   iom.loop ();
 
 #if 0
-  if (rxvt_init(argc, argv) == NULL)
+  if (rxvt_init (argc, argv) == NULL)
       return EXIT_FAILURE;
 
   dR;
-  rxvt_main_loop(aR);	/* main processing loop */
+  rxvt_main_loop (aR);	/* main processing loop */
 #endif
   return EXIT_SUCCESS;
 }
+