--- rxvt-unicode/src/rxvtd.C	2004/04/04 23:52:37	1.12
+++ rxvt-unicode/src/rxvtd.C	2006/01/17 15:17:39	1.24
@@ -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>
@@ -21,13 +44,16 @@
 
 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),
-    log_cb (this, &server::log_msg)
+    log_cb (this, &server::log_msg),
+    getfd_cb (this, &server::getfd)
   {
     this->fd = fd;
     read_ev.start (fd, EVENT_READ);
@@ -47,7 +73,7 @@
 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 (AF_UNIX, SOCK_STREAM, 0)) < 0)
     {
       perror ("unable to create listening socket");
       exit (EXIT_FAILURE);
@@ -92,6 +118,13 @@
     }
 }
 
+int server::getfd (int remote_fd)
+{
+  send ("GETFD");
+  send (remote_fd);
+  return rxvt_recv_fd (fd);
+}
+
 void server::log_msg (const char *msg)
 {
   send ("MSG"), send (msg);
@@ -151,12 +184,10 @@
           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;
 
@@ -171,7 +202,9 @@
                 success = false;
               }
 
-            environ = old_environ;
+            term->log_hook = 0;
+
+            chdir ("/");
 
             if (!success)
               term->destroy ();
@@ -186,25 +219,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 (pid < 0)
+        {
+          rxvt_log ("unable to fork daemon, aborting.\n");
+          return EXIT_FAILURE;
+        }
+      else if (pid > 0)
+        _exit (EXIT_SUCCESS);
+    }
+
+  io_manager::loop ();
 
-#if 0
-  if (rxvt_init (argc, argv) == NULL)
-      return EXIT_FAILURE;
-
-  dR;
-  rxvt_main_loop (aR);	/* main processing loop */
-#endif
   return EXIT_SUCCESS;
 }