Fix: fs.writeFile could not handle utf8
This commit is contained in:
parent
02da5ed4a1
commit
5f3906b65e
11
lib/fs.js
11
lib/fs.js
@ -360,17 +360,17 @@ fs.chownSync = function(path, uid, gid) {
|
|||||||
return binding.chown(path, uid, gid);
|
return binding.chown(path, uid, gid);
|
||||||
};
|
};
|
||||||
|
|
||||||
function writeAll (fd, data, encoding, callback) {
|
function writeAll (fd, buffer, callback) {
|
||||||
fs.write(fd, data, 0, encoding, function (writeErr, written) {
|
fs.write(fd, buffer, 0, buffer.length, null, function (writeErr, written) {
|
||||||
if (writeErr) {
|
if (writeErr) {
|
||||||
fs.close(fd, function () {
|
fs.close(fd, function () {
|
||||||
if (callback) callback(writeErr);
|
if (callback) callback(writeErr);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
if (written === data.length) {
|
if (written === buffer.length) {
|
||||||
fs.close(fd, callback);
|
fs.close(fd, callback);
|
||||||
} else {
|
} else {
|
||||||
writeAll(fd, data.slice(written), encoding, callback);
|
writeAll(fd, buffer.slice(written), callback);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -384,7 +384,8 @@ fs.writeFile = function (path, data, encoding_, callback) {
|
|||||||
if (openErr) {
|
if (openErr) {
|
||||||
if (callback) callback(openErr);
|
if (callback) callback(openErr);
|
||||||
} else {
|
} else {
|
||||||
writeAll(fd, data, encoding, callback);
|
var buffer = new Buffer(data, encoding);
|
||||||
|
writeAll(fd, buffer, callback);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
34
test/simple/test-fs-write-file.js
Normal file
34
test/simple/test-fs-write-file.js
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
require('../common');
|
||||||
|
|
||||||
|
join = require('path').join;
|
||||||
|
fs = require('fs');
|
||||||
|
Buffer = require('buffer').Buffer;
|
||||||
|
|
||||||
|
filename = join(fixturesDir, 'test.txt');
|
||||||
|
|
||||||
|
error('writing to ' + filename);
|
||||||
|
|
||||||
|
s = "南越国是前203年至前111年存在于岭南地区的一个国家,国都位于番禺,疆域包括今天中国的广东、广西两省区的大部份地区,福建省、湖南、贵州、云南的一小部份地区和越南的北部。南越国是秦朝灭亡后,由南海郡尉赵佗于前203年起兵兼并桂林郡和象郡后建立。前196年和前179年,南越国曾先后两次名义上臣属于西汉,成为西汉的“外臣”。前112年,南越国末代君主赵建德与西汉发生战争,被汉武帝于前111年所灭。南越国共存在93年,历经五代君主。南越国是岭南地区的第一个有记载的政权国家,采用封建制和郡县制并存的制度,它的建立保证了秦末乱世岭南地区社会秩序的稳定,有效的改善了岭南地区落后的政治、##济现状。\n";
|
||||||
|
|
||||||
|
ncallbacks = 0;
|
||||||
|
|
||||||
|
fs.writeFile(filename, s, function (e) {
|
||||||
|
if (e) throw e;
|
||||||
|
|
||||||
|
ncallbacks++;
|
||||||
|
error('file written');
|
||||||
|
|
||||||
|
fs.readFile(filename, function (e, buffer) {
|
||||||
|
if (e) throw e;
|
||||||
|
error('file read');
|
||||||
|
ncallbacks++;
|
||||||
|
assert.equal(Buffer.byteLength(s), buffer.length);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
process.addListener('exit', function () {
|
||||||
|
error('done');
|
||||||
|
|
||||||
|
assert.equal(2, ncallbacks);
|
||||||
|
});
|
Loading…
x
Reference in New Issue
Block a user