--- rxvt-unicode/src/rxvtd.C	2010/11/19 00:10:18	1.53
+++ rxvt-unicode/src/rxvtd.C	2012/01/19 13:33:43	1.59
@@ -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
@@ -21,10 +21,10 @@
  *----------------------------------------------------------------------*/
 
 #include "../config.h"
-#include <cstdio>
-#include <cstdlib>
-#include <cstdarg>
-#include <cstring>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -41,7 +41,7 @@
 # include <sys/mman.h>
 #endif
 
-#include <cerrno>
+#include <errno.h>
 
 #include "rxvt.h"
 #include "rxvtdaemon.h"
@@ -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,13 +223,13 @@
 }
 
 int
-main (int argc, const char *const *argv)
+main (int argc, char *argv[])
 {
   ptytty::init ();
 
-  int opt_fork = 0, opt_opendisplay = 0, opt_quiet = 0;
+  static char opt_fork, opt_opendisplay, opt_quiet;
 #if ENABLE_MLOCK
-  int opt_lock = 0;
+  static char opt_lock;
 #endif
 
   for (int i = 1; i < argc; i++)