From f68760070127530a2f06205d3f71a594582fe7f7 Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 30 Aug 2008 11:06:52 +0000 Subject: * win32/win32.c (rb_w32_open, rb_w32_read, rb_w32_write): fallback to MSVCRT if text mode is specified. this case will not be used from ruby itself. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'win32') diff --git a/win32/win32.c b/win32/win32.c index 761014057..c06aeffff 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4007,6 +4007,15 @@ rb_w32_open(const char *file, int oflag, ...) SECURITY_ATTRIBUTES sec; HANDLE h; + if ((oflag & O_TEXT) || !(oflag & ~O_BINARY)) { + va_list arg; + int pmode; + va_start(arg, oflag); + pmode = va_arg(arg, int); + va_end(arg); + return _open(file, oflag, pmode); + } + sec.nLength = sizeof(sec); sec.lpSecurityDescriptor = NULL; if (oflag & O_NOINHERIT) { @@ -4313,6 +4322,10 @@ rb_w32_read(int fd, void *buf, size_t size) return -1; } + if (_osfile(fd) & FTEXT) { + return _read(fd, buf, size); + } + MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock))); if (!size || _osfile(fd) & FEOFLAG) { @@ -4423,6 +4436,10 @@ rb_w32_write(int fd, const void *buf, size_t size) return -1; } + if (_osfile(fd) & FTEXT) { + return _write(fd, buf, size); + } + MTHREAD_ONLY(EnterCriticalSection(&(_pioinfo(fd)->lock))); if (!size || _osfile(fd) & FEOFLAG) { -- cgit