--- rxvt-unicode/src/rxvtd.C	2004/02/13 13:28:17	1.9
+++ rxvt-unicode/src/rxvtd.C	2006/01/11 00:59:58	1.23
@@ -1,6 +1,29 @@
+/*--------------------------------*-C-*---------------------------------*
+ * File:	rxvtd.C
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2003-2004 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *----------------------------------------------------------------------*/
+
 #include "../config.h"
 #include "rxvt.h"
 #include "rxvtdaemon.h"
+#include "fdpass.h"
 #include "iom.h"
 
 #include <cstdio>
@@ -9,6 +32,7 @@
 #include <cstring>
 
 #include <unistd.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
@@ -19,10 +43,17 @@
 extern char **environ;
 
 struct server : rxvt_connection {
+  log_callback log_cb;
+  getfd_callback getfd_cb;
+
   void read_cb (io_watcher &w, short revents); io_watcher read_ev;
+  void log_msg (const char *msg);
+  int getfd (int remote_fd);
 
   server (int fd)
-  : read_ev (this, &server::read_cb)
+  : read_ev (this, &server::read_cb),
+    log_cb (this, &server::log_msg),
+    getfd_cb (this, &server::getfd)
   {
     this->fd = fd;
     read_ev.start (fd, EVENT_READ);
@@ -42,12 +73,14 @@
 unix_listener::unix_listener (const char *sockname)
 : accept_ev (this, &unix_listener::accept_cb)
 {
-  if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0)
+  if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
     {
       perror ("unable to create listening socket");
       exit (EXIT_FAILURE);
     }
 
+  fcntl (fd, F_SETFD, FD_CLOEXEC);
+
   sockaddr_un sa;
 
   sa.sun_family = AF_UNIX;
@@ -79,7 +112,26 @@
   int fd2 = accept (fd, 0, 0);
 
   if (fd2 >= 0)
-    new server (fd2);
+    {
+      fcntl (fd2, F_SETFD, FD_CLOEXEC);
+      new server (fd2);
+    }
+}
+
+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)
+{
+  send ("MSG"), send (msg);
 }
 
 void server::err (const char *format, ...)
@@ -93,9 +145,10 @@
       vsnprintf (err, 1024, format, ap);
       va_end (ap);
 
-      send ("ERR"), send (err);
+      send ("MSG"), send (err);
     }
 
+  send ("END", 0);
   close (fd);
   delete this;
 }
@@ -135,15 +188,32 @@
           envv->push_back (0);
 
           {
-            char **old_environ = environ;
-            environ = envv->begin ();
-
-            rxvt_term *term = rxvt_init (argv->size (), argv->begin ());
-
+            rxvt_term *term = new rxvt_term;
+            
+            term->log_hook = &log_cb;
+            term->getfd_hook = &getfd_cb;
             term->argv = argv;
             term->envv = envv;
 
-            environ = old_environ;
+            bool success;
+            
+            try
+              {
+                success = term->init (argv->size (), argv->begin ());
+              }
+            catch (const class rxvt_failure_exception &e)
+              {
+                success = false;
+              }
+
+            term->log_hook = 0;
+
+            chdir ("/");
+
+            if (!success)
+              term->destroy ();
+
+            send ("END"); send (success ? 1 : 0);
           }
         }
       else
@@ -153,25 +223,59 @@
     return err ();
 }
 
+int opt_fork, opt_opendisplay, opt_quiet;
+
 int
 main (int argc, const char *const *argv)
 {
-  rxvt_init_signals ();
+  for (int i = 1; i < argc; i++)
+    {
+      if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
+        opt_fork = 1;
+      else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
+        opt_opendisplay = 1;
+      else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
+        opt_quiet = 1;
+      else
+        {
+          rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
+          return EXIT_FAILURE;
+        }
+    }
+  
+  rxvt_init ();
+
+  chdir ("/");
+
+  if (opt_opendisplay)
+    displays.get (getenv ("DISPLAY")); // open display and never release it
 
   char *sockname = rxvt_connection::unix_sockname ();
   unix_listener l (sockname);
-  printf ("rxvtd listening on %s.\n", sockname);
+
+  if (!opt_quiet)
+    {
+      printf ("rxvt-unicode daemon listening on %s.\n", sockname);
+      fflush (stdout);
+    }
+
   free (sockname);
 
-  iom.loop ();
+  if (opt_fork)
+    {
+      pid_t pid = fork ();
 
-#if 0
-  if (rxvt_init (argc, argv) == NULL)
-      return EXIT_FAILURE;
+      if (pid < 0)
+        {
+          rxvt_log ("unable to fork daemon, aborting.\n");
+          return EXIT_FAILURE;
+        }
+      else if (pid > 0)
+        _exit (EXIT_SUCCESS);
+    }
+
+  io_manager::loop ();
 
-  dR;
-  rxvt_main_loop (aR);	/* main processing loop */
-#endif
   return EXIT_SUCCESS;
 }