From: Christopher Faylor <me@cgf.cx>
Date: Sat, 25 Aug 2001 17:27:31 +0000 (+0000)
Subject: * syscalls.cc (check_tty_fds): New function.  Check whether there is a fd
X-Git-Tag: Z-cygwin_daemon_merge-new_HEAD~223
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=e32b4e81cbab99dc756559f2ba05e61a3f210cde;p=newlib-cygwin.git

* syscalls.cc (check_tty_fds): New function.  Check whether there is a fd
referring to pty slave.
(setsid): Don't detach console if the process has a pty slave.
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 87c7c0754..c7c4c1eb7 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-24  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
+   
+	* syscalls.cc (check_tty_fds): New function.  Check whether there is a
+	fd referring to pty slave.
+	(setsid): Don't detach console if the process has a pty slave.
+
 Fri Aug 24  8:54:00 2001  Corinna Vinschen <corinna@vinschen.de>
 
 	* net.cc (free_addr_list): Add define for symmetry.
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 4708cb04d..ca76b07a9 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -65,6 +65,22 @@ close_all_files (void)
   cygwin_shared->delqueue.process_queue ();
 }
 
+static BOOL __stdcall
+check_ttys_fds (void)
+{
+  int res = FALSE;
+  SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "close_all_files");
+  fhandler_base *fh;
+  for (int i = 0; i < (int) cygheap->fdtab.size; i++)
+    if ((fh = cygheap->fdtab[i]) != NULL && fh->get_device() == FH_TTYS)
+      {
+	res = TRUE;
+	break;
+      }
+  ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "close_all_files");
+  return res;
+}
+
 extern "C" int
 _unlink (const char *ourname)
 {
@@ -237,10 +253,11 @@ getppid ()
 extern "C" pid_t
 setsid (void)
 {
-  /* FIXME: for now */
   if (myself->pgid != _getpid ())
     {
-      if (myself->ctty == TTY_CONSOLE && !cygheap->fdtab.has_console_fds ())
+      if (myself->ctty == TTY_CONSOLE &&
+	  !cygheap->fdtab.has_console_fds () &&
+	  !check_ttys_fds ())
 	FreeConsole ();
       myself->ctty = -1;
       myself->sid = _getpid ();