Browse Source

fs: fix ReadStream fails to read from existing fd

A ReadStream constructed from an existing file descriptor failed to start
reading automatically. Avoids a userspace call to ReadStream.prototype._read().
v0.7.4-release
Christopher Jeffrey 13 years ago
committed by Ben Noordhuis
parent
commit
f64989e63b
  1. 1
      lib/fs.js
  2. 44
      test/simple/test-fs-read-stream-fd.js

1
lib/fs.js

@ -1050,6 +1050,7 @@ var ReadStream = fs.ReadStream = function(path, options) {
}
if (this.fd !== null) {
this._read();
return;
}

44
test/simple/test-fs-read-stream-fd.js

@ -0,0 +1,44 @@
// 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 fs = require('fs');
var assert = require('assert');
var path = require('path');
var common = require('../common');
var file = path.join(common.tmpDir, '/read_stream_fd_test.txt');
var input = 'hello world';
var output = '';
var fd, stream;
fs.writeFileSync(file, input);
fd = fs.openSync(file, 'r');
stream = fs.createReadStream(null, { fd: fd, encoding: 'utf8' });
stream.on('data', function(data) {
output += data;
});
process.on('exit', function() {
fs.unlinkSync(file);
assert.equal(output, input);
});
Loading…
Cancel
Save