diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/stringio/stringio.c | 25 |
2 files changed, 22 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Sat Nov 8 17:47:28 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/stringio/stringio.c (strio_ungetc): should allow ungetc at + the top of the buffer. ref #701 + Sat Nov 8 01:38:07 2008 NARUSE, Yui <naruse@ruby-lang.org> * ext/nkf/nkf-utf8/nkf.c (h_conv): can't guess UTF-8 input in diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 7838c51aa2..3ed7d6b1af 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -781,15 +781,24 @@ strio_ungetc(self, ch) int cc = NUM2INT(ch); long len, pos = ptr->pos; - if (cc != EOF && pos > 0) { - if ((len = RSTRING(ptr->string)->len) < pos-- || - (unsigned char)RSTRING(ptr->string)->ptr[pos] != - (unsigned char)cc) { - strio_extend(ptr, pos, 1); - RSTRING(ptr->string)->ptr[pos] = cc; - OBJ_INFECT(ptr->string, self); + if (cc != EOF) { + len = RSTRING(ptr->string)->len; + if (pos == 0) { + char *p; + rb_str_resize(ptr->string, len + 1); + p = RSTRING(ptr->string)->ptr; + memmove(p + 1, p, len); + } + else { + if (len < pos-- || + (unsigned char)RSTRING(ptr->string)->ptr[pos] != + (unsigned char)cc) { + strio_extend(ptr, pos, 1); + } + --ptr->pos; } - --ptr->pos; + RSTRING(ptr->string)->ptr[pos] = cc; + OBJ_INFECT(ptr->string, self); ptr->flags &= ~STRIO_EOF; } return Qnil; |