From 965cc3c3aad4e7b106debe7c3870ef1d537aad8f Mon Sep 17 00:00:00 2001 From: Julian Brown Date: Sun, 17 May 2009 13:07:08 +0000 Subject: [PATCH] pex-win32.c (pex_win32_exec_child): Fix logic to avoid closing standard handles (stdin, stdout, stderr) in parent. libiberty/ * pex-win32.c (pex_win32_exec_child): Fix logic to avoid closing standard handles (stdin, stdout, stderr) in parent. From-SVN: r147634 --- libiberty/ChangeLog | 5 +++++ libiberty/pex-win32.c | 17 +++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 13c7fd5dd1f..75e76d679d6 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2009-05-17 Julian Brown + + * pex-win32.c (pex_win32_exec_child): Fix logic to avoid closing + standard handles (stdin, stdout, stderr) in parent. + 2009-04-29 Julian Brown * pex-win32.c (pex_win32_pipe): Add _O_NOINHERIT. diff --git a/libiberty/pex-win32.c b/libiberty/pex-win32.c index 30ef4359200..91e0bc882ff 100644 --- a/libiberty/pex-win32.c +++ b/libiberty/pex-win32.c @@ -753,17 +753,20 @@ pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags, original descriptors. */ orig_in = in; in = _dup (orig_in); - _close (orig_in); + if (orig_in != STDIN_FILENO) + _close (orig_in); orig_out = out; out = _dup (orig_out); - _close (orig_out); + if (orig_out != STDOUT_FILENO) + _close (orig_out); if (separate_stderr) { orig_err = errdes; errdes = _dup (orig_err); - _close (orig_err); + if (orig_err != STDERR_FILENO) + _close (orig_err); } stdin_handle = INVALID_HANDLE_VALUE; @@ -844,11 +847,9 @@ pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags, /* Close the standard input, standard output and standard error handles in the parent. */ - if (in != STDIN_FILENO) - _close (in); - if (out != STDOUT_FILENO) - _close (out); - if (errdes != STDERR_FILENO) + _close (in); + _close (out); + if (separate_stderr) _close (errdes); return pid;