diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-01 21:03:22 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-01 21:03:22 +0000 |
| commit | 26e1ebdc1e3a26edada728000bb25b040d7ff4cc (patch) | |
| tree | e86d8dc5933ad511141b78d9c107d94cde11316f | |
| parent | 40564c1e3b187fc593001ae80522e577dbb8eb50 (diff) | |
io/wait: fix return value for buffered read
* ext/io/wait/wait.c (io_nread): wrap return value with INT2FIX
Thanks to Yura Sokolov <funny.falcon@gmail.com>
[ruby-core:68369] [Bug#10923]
* test/io/wait/test_io_wait.rb (test_nread_buffered):
fix broken test
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/io/wait/wait.c | 2 | ||||
| -rw-r--r-- | test/io/wait/test_io_wait.rb | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Mon Mar 2 06:01:41 2015 Eric Wong <e@80x24.org> + + * ext/io/wait/wait.c (io_nread): wrap return value with INT2FIX + Thanks to Yura Sokolov <funny.falcon@gmail.com> + [ruby-core:68369] [Bug#10923] + * test/io/wait/test_io_wait.rb (test_nread_buffered): + fix broken test + Sun Mar 1 20:21:16 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (RUBY_REPLACE_TYPE): restore convertible type from diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c index 7e17cb2e89..fd32be79b1 100644 --- a/ext/io/wait/wait.c +++ b/ext/io/wait/wait.c @@ -62,7 +62,7 @@ io_nread(VALUE io) GetOpenFile(io, fptr); rb_io_check_readable(fptr); len = rb_io_read_pending(fptr); - if (len > 0) return len; + if (len > 0) return INT2FIX(len); if (!FIONREAD_POSSIBLE_P(fptr->fd)) return INT2FIX(0); if (ioctl(fptr->fd, FIONREAD, &n)) return INT2FIX(0); if (n > 0) return ioctl_arg2num(n); diff --git a/test/io/wait/test_io_wait.rb b/test/io/wait/test_io_wait.rb index 9d883aa821..7729d45526 100644 --- a/test/io/wait/test_io_wait.rb +++ b/test/io/wait/test_io_wait.rb @@ -31,7 +31,7 @@ class TestIOWait < Test::Unit::TestCase def test_nread_buffered @w.syswrite ".\n!" - assert_equal ".\n", @r.read(2) + assert_equal ".\n", @r.gets assert_equal 1, @r.nread end |