* fhandler_console.cc (fhandler_console::dup): Only set ctty when we haven't

specifically called setsid.
* fhandler_tty.cc (fhandler_pty_slave::dup): Ditto.  Also add comment
documenting research into rxvt problem.
* fhandler_termios.cc (fhandler_termios::tcsetpgrp): Don't check specifically
for myself->ctty == -1.  Test for > 0 as that is the correct test.
(fhandler_termios::sigflush): Ditto.
This commit is contained in:
Christopher Faylor
2012-03-03 21:35:30 +00:00
parent 56bed67046
commit bd7c945953
4 changed files with 26 additions and 4 deletions

View File

@@ -898,7 +898,16 @@ out:
int
fhandler_pty_slave::dup (fhandler_base *child, int flags)
{
myself->set_ctty (this, flags);
/* This code was added in Oct 2001 for some undisclosed reason.
However, setting the controlling tty on a dup causes rxvt to
hang when the parent does a dup since the controlling pgid changes.
Specifically testing for -2 (ctty has been setsid'ed) works around
this problem. However, it's difficult to see scenarios in which you
have a dup'able fd, no controlling tty, and not having run setsid.
So, we might want to consider getting rid of the set_ctty in tty-like dup
methods entirely at some point */
if (myself->ctty != -2)
myself->set_ctty (this, flags);
report_tty_counts (child, "duped slave", "");
return 0;
}