* fhandler_tty.cc (fhandler_pty_master::setup): Reorganize so that all

operations for each end of the pipe are grouped together.

2 files changed, 21 insertions, 20 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 244da549e..425de1085 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-26  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* fhandler_tty.cc (fhandler_pty_master::setup): Reorganize so that all
+	operations for each end of the pipe are grouped together.
+
 2008-07-25  Corinna Vinschen  <corinna@vinschen.de>
 
 	* dcrt0.cc (dll_crt0_1): Call malloc_init and user_shared_initialize_1
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index ab52d6dfe..d4b710d8f 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1362,7 +1362,7 @@ fhandler_pty_master::setup (bool ispty)
 
   char pipename[sizeof("ttyNNNN-from-master")];
   __small_sprintf (pipename, "tty%d-from-master", get_unit ());
-  res = fhandler_pipe::create_selectable (&sec_all, from_master,
+  res = fhandler_pipe::create_selectable (&sec_none_nih, from_master,
 					  get_output_handle (), 128 * 1024,
 					  pipename);
   if (res)
@@ -1370,19 +1370,29 @@ fhandler_pty_master::setup (bool ispty)
       errstr = "input pipe";
       goto err;
     }
+  if (!SetHandleInformation (get_output_handle (), HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT))
+    {
+      errstr = "inheritable get_output_handle ()";
+      goto err;
+    }
+
+  if (!SetNamedPipeHandleState (get_output_handle (), &pipe_mode, NULL, NULL))
+    termios_printf ("can't set output_handle(%p) to non-blocking mode",
+		    get_output_handle ());
 
   __small_sprintf (pipename, "tty%d-to-master", get_unit ());
-  res = fhandler_pipe::create_selectable (&sec_all, get_io_handle (),
+  res = fhandler_pipe::create_selectable (&sec_none_nih, get_io_handle (),
 					  to_master, 128 * 1024, pipename);
   if (res)
     {
       errstr = "output pipe";
       goto err;
     }
-
-  if (!SetNamedPipeHandleState (get_output_handle (), &pipe_mode, NULL, NULL))
-    termios_printf ("can't set output_handle(%p) to non-blocking mode",
-		    get_output_handle ());
+  if (!SetHandleInformation (get_io_handle (), HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT))
+    {
+      errstr = "inheritable get_io_handle ()";
+      goto err;
+    }
 
   need_nl = 0;
 
@@ -1419,20 +1429,6 @@ fhandler_pty_master::setup (bool ispty)
   if (!(input_mutex = CreateMutex (&sec_all, FALSE, buf)))
     goto err;
 
-  if (!DuplicateHandle (hMainProc, from_master, hMainProc, &from_master, 0, false,
-			DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE))
-    {
-      errstr = "non-inheritable from_master";
-      goto err;
-    }
-
-  if (!DuplicateHandle (hMainProc, to_master, hMainProc, &to_master, 0, false,
-			DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE))
-    {
-      errstr = "non-inheritable to_master";
-      goto err;
-    }
-
   t.from_master = from_master;
   t.to_master = to_master;
   // /* screws up tty master */ ProtectHandle1INH (output_mutex, output_mutex);