From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id B30013857C6F; Tue, 14 Sep 2021 15:07:04 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B30013857C6F
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: pipes: handle signals and thread cancellation
 in blocking mode only
X-Act-Checkin: newlib-cygwin
X-Git-Author: Corinna Vinschen <corinna@vinschen.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 4003e3dfa1b9bfee12d686f016353a1e20b51e74
X-Git-Newrev: 9d7fd8d416e678b453fafff8590cd1ec7027c42b
Message-Id: <20210914150704.B30013857C6F@sourceware.org>
Date: Tue, 14 Sep 2021 15:07:04 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Tue, 14 Sep 2021 15:07:04 -0000

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9d7fd8d416e678b453fafff8590cd1ec7027c42b

commit 9d7fd8d416e678b453fafff8590cd1ec7027c42b
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Tue Sep 7 11:14:09 2021 +0200

    Cygwin: pipes: handle signals and thread cancellation in blocking mode only
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/fhandler_pipe.cc | 56 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
index 8041a5d51..4bd807a09 100644
--- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler_pipe.cc
@@ -301,21 +301,21 @@ fhandler_pipe::raw_read (void *ptr, size_t& len)
 	  CancelIo (get_handle ());
 	  if (waitret == WAIT_SIGNALED && io.Status != STATUS_CANCELLED)
 	    waitret = WAIT_OBJECT_0;
-	  if (waitret == WAIT_OBJECT_0)
-	    status = io.Status;
-	}
-      if (waitret == WAIT_CANCELED)
-	{
-	  status = STATUS_THREAD_CANCELED;
-	  break;
-	}
-      else if (waitret == WAIT_SIGNALED)
-	{
-	  status = STATUS_THREAD_SIGNALED;
-	  nbytes += io.Information;
-	  break;
+
+	  if (waitret == WAIT_CANCELED)
+	    {
+	      status = STATUS_THREAD_CANCELED;
+	      break;
+	    }
+	  else if (waitret == WAIT_SIGNALED)
+	    {
+	      status = STATUS_THREAD_SIGNALED;
+	      nbytes += io.Information;
+	      break;
+	    }
+	  status = io.Status;
 	}
-      else if (isclosed ())  /* A signal handler might have closed the fd. */
+      if (isclosed ())  /* A signal handler might have closed the fd. */
 	{
 	  if (waitret == WAIT_OBJECT_0)
 	    set_errno (EBADF);
@@ -460,21 +460,21 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
 	  CancelIo (get_handle ());
 	  if (waitret == WAIT_SIGNALED && io.Status != STATUS_CANCELLED)
 	    waitret = WAIT_OBJECT_0;
-	  if (waitret == WAIT_OBJECT_0)
-	    status = io.Status;
-	}
-      if (waitret == WAIT_CANCELED)
-	{
-	  status = STATUS_THREAD_CANCELED;
-	  break;
-	}
-      else if (waitret == WAIT_SIGNALED)
-	{
-	  status = STATUS_THREAD_SIGNALED;
-	  nbytes += io.Information;
-	  break;
+
+	  if (waitret == WAIT_CANCELED)
+	    {
+	      status = STATUS_THREAD_CANCELED;
+	      break;
+	    }
+	  else if (waitret == WAIT_SIGNALED)
+	    {
+	      status = STATUS_THREAD_SIGNALED;
+	      nbytes += io.Information;
+	      break;
+	    }
+	  status = io.Status;
 	}
-      else if (isclosed ())  /* A signal handler might have closed the fd. */
+      if (isclosed ())  /* A signal handler might have closed the fd. */
 	{
 	  if (waitret == WAIT_OBJECT_0)
 	    set_errno (EBADF);