зеркало из https://github.com/github/ruby.git
win32.c: EPIPE for ERROR_NO_DATA
* win32/win32.c (rb_w32_write): writing to closed pipe fails with ERROR_NO_DATA but msvcrt maps it to EINVAL. map it to EPIPE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
6381d49801
Коммит
044e6f12be
|
@ -27,4 +27,23 @@ class TestPipe < Test::Unit::TestCase
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
def test_stdout_epipe
|
||||
assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
|
||||
begin;
|
||||
io = STDOUT
|
||||
begin
|
||||
save = io.dup
|
||||
IO.popen("echo", "w", out: IO::NULL) do |f|
|
||||
io.reopen(f)
|
||||
Process.wait(f.pid)
|
||||
assert_raise(Errno::EPIPE) do
|
||||
io.print "foo\n"
|
||||
end
|
||||
end
|
||||
ensure
|
||||
io.reopen(save)
|
||||
end
|
||||
end;
|
||||
end
|
||||
end
|
||||
|
|
|
@ -7119,7 +7119,11 @@ rb_w32_write(int fd, const void *buf, size_t size)
|
|||
|
||||
if ((_osfile(fd) & FTEXT) &&
|
||||
(!(_osfile(fd) & FPIPE) || fd == fileno(stdout) || fd == fileno(stderr))) {
|
||||
return _write(fd, buf, size);
|
||||
ssize_t w = _write(fd, buf, size);
|
||||
if (w == (ssize_t)-1 && errno == EINVAL) {
|
||||
errno = map_errno(GetLastError());
|
||||
}
|
||||
return w;
|
||||
}
|
||||
|
||||
rb_acrt_lowio_lock_fh(fd);
|
||||
|
|
Загрузка…
Ссылка в новой задаче