diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2023-03-06 18:13:55 +0300 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2023-03-07 04:19:53 +0300 |
| commit | 8d0b9ab672eccdb5421324435494e6f3cf7b3882 (patch) | |
| tree | 838e44713c2367236033fd74d66822384ff445f5 | |
| parent | 77f324ae03547c82b724ef5a35bd72b2ecf09e61 (diff) | |
Cygwin: ctty: Add missing fixup_after_{exec,fork}() call.
Previously, fixup_after_{exec,fork}() calls for CTTY were missing.
This patch fixes that.
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
| -rw-r--r-- | winsup/cygwin/dtable.cc | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler/console.cc | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index 6b2394814..8ebd7b211 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -913,6 +913,8 @@ dtable::fixup_after_exec () else if (i <= 2) SetStdHandle (std_consts[i], fh->get_output_handle ()); } + if (cygheap->ctty) + cygheap->ctty->fixup_after_exec (); } void @@ -939,6 +941,9 @@ dtable::fixup_after_fork (HANDLE parent) else if (i <= 2) SetStdHandle (std_consts[i], fh->get_output_handle ()); } + + if (cygheap->ctty) + cygheap->ctty->fixup_after_fork (parent); } static void diff --git a/winsup/cygwin/fhandler/console.cc b/winsup/cygwin/fhandler/console.cc index a30b5416e..c9b27c9c5 100644 --- a/winsup/cygwin/fhandler/console.cc +++ b/winsup/cygwin/fhandler/console.cc @@ -622,6 +622,7 @@ fhandler_console::set_unit () pc.file_attributes (FILE_ATTRIBUTE_NORMAL); else { + _tc = NULL; set_handle (NULL); set_output_handle (NULL); created = false; @@ -4046,6 +4047,12 @@ fhandler_console::fixup_after_fork_exec (bool execing) set_unit (); setup_io_mutex (); wpbuf.init (get_output_handle ()); + if (cygheap->ctty == this && !get_handle () && !get_output_handle ()) + { + close_with_arch (); + cygheap->ctty = NULL; + return; + } if (!execing) return; |