--- rxvt-unicode/src/rxvtd.C	2007/11/24 11:06:13	1.39
+++ rxvt-unicode/src/rxvtd.C	2010/10/24 17:52:50	1.52
@@ -3,7 +3,7 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 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
@@ -33,6 +33,14 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
+#if defined(ENABLE_FRILLS) && defined(_POSIX_MEMLOCK) && _POSIX_MEMLOCK > 0
+# define ENABLE_MLOCK 1
+#endif
+
+#if ENABLE_MLOCK
+# include <sys/mman.h>
+#endif
+
 #include <cerrno>
 
 #include "rxvt.h"
@@ -48,10 +56,11 @@
   int getfd (int remote_fd);
 
   server (int fd)
-  : read_ev (this, &server::read_cb),
-    log_cb (this, &server::log_msg),
-    getfd_cb (this, &server::getfd)
   {
+    read_ev.set <server, &server::read_cb> (this);
+    log_cb.set  <server, &server::log_msg> (this);
+    getfd_cb.set<server, &server::getfd>   (this);
+
     this->fd = fd;
     fcntl (fd, F_SETFD, FD_CLOEXEC);
     fcntl (fd, F_SETFL, 0);
@@ -70,8 +79,9 @@
 };
 
 unix_listener::unix_listener (const char *sockname)
-: accept_ev (this, &unix_listener::accept_cb)
 {
+  accept_ev.set<unix_listener, &unix_listener::accept_cb> (this);
+
   sockaddr_un sa;
 
   if (strlen (sockname) >= sizeof(sa.sun_path))
@@ -172,16 +182,6 @@
                 break;
               else if (!strcmp (tok, "ENV") && recv (tok))
                 envv->push_back (strdup (tok));
-              else if (!strcmp (tok, "CWD") && recv (tok))
-                {
-                  if (chdir (tok))
-                    {
-                      delete envv;
-                      delete argv;
-                      return err ("unable to change to working directory to '%s', aborting: %s.\n",
-                                  (char *)tok, strerror (errno));
-                    }
-                }
               else if (!strcmp (tok, "ARG") && recv (tok))
                 argv->push_back (strdup (tok));
               else
@@ -196,11 +196,11 @@
             term->log_hook = &log_cb;
             term->getfd_hook = &getfd_cb;
 
-            bool success;
+            bool success = true;
 
             try
               {
-                success = term->init (argv, envv);
+                term->init (argv, envv);
               }
             catch (const class rxvt_failure_exception &e)
               {
@@ -209,7 +209,7 @@
 
             term->log_hook = 0;
 
-            chdir ("/");
+            chdir ("/"); // init might change to different working directory
 
             if (!success)
               term->destroy ();
@@ -224,12 +224,15 @@
     return err ();
 }
 
-int opt_fork, opt_opendisplay, opt_quiet;
-
 int
 main (int argc, const char *const *argv)
 {
-  rxvt_init ();
+  ptytty::init ();
+
+  int opt_fork, opt_opendisplay, opt_quiet;
+#if ENABLE_MLOCK
+  int opt_lock;
+#endif
 
   for (int i = 1; i < argc; i++)
     {
@@ -239,6 +242,10 @@
         opt_opendisplay = 1;
       else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
         opt_quiet = 1;
+#if ENABLE_MLOCK
+      else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
+        opt_lock = 1;
+#endif
       else
         {
           rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
@@ -246,14 +253,18 @@
         }
     }
 
-  chdir ("/");
+  rxvt_init ();
 
+  // optionally open display and never release it.
   if (opt_opendisplay)
-    displays.get (getenv ("DISPLAY")); // open display and never release it
+    if (const char *dpy = getenv ("DISPLAY"))
+      displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
 
   char *sockname = rxvt_connection::unix_sockname ();
   unix_listener l (sockname);
 
+  chdir ("/");
+
   if (!opt_quiet)
     {
       printf ("rxvt-unicode daemon listening on %s.\n", sockname);
@@ -262,10 +273,21 @@
 
   free (sockname);
 
+  pid_t pid = 0;
   if (opt_fork)
     {
-      pid_t pid = fork ();
+      pid = fork ();
+    }
 
+#if ENABLE_MLOCK
+  // Optionally perform an mlockall so this process does not get swapped out.
+  if (opt_lock && !pid)
+    if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0)
+      perror ("unable to lock into ram");
+#endif
+
+  if (opt_fork)
+    {
       if (pid < 0)
         {
           rxvt_log ("unable to fork daemon, aborting.\n");
@@ -274,10 +296,10 @@
       else if (pid > 0)
         _exit (EXIT_SUCCESS);
 
-      ev_default_fork ();
+      ev_loop_fork (EV_DEFAULT_UC);
     }
 
-  ev_loop (0);
+  ev_run ();
 
   return EXIT_SUCCESS;
 }