diff options
| author | Yasuhiro Matsumoto <[email protected]> | 2015-09-29 21:22:25 +0900 |
|---|---|---|
| committer | Yasuhiro Matsumoto <[email protected]> | 2015-09-29 21:22:45 +0900 |
| commit | d5f145076ce11ed4e47e11af065ee9e36bf5f369 (patch) | |
| tree | 10a24eb2831b84feaa0d956d987386b265ed0e6e /src | |
| parent | 2eb2f5b408d56249453f15e79bb3e01688afdfdc (diff) | |
| download | mruby-d5f145076ce11ed4e47e11af065ee9e36bf5f369.tar.gz mruby-d5f145076ce11ed4e47e11af065ee9e36bf5f369.zip | |
chop with utf-8. fix #2967
Diffstat (limited to 'src')
| -rw-r--r-- | src/string.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/string.c b/src/string.c index 6cad6a4ac..b597c3da9 100644 --- a/src/string.c +++ b/src/string.c @@ -1318,7 +1318,18 @@ mrb_str_chop_bang(mrb_state *mrb, mrb_value str) mrb_str_modify(mrb, s); if (RSTR_LEN(s) > 0) { mrb_int len; +#ifdef MRB_UTF8_STRING + const char* t = RSTR_PTR(s), *p = t; + const char* e = p + RSTR_LEN(s); + while (p<e) { + mrb_int clen = utf8len(p, e); + if (p + clen>=e) break; + p += clen; + } + len = p - t; +#else len = RSTR_LEN(s) - 1; +#endif if (RSTR_PTR(s)[len] == '\n') { if (len > 0 && RSTR_PTR(s)[len-1] == '\r') { |