[newlib-cygwin] Cygwin: pipe: Fix handling of EPIPE and SIGPIPE in raw_write().
Corinna Vinschen
corinna@sourceware.org
Tue Sep 14 15:08:20 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a217fa98fda80a7b706e93b6a55a0a8b26f2d586
commit a217fa98fda80a7b706e93b6a55a0a8b26f2d586
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Tue Sep 14 20:59:08 2021 +0900
Cygwin: pipe: Fix handling of EPIPE and SIGPIPE in raw_write().
Diff:
---
winsup/cygwin/fhandler_pipe.cc | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc
index 7e5ab328c..c2f4353f6 100644
--- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler_pipe.cc
@@ -407,6 +407,13 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
if (!len)
return 0;
+ if (reader_closed ())
+ {
+ set_errno (EPIPE);
+ raise (SIGPIPE);
+ return -1;
+ }
+
if (len <= pipe_buf_size)
chunk = len;
else if (is_nonblocking ())
@@ -475,7 +482,7 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
CancelIo (get_handle ());
set_errno (EPIPE);
raise (SIGPIPE);
- break;
+ goto out;
}
else
cygwait (select_sem, 10);
@@ -527,6 +534,7 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len)
if (nbytes_now == 0)
break;
}
+out:
if (evt)
CloseHandle (evt);
if (status == STATUS_THREAD_SIGNALED && nbytes == 0)
More information about the Cygwin-cvs
mailing list