--- rxvt-unicode/src/init.C	2011/12/18 02:14:59	1.308
+++ rxvt-unicode/src/init.C	2012/01/07 17:48:56	1.313
@@ -1476,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]);
 
@@ -1609,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");
         }
     }
@@ -1618,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
@@ -1676,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 ();
 
@@ -1711,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 */
     }