[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.309 by sf-exg, Tue Dec 20 02:52:39 2011 UTC vs.
Revision 1.313 by sf-exg, Sat Jan 7 17:48:56 2012 UTC

                        CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
                        &attributes);
   this->parent = top;
-  old_width = szHint.width;
-  old_height = szHint.height;
   set_title     (rs [Rs_title]);
   set_icon_name (rs [Rs_iconName]);
   classHint.res_name  = (char *)rs[Rs_name];
   classHint.res_class = (char *)RESCLASS;
         _exit (EXIT_FAILURE);
       default:
         if (!option (Opt_utmpInhibit))
+          {
+#ifdef LOG_ONLY_ON_LOGIN
+            bool login_shell = option (Opt_loginShell);
+#else
+            bool login_shell = true;
+#endif
-          pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
+            pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
+          }
         pty->close_tty ();
         child_ev.start (cmd_pid);
 #elif defined (SRIOCSREDIR)
       int fd;
       fd = open (CONSOLE, O_WRONLY, 0);
       if (fd >= 0)
-        if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
+        {
+          ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
           close (fd);
+        }
 #endif /* SRIOCSREDIR */
     }
   /* reset signals and spin off the command interpreter */
   signal (SIGINT,  SIG_DFL);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines