daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed fs.ReadStream() start: 0 bug

pull/22966/head
Tj Holowaychuk 2010-09-22 10:11:37 -07:00 committed by Ryan Dahl
parent e227441248
commit 893ebe7230
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/fs.js
View File

@ -623,7 +623,7 @@ var ReadStream = fs.ReadStream = function(path, options) {
this[key] = options[key]; this[key] = options[key];
} }
if (this.start || this.end) { if (this.start !== undefined || this.end !== undefined) {
if (this.start === undefined || this.end === undefined) { if (this.start === undefined || this.end === undefined) {
this.emit('error', this.emit('error',
new Error('Both start and end are needed for range streaming.')); new Error('Both start and end are needed for range streaming.'));
@ -671,7 +671,7 @@ ReadStream.prototype._read = function () {
allocNewPool(); allocNewPool();
} }
if(this.start && this.firstRead) { if (this.start !== undefined && this.firstRead) {
this.pos = this.start; this.pos = this.start;
this.firstRead = false; this.firstRead = false;
} }
@ -683,7 +683,7 @@ ReadStream.prototype._read = function () {
var toRead = Math.min(pool.length - pool.used, this.bufferSize); var toRead = Math.min(pool.length - pool.used, this.bufferSize);
var start = pool.used; var start = pool.used;
if(this.pos) { if (this.pos !== undefined) {
toRead = Math.min(this.end - this.pos + 1, toRead); toRead = Math.min(this.end - this.pos + 1, toRead);
} }
@ -721,7 +721,7 @@ ReadStream.prototype._read = function () {
fs.read(self.fd, pool, pool.used, toRead, this.pos, afterRead); fs.read(self.fd, pool, pool.used, toRead, this.pos, afterRead);
if(self.pos) { if (self.pos !== undefined) {
self.pos += toRead; self.pos += toRead;
} }
pool.used += toRead; pool.used += toRead;

11
test/simple/test-fs-read-stream.js
View File

@ -110,3 +110,14 @@ try {
} catch(e) { } catch(e) {
assert.equal(e.message, 'Both start and end are needed for range streaming.'); assert.equal(e.message, 'Both start and end are needed for range streaming.');
} }
var stream = fs.createReadStream(rangeFile, { start: 0, end: 0 });
stream.data = '';
stream.on('data', function(chunk){
stream.data += chunk;
});
stream.on('end', function(){
assert.equal('x', stream.data);
});