libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Takashi Yano 2022-12-20 20:26:36 +09:00
parent 5841b2f6a4
commit 25c4ad6ea5
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/fhandler/termios.cc
View File

@ -737,7 +737,11 @@ fhandler_termios::ioctl (int cmd, void *varg)
} }
myself->ctty = -1; myself->ctty = -1;
myself->set_ctty (this, 0); if (!myself->set_ctty (this, 0))
{
set_errno (EPERM);
return -1;
}
return 0; return 0;
} }

2
winsup/cygwin/mm/cygheap.cc
View File

@ -127,6 +127,8 @@ void
init_cygheap::close_ctty () init_cygheap::close_ctty ()
{ {
debug_printf ("closing cygheap->ctty %p", cygheap->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->close_with_arch ();
cygheap->ctty = NULL; cygheap->ctty = NULL;
} }

38
winsup/cygwin/pinfo.cc
View File

@ -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); 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)) if (fh && (ctty <= 0 || ctty == tc.ntty) && !(flags & O_NOCTTY))
{ {
ctty = tc.ntty; if (tc.getsid () && tc.getsid () != sid)
if (cygheap->ctty != fh->archetype) ; /* Do nothing if another session is associated with the TTY. */
else
{ {
debug_printf ("cygheap->ctty %p, archetype %p", cygheap->ctty, fh->archetype); ctty = tc.ntty;
if (!cygheap->ctty) if (cygheap->ctty != fh->archetype)
syscall_printf ("ctty was NULL");
else
{ {
syscall_printf ("ctty %p, usecount %d", cygheap->ctty, debug_printf ("cygheap->ctty %p, archetype %p",
cygheap->ctty->archetype_usecount (0)); cygheap->ctty, fh->archetype);
cygheap->ctty->close (); if (!cygheap->ctty)
} syscall_printf ("ctty was NULL");
cygheap->ctty = (fhandler_termios *) fh->archetype; else
if (cygheap->ctty) {
{ syscall_printf ("ctty %p, usecount %d", cygheap->ctty,
fh->archetype_usecount (1); cygheap->ctty->archetype_usecount (0));
/* guard ctty fh */ cygheap->ctty->close ();
report_tty_counts (cygheap->ctty, "ctty", ""); }
cygheap->ctty = (fhandler_termios *) fh->archetype;
if (cygheap->ctty)
{
fh->archetype_usecount (1);
/* guard ctty fh */
report_tty_counts (cygheap->ctty, "ctty", "");
}
} }
} }