* 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
This commit is contained in:
nobu 2008-10-26 04:30:45 +00:00
Родитель c68aaa94f7
Коммит 0db5641dae
2 изменённых файлов: 7 добавлений и 1 удалений

Просмотреть файл

@ -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> Sun Oct 26 07:57:35 2008 Eric Hodel <drbrain@segment7.net>
* lib/rubygems*: Update to RubyGems 1.3.1 r1909. * lib/rubygems*: Update to RubyGems 1.3.1 r1909.

2
io.c
Просмотреть файл

@ -1556,7 +1556,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
int cr; int cr;
if (NEED_READCONV(fptr)) { if (NEED_READCONV(fptr)) {
VALUE str = rb_str_new(NULL, 0); if (!NIL_P(str)) rb_str_set_len(str, 0);
make_readconv(fptr); make_readconv(fptr);
while (1) { while (1) {
if (fptr->cbuf_len) { if (fptr->cbuf_len) {