From 77cab5d873609a576bb1ba9632c1b0083f6182bb Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 18 Jun 2008 09:32:03 +0000 Subject: * win32/win32.c (errmap): add some pipe errors. * win32/win32.c (rb_w32_write): set errno when CRT's errno is EINVAL for pipe errors. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'win32') diff --git a/win32/win32.c b/win32/win32.c index 813c4ee19..1d6b7c0ee 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -156,6 +156,14 @@ static struct { { ERROR_INFLOOP_IN_RELOC_CHAIN, ENOEXEC }, { ERROR_FILENAME_EXCED_RANGE, ENOENT }, { ERROR_NESTING_NOT_ALLOWED, EAGAIN }, +#ifndef ERROR_PIPE_LOCAL +#define ERROR_PIPE_LOCAL 229L +#endif + { ERROR_PIPE_LOCAL, EPIPE }, + { ERROR_BAD_PIPE, EPIPE }, + { ERROR_PIPE_BUSY, EAGAIN }, + { ERROR_NO_DATA, EPIPE }, + { ERROR_PIPE_NOT_CONNECTED, EPIPE }, { ERROR_NOT_ENOUGH_QUOTA, ENOMEM }, { WSAENAMETOOLONG, ENAMETOOLONG }, { WSAENOTEMPTY, ENOTEMPTY }, @@ -3873,8 +3881,12 @@ rb_w32_write(int fd, const void *buf, size_t size) { SOCKET sock = TO_SOCKET(fd); - if (!is_socket(sock)) - return write(fd, buf, size); + if (!is_socket(sock)) { + size_t ret = write(fd, buf, size); + if ((int)ret < 0 && errno == EINVAL) + errno = map_errno(GetLastError()); + return ret; + } else return rb_w32_send(fd, buf, size, 0); } -- cgit