From 9efb5a9d6a14d140b5b2e958e84974da02a07324 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 27 May 2011 18:06:42 +0000 Subject: [PATCH] * io.c (fill_cbuf): return MORE_CHAR_SUSPENDED when cbuf is not empty. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ io.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6b420094c9..6df7c12d3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat May 28 03:04:27 2011 NARUSE, Yui + + * io.c (fill_cbuf): return MORE_CHAR_SUSPENDED when cbuf is not empty. + Sat May 28 02:22:48 2011 KOSAKI Motohiro * string.c (rb_str_bytesize): rb_str_bytesize() should use LONG2NUM(). diff --git a/io.c b/io.c index 20d526dfe0..4e1945c549 100644 --- a/io.c +++ b/io.c @@ -1720,6 +1720,9 @@ fill_cbuf(rb_io_t *fptr, int ec_flags) } } } + if (cbuf_len0 != fptr->cbuf.len) + return MORE_CHAR_SUSPENDED; + return MORE_CHAR_FINISHED; }