--- rxvt-unicode/src/init.C	2011/12/06 11:29:52	1.305
+++ rxvt-unicode/src/init.C	2012/01/07 17:48:56	1.313
@@ -569,30 +569,9 @@
 const char **
 rxvt_term::init_resources (int argc, const char *const *argv)
 {
-  int i, r_argc;
+  int i;
   const char **cmd_argv;
 
-  /*
-   * Look for -e option. Find => split and make cmd_argv[] of command args
-   */
-  for (r_argc = 0; r_argc < argc; r_argc++)
-    if (!strcmp (argv[r_argc], "-e"))
-      break;
-
-  if (r_argc == argc)
-    cmd_argv = NULL;
-  else if (!argv[r_argc + 1])
-    rxvt_fatal ("option '-e' requires an argument, aborting.\n");
-  else
-    {
-      cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
-
-      for (i = 0; i < argc - r_argc - 1; i++)
-        cmd_argv[i] = (const char *)argv[i + r_argc + 1];
-
-      cmd_argv[i] = NULL;
-    }
-
   rs[Rs_name] = rxvt_basename (argv[0]);
 
   /*
@@ -602,7 +581,7 @@
   if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
     rs[Rs_display_name] = ":0";
 
-  get_options (r_argc, argv);
+  cmd_argv = get_options (argc, argv);
 
   if (!(display = displays.get (rs[Rs_display_name])))
     rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
@@ -756,7 +735,38 @@
 
 /*----------------------------------------------------------------------*/
 void
-rxvt_term::init (int argc, const char *const *argv)
+rxvt_term::init (stringvec *argv, stringvec *envv)
+{
+  argv->push_back (0);
+  envv->push_back (0);
+
+  this->argv = argv;
+  this->envv = envv;
+
+  init2 (argv->size () - 1, argv->begin ());
+}
+
+void
+rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
+{
+#if ENABLE_PERL
+  // perl might want to access the stringvecs later, so we need to copy them
+  stringvec *args = new stringvec;
+  for (int i = 0; i < argc; i++)
+    args->push_back (strdup (argv [i]));
+
+  stringvec *envs = new stringvec;
+  for (const char *const *var = envv; *var; var++)
+    envs->push_back (strdup (*var));
+
+  init (args, envs);
+#else
+  init2 (argc, argv);
+#endif
+}
+
+void
+rxvt_term::init2 (int argc, const char *const *argv)
 {
   SET_R (this);
   set_locale ("");
@@ -833,11 +843,9 @@
 
 #ifdef BG_IMAGE_FROM_FILE
     if (rs[Rs_backgroundPixmap])
-      {
-        if (bg_set_file (rs[Rs_backgroundPixmap]))
-          if (!bg_window_position_sensitive ())
-            update_background ();
-      }
+      if (bg_set_file (rs[Rs_backgroundPixmap]))
+        if (!bg_window_position_sensitive ())
+          update_background ();
 #endif
   }
 #endif
@@ -850,8 +858,6 @@
 
   init_command (cmd_argv);
 
-  free (cmd_argv);
-
   if (pty->pty >= 0)
     pty_ev.start (pty->pty, ev::READ);
 
@@ -971,10 +977,6 @@
 }
 
 /*----------------------------------------------------------------------*/
-/*
- * This is more or less stolen straight from XFree86 xterm.
- * This should support all European type languages.
- */
 void
 rxvt_term::set_locale (const char *locale)
 {
@@ -1004,13 +1006,12 @@
 #endif
 
 #if HAVE_NL_LANGINFO
-  char *codeset = strdup (nl_langinfo (CODESET));
+  char *codeset = nl_langinfo (CODESET);
   // /^UTF.?8/i
   enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
           && (codeset[1] == 'T' || codeset[1] == 't')
           && (codeset[2] == 'F' || codeset[2] == 'f')
           && (codeset[3] == '8' || codeset[4] == '8');
-  free (codeset);
 #else
   enc_utf8 = 0;
 #endif
@@ -1023,14 +1024,14 @@
 
 #ifdef USE_XIM
   if (!locale)
-    rxvt_warn ("setting locale failed, working without locale support.\n");
+    rxvt_warn ("setting locale failed, continuing without locale support.\n");
   else
     {
       set_string_property (xa[XA_WM_LOCALE_NAME], locale);
 
       if (!XSupportsLocale ())
         {
-          rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
+          rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
           return;
         }
 
@@ -1475,9 +1476,6 @@
 
   this->parent = top;
 
-  old_width = szHint.width;
-  old_height = szHint.height;
-
   set_title     (rs [Rs_title]);
   set_icon_name (rs [Rs_iconName]);
 
@@ -1608,7 +1606,7 @@
           if (getfd_hook)
             pty->pty = (*getfd_hook) (pty->pty);
 
-          if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
+          if (pty->pty < 0)
             rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
         }
     }
@@ -1617,6 +1615,8 @@
     if (!pty->get ())
       rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
 
+  fcntl (pty->pty, F_SETFL, O_NONBLOCK);
+
   struct termios tio = def_tio;
 
 #ifndef NO_BACKSPACE_KEY
@@ -1675,7 +1675,14 @@
 
       default:
         if (!option (Opt_utmpInhibit))
-          pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
+          {
+#ifdef LOG_ONLY_ON_LOGIN
+            bool login_shell = option (Opt_loginShell);
+#else
+            bool login_shell = true;
+#endif
+            pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
+          }
 
         pty->close_tty ();
 
@@ -1710,8 +1717,10 @@
 
       fd = open (CONSOLE, O_WRONLY, 0);
       if (fd >= 0)
-        if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
+        {
+          ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
           close (fd);
+        }
 #endif /* SRIOCSREDIR */
     }