aboutsummaryrefslogtreecommitdiff
path: root/winsup
diff options
context:
space:
mode:
authorTakashi Yano <takashi.yano@nifty.ne.jp>2022-12-20 20:26:36 +0900
committerTakashi Yano <takashi.yano@nifty.ne.jp>2022-12-22 20:57:17 +0900
commit25c4ad6ea52fc5451193dc98fc5ab04b1f509302 (patch)
tree16a0de464013fabf791737dbfc4ebd5abb7169cb /winsup
parent5841b2f6a4208682264d03e3edfa0a09881932a6 (diff)
downloadnewlib-25c4ad6ea52fc5451193dc98fc5ab04b1f509302.zip
newlib-25c4ad6ea52fc5451193dc98fc5ab04b1f509302.tar.gz
newlib-25c4ad6ea52fc5451193dc98fc5ab04b1f509302.tar.bz2
Cygwin: pinfo: Align CTTY behavior to the statement of POSIX.
POSIX states "A terminal may be the controlling terminal for at most one session." https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap11.html However, in cygwin, multiple sessions could be associated with the same TTY. This patch aligns CTTY behavior to the statement of POSIX. Reviewed-by: Corinna Vinschen <corinna@vinschen.de> Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/fhandler/termios.cc6
-rw-r--r--winsup/cygwin/mm/cygheap.cc2
-rw-r--r--winsup/cygwin/pinfo.cc38
3 files changed, 29 insertions, 17 deletions
diff --git a/winsup/cygwin/fhandler/termios.cc b/winsup/cygwin/fhandler/termios.cc
index fe4dfd1..f94e20f 100644
--- a/winsup/cygwin/fhandler/termios.cc
+++ b/winsup/cygwin/fhandler/termios.cc
@@ -737,7 +737,11 @@ fhandler_termios::ioctl (int cmd, void *varg)
}
myself->ctty = -1;
- myself->set_ctty (this, 0);
+ if (!myself->set_ctty (this, 0))
+ {
+ set_errno (EPERM);
+ return -1;
+ }
return 0;
}
diff --git a/winsup/cygwin/mm/cygheap.cc b/winsup/cygwin/mm/cygheap.cc
index a305570..72861d8 100644
--- a/winsup/cygwin/mm/cygheap.cc
+++ b/winsup/cygwin/mm/cygheap.cc
@@ -127,6 +127,8 @@ void
init_cygheap::close_ctty ()
{
debug_printf ("closing cygheap->ctty %p", cygheap->ctty);
+ if (cygheap->ctty->tc ()->getsid () == pid)
+ cygheap->ctty->tc ()->setsid (0); /* Release CTTY ownership */
cygheap->ctty->close_with_arch ();
cygheap->ctty = NULL;
}
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index e086ab9..586a420 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -530,24 +530,30 @@ _pinfo::set_ctty (fhandler_termios *fh, int flags)
debug_printf ("old %s, ctty device number %y, tc.ntty device number %y flags & O_NOCTTY %y", __ctty (), ctty, tc.ntty, flags & O_NOCTTY);
if (fh && (ctty <= 0 || ctty == tc.ntty) && !(flags & O_NOCTTY))
{
- ctty = tc.ntty;
- if (cygheap->ctty != fh->archetype)
+ if (tc.getsid () && tc.getsid () != sid)
+ ; /* Do nothing if another session is associated with the TTY. */
+ else
{
- debug_printf ("cygheap->ctty %p, archetype %p", cygheap->ctty, fh->archetype);
- if (!cygheap->ctty)
- syscall_printf ("ctty was NULL");
- else
- {
- syscall_printf ("ctty %p, usecount %d", cygheap->ctty,
- cygheap->ctty->archetype_usecount (0));
- cygheap->ctty->close ();
- }
- cygheap->ctty = (fhandler_termios *) fh->archetype;
- if (cygheap->ctty)
+ ctty = tc.ntty;
+ if (cygheap->ctty != fh->archetype)
{
- fh->archetype_usecount (1);
- /* guard ctty fh */
- report_tty_counts (cygheap->ctty, "ctty", "");
+ debug_printf ("cygheap->ctty %p, archetype %p",
+ cygheap->ctty, fh->archetype);
+ if (!cygheap->ctty)
+ syscall_printf ("ctty was NULL");
+ else
+ {
+ syscall_printf ("ctty %p, usecount %d", cygheap->ctty,
+ cygheap->ctty->archetype_usecount (0));
+ cygheap->ctty->close ();
+ }
+ cygheap->ctty = (fhandler_termios *) fh->archetype;
+ if (cygheap->ctty)
+ {
+ fh->archetype_usecount (1);
+ /* guard ctty fh */
+ report_tty_counts (cygheap->ctty, "ctty", "");
+ }
}
}