diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-21 14:48:03 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-21 14:48:03 +0000 |
commit | ce1a4ee112f3796381cc7fc24ac4e7d145f9409a (patch) | |
tree | ca483353f39cdfec237c3d811f57f8f37f593c1e /ext/stringio | |
parent | 6fac4c5f9f994a0eb95281e79b27a01bc4e6bf29 (diff) |
merges r23424 from trunk into ruby_1_9_1.
--
* ext/stringio/stringio.c (strio_ungetbyte): encoding should not
be effective.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/stringio')
-rw-r--r-- | ext/stringio/stringio.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index ce1d55fd46..4e24a4723a 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -744,8 +744,37 @@ strio_ungetc(VALUE self, VALUE c) static VALUE strio_ungetbyte(VALUE self, VALUE c) { - NUM2INT(c); - return strio_ungetc(self, c); + struct StringIO *ptr = readable(StringIO(self)); + char buf[1], *cp = buf; + long pos = ptr->pos, cl = 1; + VALUE str = ptr->string; + + if (NIL_P(c)) return Qnil; + if (FIXNUM_P(c)) { + buf[0] = (char)FIX2INT(c); + } + else { + SafeStringValue(c); + cp = RSTRING_PTR(c); + cl = RSTRING_LEN(c); + if (cl == 0) return Qnil; + } + rb_str_modify(str); + if (cl > pos) { + char *s; + long rest = RSTRING_LEN(str) - pos; + rb_str_resize(str, rest + cl); + s = RSTRING_PTR(str); + memmove(s + cl, s + pos, rest); + pos = 0; + } + else { + pos -= cl; + } + memcpy(RSTRING_PTR(str) + pos, cp, cl); + ptr->pos = pos; + RB_GC_GUARD(c); + return Qnil; } /* |