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

fs: throw errors from fs.fsyncSync in JS

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/18348
Refs: https://github.com/nodejs/node/issues/18106
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Joyee Cheung 2018-01-24 18:39:35 +08:00
parent f5e287ba20
commit eca93e631f
No known key found for this signature in database
GPG Key ID: F586868AAD831D0C
3 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/fs.js
View File

@ -1045,7 +1045,11 @@ fs.fsync = function(fd, callback) {
fs.fsyncSync = function(fd) {
validateUint32(fd, 'fd');
return binding.fsync(fd);
const ctx = {};
binding.fsync(fd, undefined, ctx);
if (ctx.errno !== undefined) {
throw new errors.uvException(ctx);
}
};
fs.mkdir = function(path, mode, callback) {

19
src/node_file.cc
View File

@ -739,7 +739,7 @@ static void Fdatasync(const FunctionCallbackInfo<Value>& args) {
CHECK_GE(argc, 2);
CHECK(args[0]->IsInt32());
const int fd = args[0]->As<Int32>()->Value();
const int fd = args[0].As<Int32>()->Value();
if (args[1]->IsObject()) { // fdatasync(fd, req)
CHECK_EQ(argc, 2);
@ -756,16 +756,21 @@ static void Fdatasync(const FunctionCallbackInfo<Value>& args) {
static void Fsync(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
const int argc = args.Length();
CHECK_GE(argc, 2);
CHECK(args[0]->IsInt32());
const int fd = args[0].As<Int32>()->Value();
int fd = args[0]->Int32Value();
if (args[1]->IsObject()) {
CHECK_EQ(args.Length(), 2);
if (args[1]->IsObject()) { // fsync(fd, req)
CHECK_EQ(argc, 2);
AsyncCall(env, args, "fsync", UTF8, AfterNoArgs,
uv_fs_fsync, fd);
} else {
SYNC_CALL(fsync, 0, fd)
} else { // fsync(fd, undefined, ctx)
CHECK_EQ(argc, 3);
fs_req_wrap req_wrap;
SyncCall(env, args[2], &req_wrap, "fsync",
uv_fs_fsync, fd);
}
}

21
test/parallel/test-fs-error-messages.js
View File

@ -503,3 +503,24 @@ function re(literals, ...values) {
validateError
);
}
// fsync
{
const validateError = (err) => {
assert.strictEqual(err.message, 'EBADF: bad file descriptor, fsync');
assert.strictEqual(err.errno, uv.UV_EBADF);
assert.strictEqual(err.code, 'EBADF');
assert.strictEqual(err.syscall, 'fsync');
return true;
};
const fd = fs.openSync(existingFile, 'r');
fs.closeSync(fd);
fs.fsync(fd, common.mustCall(validateError));
assert.throws(
() => fs.fsyncSync(fd),
validateError
);
}