Skip to content

Commit

Permalink
* process.c (READ_FROM_CHILD): Apply the last hunk of
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
akr authored and Charlie Somerville committed Feb 16, 2014
1 parent 32a7d17 commit 87c9373
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion process.c
Original file line number Diff line number Diff line change
Expand Up @@ -3362,7 +3362,7 @@ recv_child_error(int fd, int *statep, VALUE *excp, int *errp, char *errmsg, size
*excp = exc;
}
#define READ_FROM_CHILD(ptr, len) \
(NIL_P(io) ? read(fd, (ptr), (len)) : rb_io_bufread(io, (ptr), (len)))
(NIL_P(io) ? read_retry(fd, (ptr), (len)) : rb_io_bufread(io, (ptr), (len)))
if ((size = READ_FROM_CHILD(&err, sizeof(err))) < 0) {
err = errno;
}
Expand Down

0 comments on commit 87c9373

Please sign in to comment.