JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_tty.cc (close_maybe): Check for both types of invalid handle before

Browse Source 
attempting CloseHandle.
(fhandler_pty_master::setup): Only set inheritance on pty handles, not tty
handles.
This commit is contained in:
Christopher Faylor 2008-08-27 21:55:19 +00:00
parent cbeb458829
commit 5f05c64ce4
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2008-08-27 Christopher Faylor <me+cygwin@cgf.cx>
* fhandler_tty.cc (close_maybe): Check for both types of invalid handle
before attempting CloseHandle.
(fhandler_pty_master::setup): Only set inheritance on pty handles, not
tty handles.
2008-08-26 Christopher Faylor <me+cygwin@cgf.cx> 2008-08-26 Christopher Faylor <me+cygwin@cgf.cx>
* shared_info.h (shared_info::create_root_entry): Remove extraneous * shared_info.h (shared_info::create_root_entry): Remove extraneous

14
winsup/cygwin/fhandler_tty.cc
View File

@ -1339,7 +1339,7 @@ fhandler_tty_master::init_console ()
#define close_maybe(h) \ #define close_maybe(h) \
do { \ do { \
if (h) \ if (h && h != INVALID_HANDLE_VALUE) \
CloseHandle (h); \ CloseHandle (h); \
} while (0) } while (0)
@ -1356,10 +1356,6 @@ fhandler_pty_master::setup (bool ispty)
/* Create communication pipes */ /* Create communication pipes */
/* FIXME: should this be sec_none_nih? */
/* Create communication pipes */
char pipename[sizeof("ttyNNNN-from-master")]; char pipename[sizeof("ttyNNNN-from-master")];
__small_sprintf (pipename, "tty%d-from-master", get_unit ()); __small_sprintf (pipename, "tty%d-from-master", get_unit ());
res = fhandler_pipe::create_selectable (&sec_none_nih, from_master, res = fhandler_pipe::create_selectable (&sec_none_nih, from_master,
@ -1370,7 +1366,9 @@ fhandler_pty_master::setup (bool ispty)
errstr = "input pipe"; errstr = "input pipe";
goto err; goto err;
} }
if (!SetHandleInformation (get_output_handle (), HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT)) /* Only ptys should create inheritable handles by default. ttys are
parcelled out on an as-needed basis and handle inheritance differently. */
if (ispty && !SetHandleInformation (get_output_handle (), HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT))
{ {
errstr = "inheritable get_output_handle ()"; errstr = "inheritable get_output_handle ()";
goto err; goto err;
@ -1388,7 +1386,9 @@ fhandler_pty_master::setup (bool ispty)
errstr = "output pipe"; errstr = "output pipe";
goto err; goto err;
} }
if (!SetHandleInformation (get_io_handle (), HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT)) /* Only ptys should create inheritable handles by default. ttys are
parcelled out on an as-needed basis and handle inheritance differently. */
if (ispty && !SetHandleInformation (get_io_handle (), HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT))
{ {
errstr = "inheritable get_io_handle ()"; errstr = "inheritable get_io_handle ()";
goto err; goto err;