--- rxvt-unicode/src/rxvt.C	2004/04/08 20:31:45	1.8
+++ rxvt-unicode/src/rxvt.C	2006/02/20 20:44:22	1.13
@@ -23,18 +23,36 @@
 #include "../config.h"
 #include "rxvt.h"
 
+#include <cstdlib>
+#include <cstring>
+
 int
 main (int argc, const char *const *argv)
 try
   {
-    rxvt_init_signals ();
+    rxvt_init ();
 
     rxvt_term *t = new rxvt_term;
 
-    if (!t->init (argc, argv))
+#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);
+
+    if (!t->init (args, envv))
+#else
+    if (!t->init (argc, argv, 0))
+#endif
       return EXIT_FAILURE;
 
-    iom.loop ();
+    io_manager::loop ();
 
     return EXIT_SUCCESS;
   }