diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ext/stringio/stringio.c | 7 | ||||
| -rw-r--r-- | test/ruby/ut_eof.rb | 3 |
3 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Dec 10 17:54:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/stringio/stringio.c (strio_read): do not set EOF flag when + requested length is zero. [ruby-dev:22214] + Wed Dec 10 17:17:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org> * io.c (read_all): should return given string even if data read is @@ -11,8 +16,8 @@ Wed Dec 10 17:16:06 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/ruby/ut_eof.rb (TestEOF::Seek): test behaviors at reading beyond EOF. - * test/ruby/test_file.rb, * test/stringio/test_stringio.rb: - include TestEOF::Seek test case. + * test/ruby/test_file.rb, test/stringio/test_stringio.rb: include + TestEOF::Seek test case. Wed Dec 10 15:01:19 2003 Shugo Maeda <shugo@ruby-lang.org> diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index f94c860728..2d0229acca 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -836,12 +836,12 @@ strio_read(argc, argv, self) { struct StringIO *ptr = readable(StringIO(self)); VALUE str; - long len; + long len, olen; switch (argc) { case 1: if (!NIL_P(argv[0])) { - len = NUM2LONG(argv[0]); + len = olen = NUM2LONG(argv[0]); if (len < 0) { rb_raise(rb_eArgError, "negative length %ld given", len); } @@ -856,6 +856,7 @@ strio_read(argc, argv, self) } /* fall through */ case 0: + olen = -1; len = RSTRING(ptr->string)->len - ptr->pos; if (len == 0 && ptr->pos == RSTRING(ptr->string)->len) { if (ptr->flags & STRIO_EOF) return Qnil; @@ -868,7 +869,7 @@ strio_read(argc, argv, self) str = rb_str_substr(ptr->string, ptr->pos, len); if (NIL_P(str)) { if (!(ptr->flags & STRIO_EOF)) str = rb_str_new(0, 0); - ptr->flags |= STRIO_EOF; + if (olen) ptr->flags |= STRIO_EOF; } else { ptr->pos += RSTRING(str)->len; diff --git a/test/ruby/ut_eof.rb b/test/ruby/ut_eof.rb index ffd9ba65ab..efb9f77d83 100644 --- a/test/ruby/ut_eof.rb +++ b/test/ruby/ut_eof.rb @@ -64,7 +64,10 @@ module TestEOF def test_eof_0_seek open_file_seek("", 10) {|f| + assert_equal(10, f.pos) + assert_equal("", f.read(0)) assert_equal("", f.read) + assert_equal(nil, f.read(0)) assert_equal(nil, f.read) } end |