--- rxvt-unicode/src/rxvt.C	2010/10/22 05:58:00	1.19
+++ rxvt-unicode/src/rxvt.C	2014/05/22 18:54:33	1.25
@@ -3,11 +3,11 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,34 +23,18 @@
 #include "../config.h"
 #include "rxvt.h"
 
-#include <cstdlib>
-#include <cstring>
+#include <stdlib.h>
+#include <string.h>
 
 int
-main (int argc, const char *const *argv)
+main (int argc, char *argv[])
 try
   {
+    ptytty::init ();
     rxvt_init ();
 
     rxvt_term *t = new rxvt_term;
-
-#if ENABLE_PERL
-    stringvec *args = new stringvec;
-    stringvec *envv = new stringvec;
-
-    for (int i = 0; i < argc; i++)
-      args->push_back (strdup (argv [i]));
-
-    for (char **var = environ; *var; var++)
-      envv->push_back (strdup (*var));
-
-    envv->push_back (0);
-
-    t->init (args, envv);
-#else
-    t->init (argc, argv, 0);
-#endif
-
+    t->init (argc, argv, environ);
     ev_run ();
 
     return EXIT_SUCCESS;