diff options
Diffstat (limited to 'ext/io/nonblock/nonblock.c')
| -rw-r--r-- | ext/io/nonblock/nonblock.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/io/nonblock/nonblock.c b/ext/io/nonblock/nonblock.c index 2c5c298126..2509329f6c 100644 --- a/ext/io/nonblock/nonblock.c +++ b/ext/io/nonblock/nonblock.c @@ -50,21 +50,22 @@ rb_io_nonblock_p(VALUE io) #endif #ifdef F_SETFL -static void +static int io_nonblock_set(int fd, int f, int nb) { if (nb) { if ((f & O_NONBLOCK) != 0) - return; + return 0; f |= O_NONBLOCK; } else { if ((f & O_NONBLOCK) == 0) - return; + return 0; f &= ~O_NONBLOCK; } if (fcntl(fd, F_SETFL, f) == -1) rb_sys_fail(0); + return 1; } /* @@ -121,7 +122,8 @@ rb_io_nonblock_block(int argc, VALUE *argv, VALUE io) f = io_nonblock_mode(fptr->fd); restore[0] = fptr->fd; restore[1] = f; - io_nonblock_set(fptr->fd, f, nb); + if (!io_nonblock_set(fptr->fd, f, nb)) + return rb_yield(io); return rb_ensure(rb_yield, io, io_nonblock_restore, (VALUE)restore); } #else |