summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-04-15 01:25:04 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-04-15 21:05:39 +0900
commit155f64e3c4ba23f0e85e8d69facceb21a487dccd (patch)
treef0c79b8bc3ddeedd98326dc45a5dd8cfc1917d08 /io.c
parentd72fd1e45b192ab507f8170ceec1328c2aae7bb1 (diff)
Raise EPIPE at broken pipe for the backward compatibility
Instead of SignalException for SIGPIPE, raise `Errno::EPIPE` with instance variable `signo` and re-send that signal at exit. [Feature #14413]
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3035
Diffstat (limited to 'io.c')
-rw-r--r--io.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/io.c b/io.c
index 4be5f05d2f..7f43ca36d6 100644
--- a/io.c
+++ b/io.c
@@ -545,10 +545,12 @@ static rb_io_t *flush_before_seek(rb_io_t *fptr);
(fptr)->mode |= FMODE_SIGNAL_ON_EPIPE : \
(fptr)->mode &= ~FMODE_SIGNAL_ON_EPIPE)
-static int
-errno_on_write(rb_io_t *fptr)
+extern ID ruby_static_id_signo;
+
+NORETURN(static void raise_on_write(rb_io_t *fptr, int e, VALUE errinfo));
+static void
+raise_on_write(rb_io_t *fptr, int e, VALUE errinfo)
{
- int e = errno;
#if defined EPIPE
if (fptr_signal_on_epipe(fptr) && (e == EPIPE)) {
const VALUE sig =
@@ -556,14 +558,17 @@ errno_on_write(rb_io_t *fptr)
INT2FIX(SIGPIPE) - INT2FIX(0) +
# endif
INT2FIX(0);
- rb_exc_raise(rb_class_new_instance(1, &sig, rb_eSignal));
+ rb_ivar_set(errinfo, ruby_static_id_signo, sig);
}
#endif
- return e;
+ rb_exc_raise(errinfo);
}
#define rb_sys_fail_on_write(fptr) \
- rb_syserr_fail_path(errno_on_write(fptr), (fptr)->pathv)
+ do { \
+ int e = errno; \
+ raise_on_write(fptr, e, rb_syserr_new_path(e, (fptr)->pathv)); \
+ } while (0)
#define NEED_NEWLINE_DECORATOR_ON_READ(fptr) ((fptr)->mode & FMODE_TEXTMODE)
#define NEED_NEWLINE_DECORATOR_ON_WRITE(fptr) ((fptr)->mode & FMODE_TEXTMODE)