diff options
author | Christopher Faylor <me@cgf.cx> | 2011-07-04 09:08:28 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2011-07-04 09:08:28 +0400 |
commit | b9a072504229f9e01bbe1978f36145a986ecec38 (patch) | |
tree | b2cd51910eacefc2ab6a1eed52c0f54ed6d317c6 /winsup/cygwin | |
parent | 867649762b1b222e8eac43aa9fbcbac91a16996c (diff) |
* fhandler.cc (fhandler_base::open_with_arch): Call close_on_exec last to avoid
setting close_on_exec for archetype.
* fhandler_tty.cc (fhandler_pty_master::setup): Protect {from,to}_pty handles.
Use consistent naming in debug output. Use inheritable handles and...
(fhandler_pty_master::fixup_after_fork): ...avoid duplicating handles here.
(fhandler_pty_slave::open): Don't set close_on_exec flag here.
Diffstat (limited to 'winsup/cygwin')
-rw-r--r-- | winsup/cygwin/ChangeLog | 11 | ||||
-rw-r--r-- | winsup/cygwin/fhandler.cc | 2 | ||||
-rw-r--r-- | winsup/cygwin/fhandler_tty.cc | 17 |
3 files changed, 18 insertions, 12 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 49c67dbd4..9eda1f779 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,14 @@ +2011-07-04 Christopher Faylor <me.cygwin2011@cgf.cx> + + * fhandler.cc (fhandler_base::open_with_arch): Call close_on_exec last + to avoid setting close_on_exec for archetype. + * fhandler_tty.cc (fhandler_pty_master::setup): Protect {from,to}_pty + handles. Use consistent naming in debug output. Use inheritable + handles and... + (fhandler_pty_master::fixup_after_fork): ...avoid duplicating handles + here. + (fhandler_pty_slave::open): Don't set close_on_exec flag here. + 2011-07-01 Christopher Faylor <me.cygwin2011@cgf.cx> * dtable.cc (cnew): Fix whitespace. diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index 4ea05a59e..fc6679e90 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -453,7 +453,6 @@ int fhandler_base::open_with_arch (int flags, mode_t mode) { int res; - close_on_exec (flags & O_CLOEXEC); if (!(res = (archetype && archetype->io_handle) || open (flags, (mode & 07777) & ~cygheap->umask))) { @@ -480,6 +479,7 @@ fhandler_base::open_with_arch (int flags, mode_t mode) open_setup (flags); } + close_on_exec (flags & O_CLOEXEC); return res; } diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 70b7993b6..3a08ca357 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -514,7 +514,6 @@ fhandler_pty_slave::open (int flags, mode_t) set_io_handle (from_master_local); set_output_handle (to_master_local); - set_close_on_exec (!!(flags & O_CLOEXEC)); set_open_status (); if (cygheap->manage_console_count ("fhandler_pty_slave::open", 1) == 1) @@ -537,7 +536,7 @@ fhandler_pty_slave::open_setup (int flags) { set_flags ((flags & ~O_TEXT) | O_BINARY); myself->set_ctty (get_ttyp (), flags, this); - cygheap->manage_console_count ("fhandler_pty_slave::setup", 1); + cygheap->manage_console_count ("fhandler_pty_slave::open_setup", 1); report_tty_counts (this, "opened", ""); } @@ -1586,7 +1585,7 @@ fhandler_pty_master::setup () /* Create communication pipes */ char pipename[sizeof("ptyNNNN-from-master")]; __small_sprintf (pipename, "pty%d-from-master", get_unit ()); - res = fhandler_pipe::create_selectable (&sec_none_nih, from_master, + res = fhandler_pipe::create_selectable (&sec_none, from_master, get_output_handle (), 128 * 1024, pipename); if (res) @@ -1595,12 +1594,13 @@ fhandler_pty_master::setup () goto err; } + ProtectHandle1 (get_output_handle (), to_pty); 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, "pty%d-to-master", get_unit ()); - res = fhandler_pipe::create_selectable (&sec_none_nih, get_io_handle (), + res = fhandler_pipe::create_selectable (&sec_none, get_io_handle (), to_master, 128 * 1024, pipename); if (res) { @@ -1608,6 +1608,7 @@ fhandler_pty_master::setup () goto err; } + ProtectHandle1 (get_io_handle (), from_pty); need_nl = 0; /* Create security attribute. Default permissions are 0620. */ @@ -1662,7 +1663,7 @@ fhandler_pty_master::setup () t.winsize.ws_row = 25; t.master_pid = myself->pid; - termios_printf ("tty%d opened - from_slave %p, to_slave %p", t.get_unit (), + termios_printf ("tty%d opened - from_pty %p, to_pty %p", t.get_unit (), get_io_handle (), get_output_handle ()); return true; @@ -1689,12 +1690,6 @@ fhandler_pty_master::fixup_after_fork (HANDLE parent) if (arch->dwProcessId != wpid) { tty& t = *get_ttyp (); - if (!DuplicateHandle (parent, arch->from_master, GetCurrentProcess (), - &arch->from_master, 0, false, DUPLICATE_SAME_ACCESS)) - system_printf ("couldn't duplicate from_parent(%p), %E", arch->from_master); - if (!DuplicateHandle (parent, arch->to_master, GetCurrentProcess (), - &arch->to_master, 0, false, DUPLICATE_SAME_ACCESS)) - system_printf ("couldn't duplicate to_parent(%p), %E", arch->from_master); if (myself->pid == t.master_pid) { t.from_master = arch->from_master; |