summaryrefslogtreecommitdiffstats
path: root/ext/stringio/stringio.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-18 09:23:07 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-18 09:23:07 +0000
commit674c62c94c1f2a88a9f8017e7367b9dc1810438e (patch)
tree7d30f382804d06cb1d60fd451193287f148c920f /ext/stringio/stringio.c
parentfd03de79ea4c7446c73ed850239b584fc8783498 (diff)
downloadruby-674c62c94c1f2a88a9f8017e7367b9dc1810438e.tar.gz
ruby-674c62c94c1f2a88a9f8017e7367b9dc1810438e.tar.xz
ruby-674c62c94c1f2a88a9f8017e7367b9dc1810438e.zip
* test/stringio/test_stringio.rb: imported from [ruby-dev:21941].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/stringio/stringio.c')
-rw-r--r--ext/stringio/stringio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index d6d5b7694..0fb60069d 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -849,6 +849,9 @@ strio_read(argc, argv, self)
ptr->flags |= STRIO_EOF;
return Qnil;
}
+ else if (ptr->flags & STRIO_EOF) {
+ return Qnil;
+ }
break;
}
/* fall through */
@@ -856,6 +859,7 @@ strio_read(argc, argv, self)
len = RSTRING(ptr->string)->len - ptr->pos;
if (len == 0 && ptr->pos == RSTRING(ptr->string)->len) {
if (ptr->flags & STRIO_EOF) return Qnil;
+ ptr->flags |= STRIO_EOF;
}
break;
default: