Skip to content

Commit 87c9373

Browse files
akrCharlie Somerville
authored and
Charlie Somerville
committed
* process.c (READ_FROM_CHILD): Apply the last hunk of
0001-process.c-avoid-EINTR-from-Process.spawn.patch written by Eric Wong in [Bug ruby#8770]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 32a7d17 commit 87c9373

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

process.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3362,7 +3362,7 @@ recv_child_error(int fd, int *statep, VALUE *excp, int *errp, char *errmsg, size
33623362
*excp = exc;
33633363
}
33643364
#define READ_FROM_CHILD(ptr, len) \
3365-
(NIL_P(io) ? read(fd, (ptr), (len)) : rb_io_bufread(io, (ptr), (len)))
3365+
(NIL_P(io) ? read_retry(fd, (ptr), (len)) : rb_io_bufread(io, (ptr), (len)))
33663366
if ((size = READ_FROM_CHILD(&err, sizeof(err))) < 0) {
33673367
err = errno;
33683368
}

0 commit comments

Comments
 (0)