diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-21 17:27:56 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-21 17:27:56 +0000 |
commit | b524523217b51e864c010646ffd5cbc4154d2fd3 (patch) | |
tree | 70844b11aaa2e3c6d67f9628e4b011a322900039 /io.c | |
parent | 1d78315845bcc7800315acbeb6b0a804e745a257 (diff) |
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1723,7 +1723,7 @@ rb_io_getline(rs, io) while ((c = appendline(fptr, newline, &str)) != EOF && (c != newline || RSTRING(str)->len < rslen || - (rspara || rscheck(rsptr,rslen,rs), 0) || + ((rspara || rscheck(rsptr,rslen,rs)) && 0) || memcmp(RSTRING(str)->ptr+RSTRING(str)->len-rslen,rsptr,rslen))); if (rspara) { |