diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-26 14:52:40 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-26 14:52:40 +0000 |
commit | 8245026372eef8613dff0c008f0f4922fd0f2b24 (patch) | |
tree | f3ac464d5ad02d783bc0720e9623af57b739a693 | |
parent | 8a0d7d99aecac37ea0235c0714c22e17de858903 (diff) |
* io.c (rb_io_getline): rs modification check should not interfere in the loop.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | io.c | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -1,6 +1,10 @@ +Tue Oct 26 23:52:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (rb_io_getline): rs modification check should not interfere in the loop. + Tue Oct 26 23:30:39 2004 Dave Thomas <dave@pragprog.com> - * lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module): + * lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module): Restore correct :nopdoc: behavior with nested classes and modules. Mon Oct 25 18:35:39 2004 WATANABE Hirofumi <eban@ruby-lang.org> @@ -1301,7 +1301,7 @@ rb_io_getline(rs, fptr) while ((c = appendline(fptr, newline, &str)) != EOF && (c != newline || RSTRING(str)->len < rslen || - (rspara || rscheck(rsptr,rslen,rs)) || + (rspara || rscheck(rsptr,rslen,rs), 0) || memcmp(RSTRING(str)->ptr+RSTRING(str)->len-rslen,rsptr,rslen))); if (rspara) { |