--- rxvt-unicode/src/rxvtd.C	2003/11/25 11:52:42	1.3
+++ rxvt-unicode/src/rxvtd.C	2004/03/17 05:15:02	1.10
@@ -1,4 +1,5 @@
-#include "rxvtlib.h"
+#include "../config.h"
+#include "rxvt.h"
 #include "rxvtdaemon.h"
 #include "iom.h"
 
@@ -8,6 +9,8 @@
 #include <cstring>
 
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
@@ -16,10 +19,14 @@
 extern char **environ;
 
 struct server : rxvt_connection {
+  log_callback log_cb;
+
   void read_cb (io_watcher &w, short revents); io_watcher read_ev;
+  void log_msg (const char *msg);
 
   server (int fd)
-  : read_ev (this, &server::read_cb)
+  : read_ev (this, &server::read_cb),
+    log_cb (this, &server::log_msg)
   {
     this->fd = fd;
     read_ev.start (fd, EVENT_READ);
@@ -28,16 +35,16 @@
   void err (const char *format = 0, ...);
 };
 
-struct listener {
+struct unix_listener {
   int fd;
 
   void accept_cb (io_watcher &w, short revents); io_watcher accept_ev;
 
-  listener ();
+  unix_listener (const char *sockname);
 };
 
-listener::listener ()
-: accept_ev (this, &listener::accept_cb)
+unix_listener::unix_listener (const char *sockname)
+: accept_ev (this, &unix_listener::accept_cb)
 {
   if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0)
     {
@@ -48,16 +55,20 @@
   sockaddr_un sa;
 
   sa.sun_family = AF_UNIX;
-  strcpy (sa.sun_path, rxvt_connection::unix_sockname ());
+  strcpy (sa.sun_path, sockname);
 
   unlink (rxvt_connection::unix_sockname ());
 
+  mode_t omask = umask (0077);
+
   if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
     {
       perror ("unable to bind listening socket");
       exit (EXIT_FAILURE);
     }
 
+  umask (omask);
+
   if (listen (fd, 5))
     {
       perror ("unable to listen on socket");
@@ -67,7 +78,7 @@
   accept_ev.start (fd, EVENT_READ);
 }
 
-void listener::accept_cb (io_watcher &w, short revents)
+void unix_listener::accept_cb (io_watcher &w, short revents)
 {
   int fd2 = accept (fd, 0, 0);
 
@@ -75,6 +86,11 @@
     new server (fd2);
 }
 
+void server::log_msg (const char *msg)
+{
+  send ("MSG"), send (msg);
+}
+
 void server::err (const char *format, ...)
 {
   if (format)
@@ -86,9 +102,10 @@
       vsnprintf (err, 1024, format, ap);
       va_end (ap);
 
-      send ("ERR"), send (err);
+      send ("MSG"), send (err);
     }
 
+  send ("END", 0);
   close (fd);
   delete this;
 }
@@ -101,8 +118,8 @@
     {
       if (!strcmp (tok, "NEW"))
         {
-          stringvec argv;
-          stringvec envv;
+          stringvec *argv = new stringvec;
+          stringvec *envv = new stringvec;
             
           for (;;)
             {
@@ -112,7 +129,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))
@@ -120,22 +137,40 @@
                          (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 ());
-            //dR;
-            //rxvt_main_loop (aR);
+            rxvt_term *term = new rxvt_term;
+            
+            term->log_hook = &log_cb;
+            term->argv = argv;
+            term->envv = envv;
+
+            bool success;
+            
+            try
+              {
+                success = term->init (argv->size (), argv->begin ());
+              }
+            catch (const class rxvt_failure_exception &e)
+              {
+                success = false;
+              }
 
             environ = old_environ;
+
+            if (!success)
+              term->destroy ();
+
+            send ("END"); send (success ? 1 : 0);
           }
         }
       else
@@ -146,26 +181,24 @@
 }
 
 int
-main(int argc, const char *const *argv)
+main (int argc, const char *const *argv)
 {
-  listener l;
+  rxvt_init_signals ();
 
-  {
-    sigset_t ss;
+  char *sockname = rxvt_connection::unix_sockname ();
+  unix_listener l (sockname);
+  printf ("rxvtd listening on %s.\n", sockname);
+  free (sockname);
 
-    sigaddset (&ss, SIGHUP);
-    sigprocmask (SIG_BLOCK, &ss, 0);
-  }
-
-  printf ("rxvtd running.\n");
   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;
 }
+