From 4abaf3a579a3fd4a748dcaef83f3a2912db48c23 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 6 Dec 2006 14:58:46 +0000 Subject: [PATCH] * win32/win32.c (init_stdhandle): redirect unopened IOs to NUL. [ruby-core:09572] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- win32/win32.c | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1febdabba7..8c6b376b04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,11 @@ -Wed Dec 6 23:56:14 2006 Nobuyoshi Nakada +Wed Dec 6 23:58:36 2006 Nobuyoshi Nakada * Makefile.in, common.mk (NULLCMD): moved for platforms that empty command does not run. fixed: [ruby-dev:29994] + * win32/win32.c (init_stdhandle): redirect unopened IOs to NUL. + [ruby-core:09572] + Tue Dec 5 19:01:42 2006 WATANABE Hirofumi * configure.in (SITE_DIR): fixed to emtpy RUBY_SITE_LIB in config.h on diff --git a/win32/win32.c b/win32/win32.c index a8e755e1ff..a50a5f4808 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1731,15 +1731,24 @@ rb_w32_open_osfhandle(long osfhandle, int flags) static void init_stdhandle(void) { + int nullfd = -1; + int keep = 0; +#define open_null(fd) \ + (((nullfd < 0) ? \ + (nullfd = open("NUL", O_RDWR|O_BINARY)) : 0), \ + ((nullfd == (fd)) ? (keep = 1) : dup2(nullfd, fd)), \ + (fd)) + if (fileno(stdin) < 0) { - stdin->_file = 0; + stdin->_file = open_null(0); } if (fileno(stdout) < 0) { - stdout->_file = 1; + stdout->_file = open_null(1); } if (fileno(stderr) < 0) { - stderr->_file = 2; + stderr->_file = open_null(2); } + if (nullfd >= 0 && !keep) close(nullfd); } #else