From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2210) id 3E3E2396EC5C; Fri, 8 May 2020 11:29:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3E3E2396EC5C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ken Brown To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: FIFO: honor the flags argument in dup X-Act-Checkin: newlib-cygwin X-Git-Author: Ken Brown X-Git-Refname: refs/heads/master X-Git-Oldrev: 25e8727368a1565dac565bf89c5effced5f0ada2 X-Git-Newrev: 624fda1e96adf3c4de745115d97fe254d4be53e8 Message-Id: <20200508112932.3E3E2396EC5C@sourceware.org> Date: Fri, 8 May 2020 11:29:32 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2020 11:29:32 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=624fda1e96adf3c4de745115d97fe254d4be53e8 commit 624fda1e96adf3c4de745115d97fe254d4be53e8 Author: Ken Brown Date: Wed Mar 25 09:31:29 2020 -0400 Cygwin: FIFO: honor the flags argument in dup Also improve the error handling. Diff: --- winsup/cygwin/fhandler_fifo.cc | 60 +++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc index 44919c19e..f61e2fe72 100644 --- a/winsup/cygwin/fhandler_fifo.cc +++ b/winsup/cygwin/fhandler_fifo.cc @@ -955,56 +955,62 @@ fhandler_fifo::fcntl (int cmd, intptr_t arg) int fhandler_fifo::dup (fhandler_base *child, int flags) { - int ret = -1; + int i = 0; fhandler_fifo *fhf = NULL; if (get_flags () & O_PATH) return fhandler_base::dup (child, flags); if (fhandler_base::dup (child, flags)) - goto out; + goto err; fhf = (fhandler_fifo *) child; if (!DuplicateHandle (GetCurrentProcess (), read_ready, GetCurrentProcess (), &fhf->read_ready, - 0, true, DUPLICATE_SAME_ACCESS)) + 0, !(flags & O_CLOEXEC), DUPLICATE_SAME_ACCESS)) { - fhf->close (); __seterrno (); - goto out; + goto err; } if (!DuplicateHandle (GetCurrentProcess (), write_ready, GetCurrentProcess (), &fhf->write_ready, - 0, true, DUPLICATE_SAME_ACCESS)) + 0, !(flags & O_CLOEXEC), DUPLICATE_SAME_ACCESS)) { - NtClose (fhf->read_ready); - fhf->close (); __seterrno (); - goto out; + goto err_close_read_ready; } - fifo_client_lock (); - for (int i = 0; i < nhandlers; i++) + if (reader) { - if (!DuplicateHandle (GetCurrentProcess (), fc_handler[i].h, - GetCurrentProcess (), - &fhf->fc_handler[i].h, - 0, true, DUPLICATE_SAME_ACCESS)) + fifo_client_lock (); + for (i = 0; i < nhandlers; i++) + { + if (!DuplicateHandle (GetCurrentProcess (), fc_handler[i].h, + GetCurrentProcess (), &fhf->fc_handler[i].h, + 0, !(flags & O_CLOEXEC), DUPLICATE_SAME_ACCESS)) + { + __seterrno (); + break; + } + } + if (i < nhandlers) { fifo_client_unlock (); - NtClose (fhf->read_ready); - NtClose (fhf->write_ready); - fhf->close (); - __seterrno (); - goto out; + goto err_close_handlers; } + fifo_client_unlock (); + if (!fhf->listen_client ()) + goto err_close_handlers; + fhf->init_fixup_before (); } - fifo_client_unlock (); - if (!reader || fhf->listen_client ()) - ret = 0; - if (reader) - fhf->init_fixup_before (); -out: - return ret; + return 0; +err_close_handlers: + for (int j = 0; j < i; j++) + fhf->fc_handler[j].close (); + NtClose (fhf->write_ready); +err_close_read_ready: + NtClose (fhf->read_ready); +err: + return -1; } void