--- rxvt-unicode/src/rxvtd.C	2009/02/02 22:38:40	1.47
+++ rxvt-unicode/src/rxvtd.C	2011/12/06 11:29:52	1.57
@@ -3,7 +3,7 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
  *
  * 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
@@ -102,7 +102,7 @@
   sa.sun_family = AF_UNIX;
   strcpy (sa.sun_path, sockname);
 
-  unlink (rxvt_connection::unix_sockname ());
+  unlink (sockname);
 
   mode_t omask = umask (0077);
 
@@ -188,8 +188,6 @@
                 return err ("protocol error: unexpected NEW token.\n");
             }
 
-          envv->push_back (0);
-
           {
             rxvt_term *term = new rxvt_term;
 
@@ -224,15 +222,15 @@
     return err ();
 }
 
-int opt_fork, opt_opendisplay, opt_quiet;
-#if ENABLE_MLOCK
-int opt_lock;
-#endif
-
 int
 main (int argc, const char *const *argv)
 {
-  rxvt_init ();
+  ptytty::init ();
+
+  static char opt_fork, opt_opendisplay, opt_quiet;
+#if ENABLE_MLOCK
+  static char opt_lock;
+#endif
 
   for (int i = 1; i < argc; i++)
     {
@@ -253,6 +251,8 @@
         }
     }
 
+  rxvt_init ();
+
   // optionally open display and never release it.
   if (opt_opendisplay)
     if (const char *dpy = getenv ("DISPLAY"))
@@ -278,10 +278,10 @@
     }
 
 #if ENABLE_MLOCK
-  // Optionally preform a mlockall so this process does not get swapped out.
-  if (opt_lock && pid == 0)
-    if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1)
-      perror("unable to lock into ram");
+  // 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)
@@ -294,10 +294,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;
 }