From 93f70d7849b865f2081596bbeabdd6fca6101553 Mon Sep 17 00:00:00 2001 From: Takashi Yano Date: Sun, 5 Mar 2023 18:17:39 +0900 Subject: [PATCH] Cygwin: ctty: Remove old 'kludge' code. Remove old 'kludge' code which does not seem necessary anymore. The comment of the 'kludge' is as follows. * syscalls.cc (setsid): On second thought, in the spirit of keeping things kludgy, set ctty to -2 here as a special flag, and... (open): ...only eschew setting O_NOCTTY when that case is detected. Fixes: c38a2d837303 Signed-off-by: Takashi Yano --- winsup/cygwin/dtable.cc | 7 ------- winsup/cygwin/syscalls.cc | 11 ----------- 2 files changed, 18 deletions(-) diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index 301ec8ca9..18e0f3097 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -764,13 +764,6 @@ dtable::dup3 (int oldfd, int newfd, int flags) return -1; } - /* This is a temporary kludge until all utilities can catch up with - a change in behavior that implements linux functionality: opening - a tty should not automatically cause it to become the controlling - tty for the process. */ - if (newfd > 2) - flags |= O_NOCTTY; - if ((newfh = dup_worker (fds[oldfd], flags)) == NULL) { res = -1; diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 3908aee2e..8ae0397fb 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1450,17 +1450,6 @@ open (const char *unix_path, int flags, ...) int opt = PC_OPEN | PC_SYM_NOFOLLOW_PROCFD; opt |= (flags & (O_NOFOLLOW | O_EXCL)) ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW; - /* This is a temporary kludge until all utilities can catch up - with a change in behavior that implements linux functionality: - opening a tty should not automatically cause it to become the - controlling tty for the process. */ - if (!(flags & O_NOCTTY) && fd > 2 && myself->ctty != -2) - { - flags |= O_NOCTTY; - /* flag that, if opened, this fhandler could later be capable - of being a controlling terminal if /dev/tty is opened. */ - opt |= PC_CTTY; - } /* If we're opening a FIFO, we will call device_access_denied below. This leads to a call to fstat, which can use the -- 2.11.4.GIT