diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 15:57:52 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 15:57:52 +0000 |
| commit | 0773b9f1ba5a4cf1b17ef5eacc2db1d914c6c416 (patch) | |
| tree | 00b50c4b264d237624d19632bc9b086feaeac4a8 /ext/socket/ancdata.c | |
| parent | f109a742530ab466a6e5946561f4fdaf578f9c76 (diff) | |
| download | ruby-0773b9f1ba5a4cf1b17ef5eacc2db1d914c6c416.tar.gz ruby-0773b9f1ba5a4cf1b17ef5eacc2db1d914c6c416.tar.xz ruby-0773b9f1ba5a4cf1b17ef5eacc2db1d914c6c416.zip | |
* io.c (io_getpartial): error message describes what should be
waited after nonblocking error.
(rb_io_write_nonblock): ditto.
* ext/socket/init.c (s_recvfrom_nonblock): ditto.
(s_accept_nonblock): ditto.
* ext/socket/socket.c (sock_connect_nonblock): ditto.
* ext/socket/ancdata.c (bsock_sendmsg_internal): ditto.
(bsock_recvmsg_internal): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/ancdata.c')
| -rw-r--r-- | ext/socket/ancdata.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index e88829db9..f7763e90a 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1030,8 +1030,11 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) goto retry; } - if (ss == -1) + if (ss == -1) { + if (nonblock && errno == EWOULDBLOCK) + rb_sys_fail("sendmsg(2) WANT_WRITE"); rb_sys_fail("sendmsg(2)"); + } return SSIZET2NUM(ss); } @@ -1290,8 +1293,11 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) goto retry; } - if (ss == -1) + if (ss == -1) { + if (nonblock && errno == EWOULDBLOCK) + rb_sys_fail("recvmsg(2) WANT_READ"); rb_sys_fail("recvmsg(2)"); + } if (grow_buffer) { int grown = 0; |