diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-10 08:54:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-10 08:54:40 +0000 |
| commit | 53f3fb6e551f68a64a08d471140aebff64345a96 (patch) | |
| tree | dde00c0acb36d195dbea52b14403e9e07cd45233 /ext | |
| parent | 71dc2cfe04b7b560b87d95f32d3bb06233c726e8 (diff) | |
| download | ruby-53f3fb6e551f68a64a08d471140aebff64345a96.tar.gz | |
stringio.c: chomp CR
* ext/stringio/stringio.c (strio_getline): chomp CR not only LF,
as well as String#chomp.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/stringio/stringio.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index ff2a544af6..fb2eddaa7e 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -1041,6 +1041,7 @@ static inline int chomp_newline_width(const char *s, const char *e) { if (e > s && *--e == '\n') { + if (e > s && *--e == '\r') return 2; return 1; } return 0; @@ -1071,7 +1072,8 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr) } else if ((n = RSTRING_LEN(str)) == 0) { p = s; - while (*p == '\n') { + while (p[(p + 1 < e) && (*p == '\r') && 0] == '\n') { + p += *p == '\r'; if (++p == e) { return Qnil; } @@ -1083,6 +1085,11 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr) w = (arg->chomp ? 1 : 0); break; } + else if (*p == '\r' && p < e && p[1] == '\n') { + e = p + 2; + w = (arg->chomp ? 2 : 0); + break; + } } if (!w && arg->chomp) { w = chomp_newline_width(s, e); @@ -1092,7 +1099,7 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr) else if (n == 1) { if ((p = memchr(s, RSTRING_PTR(str)[0], e - s)) != 0) { e = p + 1; - w = (arg->chomp ? 1 : 0); + w = (arg->chomp ? (p > s && *(p-1) == '\r') + 1 : 0); } str = strio_substr(ptr, ptr->pos, e - s - w); } |