Fix: fs.writeFile could not handle utf8

This commit is contained in:
Felix Geisendörfer 2010-06-14 19:34:34 +02:00 committed by Ryan Dahl
parent 02da5ed4a1
commit 5f3906b65e
2 changed files with 40 additions and 5 deletions

View File

@ -360,17 +360,17 @@ fs.chownSync = function(path, uid, gid) {
return binding.chown(path, uid, gid);
};
function writeAll (fd, data, encoding, callback) {
fs.write(fd, data, 0, encoding, function (writeErr, written) {
function writeAll (fd, buffer, callback) {
fs.write(fd, buffer, 0, buffer.length, null, function (writeErr, written) {
if (writeErr) {
fs.close(fd, function () {
if (callback) callback(writeErr);
});
} else {
if (written === data.length) {
if (written === buffer.length) {
fs.close(fd, callback);
} 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 (callback) callback(openErr);
} else {
writeAll(fd, data, encoding, callback);
var buffer = new Buffer(data, encoding);
writeAll(fd, buffer, callback);
}
});
};

View 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);
});