diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-26 04:30:45 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-26 04:30:45 +0000 |
commit | 0db5641dae711ccb3e34cc195e14f95571c22f90 (patch) | |
tree | 3cc6837b7abd9b1d9c407d109dda0b8000754278 | |
parent | c68aaa94f713299799708b53993fe29c14d7a87c (diff) |
* io.c (read_all): use the given buffer to read when needs readconv.
based on the patch by wanabe <s.wanabe AT gmail.com> at
[ruby-dev:36931].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | io.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sun Oct 26 13:30:28 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (read_all): use the given buffer to read when needs readconv. + based on the patch by wanabe <s.wanabe AT gmail.com> at + [ruby-dev:36931]. + Sun Oct 26 07:57:35 2008 Eric Hodel <drbrain@segment7.net> * lib/rubygems*: Update to RubyGems 1.3.1 r1909. @@ -1556,7 +1556,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str) int cr; if (NEED_READCONV(fptr)) { - VALUE str = rb_str_new(NULL, 0); + if (!NIL_P(str)) rb_str_set_len(str, 0); make_readconv(fptr); while (1) { if (fptr->cbuf_len) { |