Browse Source

node: do not ever close stdio

Even if stdio streams are opened as file streams, we should not ever try
to close them. This could be accomplished by passing `autoClose: false`
in options on their creation.
v0.11.11-release
Fedor Indutny 11 years ago
parent
commit
fc26fd6b38
  1. 9
      lib/fs.js
  2. 4
      src/node.js
  3. 41
      test/fixtures/echo-close-check.js
  4. 2
      test/simple/test-stdin-from-file.js

9
lib/fs.js

@ -1668,12 +1668,16 @@ WriteStream.prototype.destroySoon = WriteStream.prototype.end;
// SyncWriteStream is internal. DO NOT USE. // SyncWriteStream is internal. DO NOT USE.
// Temporary hack for process.stdout and process.stderr when piped to files. // Temporary hack for process.stdout and process.stderr when piped to files.
function SyncWriteStream(fd) { function SyncWriteStream(fd, options) {
Stream.call(this); Stream.call(this);
options = options || {};
this.fd = fd; this.fd = fd;
this.writable = true; this.writable = true;
this.readable = false; this.readable = false;
this.autoClose = options.hasOwnProperty('autoClose') ?
options.autoClose : true;
} }
util.inherits(SyncWriteStream, Stream); util.inherits(SyncWriteStream, Stream);
@ -1723,7 +1727,8 @@ SyncWriteStream.prototype.end = function(data, arg1, arg2) {
SyncWriteStream.prototype.destroy = function() { SyncWriteStream.prototype.destroy = function() {
fs.closeSync(this.fd); if (this.autoClose)
fs.closeSync(this.fd);
this.fd = null; this.fd = null;
this.emit('close'); this.emit('close');
return true; return true;

4
src/node.js

@ -771,7 +771,7 @@
case 'FILE': case 'FILE':
var fs = NativeModule.require('fs'); var fs = NativeModule.require('fs');
stream = new fs.SyncWriteStream(fd); stream = new fs.SyncWriteStream(fd, { autoClose: false });
stream._type = 'fs'; stream._type = 'fs';
break; break;
@ -858,7 +858,7 @@
case 'FILE': case 'FILE':
var fs = NativeModule.require('fs'); var fs = NativeModule.require('fs');
stdin = new fs.ReadStream(null, { fd: fd }); stdin = new fs.ReadStream(null, { fd: fd, autoClose: false });
break; break;
case 'PIPE': case 'PIPE':

41
test/fixtures/echo-close-check.js

@ -0,0 +1,41 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
var common = require('../common');
var assert = require('assert');
var net = require('net');
process.stdout.write('hello world\r\n');
var stdin = process.openStdin();
stdin.on('data', function(data) {
process.stdout.write(data.toString());
});
stdin.on('end', function() {
// If stdin's fd will be closed - createServer may get it
var server = net.createServer(function() {
}).listen(common.PORT, function() {
assert(typeof server._handle.fd !== 'number' || server._handle.fd > 2);
server.close();
});
});

2
test/simple/test-stdin-from-file.js

@ -28,7 +28,7 @@ var join = require('path').join;
var childProccess = require('child_process'); var childProccess = require('child_process');
var fs = require('fs'); var fs = require('fs');
var stdoutScript = join(common.fixturesDir, 'echo.js'); var stdoutScript = join(common.fixturesDir, 'echo-close-check.js');
var tmpFile = join(common.fixturesDir, 'stdin.txt'); var tmpFile = join(common.fixturesDir, 'stdin.txt');
var cmd = '"' + process.argv[0] + '" "' + stdoutScript + '" < "' + var cmd = '"' + process.argv[0] + '" "' + stdoutScript + '" < "' +

Loading…
Cancel
Save