Skip to content

Commit

Permalink
fs: throw errors from fs.fdatasyncSync in JS
Browse files Browse the repository at this point in the history
PR-URL: nodejs#18348
Refs: nodejs#18106
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
joyeecheung authored and MayaLekova committed May 8, 2018
1 parent 49f6646 commit d5196d3
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 7 deletions.
6 changes: 5 additions & 1 deletion lib/fs.js
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,11 @@ fs.fdatasync = function(fd, callback) {

fs.fdatasyncSync = function(fd) {
validateUint32(fd, 'fd');
return binding.fdatasync(fd);
const ctx = {};
binding.fdatasync(fd, undefined, ctx);
if (ctx.errno !== undefined) {
throw new errors.uvException(ctx);
}
};

fs.fsync = function(fd, callback) {
Expand Down
17 changes: 11 additions & 6 deletions src/node_file.cc
Original file line number Diff line number Diff line change
Expand Up @@ -735,16 +735,21 @@ static void FTruncate(const FunctionCallbackInfo<Value>& args) {
static void Fdatasync(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);

CHECK(args[0]->IsInt32());
const int argc = args.Length();
CHECK_GE(argc, 2);

int fd = args[0]->Int32Value();
CHECK(args[0]->IsInt32());
const int fd = args[0]->As<Int32>()->Value();

if (args[1]->IsObject()) {
CHECK_EQ(args.Length(), 2);
if (args[1]->IsObject()) { // fdatasync(fd, req)
CHECK_EQ(argc, 2);
AsyncCall(env, args, "fdatasync", UTF8, AfterNoArgs,
uv_fs_fdatasync, fd);
} else {
SYNC_CALL(fdatasync, 0, fd)
} else { // fdatasync(fd, undefined, ctx)
CHECK_EQ(argc, 3);
fs_req_wrap req_wrap;
SyncCall(env, args[2], &req_wrap, "fdatasync",
uv_fs_fdatasync, fd);
}
}

Expand Down
21 changes: 21 additions & 0 deletions test/parallel/test-fs-error-messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -482,3 +482,24 @@ function re(literals, ...values) {
validateError
);
}

// fdatasync
{
const validateError = (err) => {
assert.strictEqual(err.message, 'EBADF: bad file descriptor, fdatasync');
assert.strictEqual(err.errno, uv.UV_EBADF);
assert.strictEqual(err.code, 'EBADF');
assert.strictEqual(err.syscall, 'fdatasync');
return true;
};

const fd = fs.openSync(existingFile, 'r');
fs.closeSync(fd);

fs.fdatasync(fd, common.mustCall(validateError));

assert.throws(
() => fs.fdatasyncSync(fd),
validateError
);
}

0 comments on commit d5196d3

Please sign in to comment.