fixup: cast in cpp, works on win2008, python things

nodejs · Mar 16, 2017 · a73e803 · addaleax · Mar 16, 2017 · addaleax
1 parent 15d4f8c
commit a73e803
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -4215,10 +4215,11 @@ inline void PlatformInit() {
 #endif  // __POSIX__
 #ifdef _WIN32
   for (int fd = 0; fd <= 2; ++fd) {
-    auto handle = (HANDLE) _get_osfhandle(fd);
+    auto handle = reinterpret_cast<HANDLE>(_get_osfhandle(fd));
     if (handle == INVALID_HANDLE_VALUE ||
         GetFileType(handle) == FILE_TYPE_UNKNOWN) {
-      if (_close(fd) || fd != _open("nul", _O_RDWR))
+      _close(fd);
+      if (fd != _open("nul", _O_RDWR))
         ABORT();
     }
   }

diff --git a/test/fixtures/spawn_closed_stdio.py b/test/fixtures/spawn_closed_stdio.py
@@ -4,6 +4,5 @@
 os.close(0)
 os.close(1)
 os.close(2)
-cmd = sys.argv[1] + ' -e "process.stdin; process.stdout; process.stderr;"'
-exit_code = subprocess.call(cmd, shell=False)
+exit_code = subprocess.call(sys.argv[1:4], shell=False)
 sys.exit(exit_code)
diff --git a/test/parallel/test-stdio-closed.js b/test/parallel/test-stdio-closed.js
@@ -6,10 +6,15 @@ const fs = require('fs');
 const path = require('path');
 
 if (common.isWindows) {
+  if (process.argv[2] === 'child') {
+    process.stdin;
+    process.stdout;
+    process.stderr;
+    process.exit(0);
+  }
   const python = process.env.PYTHON || 'python';
-  const script = path.join(__dirname, '..', 'fixtures',
-                           'spawn_closed_stdio.py');
-  const proc = spawn(python, [ script, process.execPath ]);
+  const script = path.join(common.fixturesDir, 'spawn_closed_stdio.py');
+  const proc = spawn(python, [script, process.execPath, __filename, 'child']);
   proc.on('exit', common.mustCall(function(exitCode) {
     assert.strictEqual(exitCode, 0);
   }));