fs.WriteStream.write should support buffer
Also re-adding the callback parameter.
This commit is contained in:
parent
1036aa9762
commit
e232f09d38
17
lib/fs.js
17
lib/fs.js
@ -752,14 +752,25 @@ WriteStream.prototype.flush = function () {
|
||||
};
|
||||
|
||||
|
||||
WriteStream.prototype.write = function(data, encoding) {
|
||||
WriteStream.prototype.write = function (data) {
|
||||
if (!this.writeable) {
|
||||
throw new Error('stream not writeable');
|
||||
}
|
||||
|
||||
// TODO handle Buffer
|
||||
var cb;
|
||||
if (typeof(arguments[arguments.length-1]) == 'function') {
|
||||
cb = arguments[arguments.length-1];
|
||||
}
|
||||
|
||||
if (data instanceof Buffer) {
|
||||
this._queue.push([fs.write, data, 0, data.length, null, cb]);
|
||||
} else {
|
||||
var encoding = 'utf8';
|
||||
if (typeof(arguments[1]) == 'string') encoding = arguments[1];
|
||||
this._queue.push([fs.write, data, undefined, encoding, cb]);
|
||||
}
|
||||
|
||||
|
||||
this._queue.push([fs.write, data, undefined, encoding || 'utf8', null]);
|
||||
this.flush();
|
||||
|
||||
return false;
|
||||
|
9
test/fixtures/print-chars-from-buffer.js
vendored
Normal file
9
test/fixtures/print-chars-from-buffer.js
vendored
Normal file
@ -0,0 +1,9 @@
|
||||
require("../common");
|
||||
Buffer = require("buffer").Buffer;
|
||||
|
||||
var n = parseInt(process.argv[2]);
|
||||
|
||||
b = new Buffer(n);
|
||||
for (var i = 0; i < n; i++) { b[i] = 100; }
|
||||
|
||||
process.stdout.write(b);
|
2
test/fixtures/stdout.js
vendored
2
test/fixtures/stdout.js
vendored
@ -1,2 +0,0 @@
|
||||
var sys = require('sys');
|
||||
sys.puts('test');
|
@ -1,19 +1,52 @@
|
||||
require('../common');
|
||||
var path = require('path')
|
||||
, childProccess = require('child_process')
|
||||
, fs = require('fs')
|
||||
, stdoutScript = path.join(path.dirname(__dirname), 'fixtures/stdout.js')
|
||||
, tmpFile = path.join(path.dirname(__dirname), 'fixtures/stdout.txt')
|
||||
, cmd = process.argv[0]+' '+stdoutScript+' > '+tmpFile;
|
||||
path = require('path');
|
||||
childProccess = require('child_process');
|
||||
fs = require('fs');
|
||||
scriptString = path.join(fixturesDir, 'print-chars.js');
|
||||
scriptBuffer = path.join(fixturesDir, 'print-chars-from-buffer.js');
|
||||
tmpFile = path.join(fixturesDir, 'stdout.txt');
|
||||
|
||||
try {
|
||||
fs.unlinkSync(tmpFile);
|
||||
} catch (e) {}
|
||||
function test (size, useBuffer, cb) {
|
||||
var cmd = process.argv[0]
|
||||
+ ' '
|
||||
+ (useBuffer ? scriptBuffer : scriptString)
|
||||
+ ' '
|
||||
+ size
|
||||
+ ' > '
|
||||
+ tmpFile
|
||||
;
|
||||
|
||||
childProccess.exec(cmd, function(err) {
|
||||
if (err) throw err;
|
||||
try {
|
||||
fs.unlinkSync(tmpFile);
|
||||
} catch (e) {}
|
||||
|
||||
var data = fs.readFileSync(tmpFile);
|
||||
assert.equal(data, "test\n");
|
||||
fs.unlinkSync(tmpFile);
|
||||
});
|
||||
print(size + ' chars to ' + tmpFile + '...');
|
||||
|
||||
childProccess.exec(cmd, function(err) {
|
||||
if (err) throw err;
|
||||
|
||||
puts('done!');
|
||||
|
||||
var stat = fs.statSync(tmpFile);
|
||||
|
||||
puts(tmpFile + ' has ' + stat.size + ' bytes');
|
||||
|
||||
assert.equal(size, stat.size);
|
||||
fs.unlinkSync(tmpFile);
|
||||
|
||||
cb();
|
||||
});
|
||||
}
|
||||
|
||||
finished = false;
|
||||
test(1024*1024, false, function () {
|
||||
puts("Done printing with string");
|
||||
test(1024*1024, true, function () {
|
||||
puts("Done printing with buffer");
|
||||
finished = true;
|
||||
});
|
||||
});
|
||||
|
||||
process.addListener('exit', function () {
|
||||
assert.ok(finished);
|
||||
});
|
||||
|
Loading…
x
Reference in New Issue
Block a user