--- rxvt-unicode/src/init.C	2011/12/17 23:17:33	1.307
+++ rxvt-unicode/src/init.C	2012/01/09 15:45:45	1.316
@@ -569,23 +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 **)argv + r_argc + 1;
-
   rs[Rs_name] = rxvt_basename (argv[0]);
 
   /*
@@ -595,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]);
@@ -868,7 +854,7 @@
   rootwin_ev.start (display, display->root);
 #endif
 
-  set_colorfgbg ();
+  init_done = 1;
 
   init_command (cmd_argv);
 
@@ -922,6 +908,10 @@
 rxvt_term::init_env ()
 {
   char *val;
+  char *env_display;
+  char *env_windowid;
+  char *env_colorfgbg;
+  char *env_term;
 
 #ifdef DISPLAY_IS_IP
   /* Fixup display_name for export over pty to any interested terminal
@@ -948,6 +938,7 @@
 
   sprintf (env_display, "DISPLAY=%s", val);
 
+  env_windowid = (char *)rxvt_malloc (21);
   sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
 
   /* add entries to the environment:
@@ -961,8 +952,8 @@
   putenv (env_display);
   putenv (env_windowid);
 
-  if (env_colorfgbg)
-    putenv (env_colorfgbg);
+  env_colorfgbg = get_colorfgbg ();
+  putenv (env_colorfgbg);
 
 #ifdef RXVT_TERMINFO
   putenv ("TERMINFO=" RXVT_TERMINFO);
@@ -1490,9 +1481,6 @@
 
   this->parent = top;
 
-  old_width = szHint.width;
-  old_height = szHint.height;
-
   set_title     (rs [Rs_title]);
   set_icon_name (rs [Rs_iconName]);
 
@@ -1623,7 +1611,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");
         }
     }
@@ -1632,6 +1620,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
@@ -1690,7 +1680,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 ();
 
@@ -1725,8 +1722,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 */
     }