1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #325. Add test and check for zero-length file contents in fs.readFileSync

Browse Source
This commit is contained in:
isaacs 2010-10-04 12:22:59 -07:00 committed by Ryan Dahl
parent 38f8665f3a
commit 8ff7954165
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fs.js
View File

@ -112,9 +112,11 @@ fs.readFileSync = function (path, encoding) {
i.copy(buffer,offset,0,i._bytesRead); i.copy(buffer,offset,0,i._bytesRead);
offset += i._bytesRead; offset += i._bytesRead;
}) })
} else { } else if (buffers.length) {
//buffers has exactly 1 (possibly zero length) buffer, so this should be a shortcut //buffers has exactly 1 (possibly zero length) buffer, so this should be a shortcut
buffer = buffers[0].slice(0, buffers[0]._bytesRead); buffer = buffers[0].slice(0, buffers[0]._bytesRead);
} else {
buffer = new Buffer(0);
} }
if (encoding) buffer = buffer.toString(encoding); if (encoding) buffer = buffer.toString(encoding);

5
test/simple/test-fs-readfile-empty.js
View File

@ -12,4 +12,7 @@ fs.readFile(fn, function(err, data) {
fs.readFile(fn, 'utf8', function(err, data) { fs.readFile(fn, 'utf8', function(err, data) {
assert.strictEqual('', data); assert.strictEqual('', data);
}); });
assert.ok(fs.readFileSync(fn));
assert.strictEqual('', fs.readFileSync(fn, 'utf8'));