diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win32/win32.c | 7 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Jan 28 09:33:33 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * win32/win32.c (rb_w32_read): fix an issue that $stdin.read doesn't + terminate by CTRL-C on Windows. + [ruby-dev:45149] [Bug #5812] + Sat Jan 28 08:18:11 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> * test/ruby/test_thread.rb diff --git a/win32/win32.c b/win32/win32.c index 9922fa5b14..744c61489e 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -5575,6 +5575,10 @@ rb_w32_read(int fd, void *buf, size_t size) } } } + else { + err = GetLastError(); + errno = map_errno(err); + } if (pol) { CloseHandle(ol.hEvent); @@ -5591,7 +5595,8 @@ rb_w32_read(int fd, void *buf, size_t size) ret += read; if (read >= len) { buf = (char *)buf + read; - if (!(isconsole && len == 1 && (!islineinput || *((char *)buf - 1) == '\n')) && size > 0) + if (err != ERROR_OPERATION_ABORTED && + !(isconsole && len == 1 && (!islineinput || *((char *)buf - 1) == '\n')) && size > 0) goto retry; } if (read == 0) |