--- rxvt-unicode/src/rxvtd.C	2010/10/24 17:34:47	1.51
+++ rxvt-unicode/src/rxvtd.C	2011/12/17 23:17:33	1.58
@@ -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;
 
@@ -225,15 +223,15 @@
 }
 
 int
-main (int argc, const char *const *argv)
+main (int argc, char *argv[])
 {
-  int opt_fork, opt_opendisplay, opt_quiet;
+  ptytty::init ();
+
+  static char opt_fork, opt_opendisplay, opt_quiet;
 #if ENABLE_MLOCK
-  int opt_lock;
+  static char opt_lock;
 #endif
 
-  rxvt_init ();
-
   for (int i = 1; i < argc; i++)
     {
       if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
@@ -253,6 +251,8 @@
         }
     }
 
+  rxvt_init ();
+
   // optionally open display and never release it.
   if (opt_opendisplay)
     if (const char *dpy = getenv ("DISPLAY"))