From 1f3a98202ff02eddb7b553851c003854a1d29ee1 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 27 May 2010 13:39:52 +0000 Subject: merge from trunk (r28035) * win32/win32.c (rb_w32_read): call ReadFile() with len = 0 before reading really on console, because the first ReadFile() call after PeekConsoleInput() always returns broken data. (Windows's bug). [ruby-core:29018] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'win32') diff --git a/win32/win32.c b/win32/win32.c index bd4aa3ce30..7f46622dd5 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -5028,6 +5028,7 @@ rb_w32_read(int fd, void *buf, size_t size) size_t len; size_t ret; OVERLAPPED ol, *pol = NULL; + int start = 0; if (is_socket(sock)) return rb_w32_recv(fd, buf, size, 0); @@ -5050,8 +5051,17 @@ rb_w32_read(int fd, void *buf, size_t size) ret = 0; retry: - /* get rid of console writing bug */ - len = (_osfile(fd) & FDEV) ? min(16 * 1024, size) : size; + /* get rid of console reading bug */ + if (is_console(_osfhnd(fd))) { + if (start) + len = min(16 * 1024, size); + else { + len = 0; + start = 1; + } + } + else + len = size; size -= len; /* if have cancel_io, use Overlapped I/O */ -- cgit v1.2.3