Skip to content

Commit afd5d67

Browse files
anonrigrichardlau
authored andcommitted
fs: throw fchownSync error from c++
PR-URL: #51075 Refs: nodejs/performance#106 Reviewed-By: Stephen Belanger <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent c7c9e81 commit afd5d67

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

lib/fs.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -2051,9 +2051,7 @@ function fchownSync(fd, uid, gid) {
20512051
validateInteger(uid, 'uid', -1, kMaxUserId);
20522052
validateInteger(gid, 'gid', -1, kMaxUserId);
20532053

2054-
const ctx = {};
2055-
binding.fchown(fd, uid, gid, undefined, ctx);
2056-
handleErrorFromBinding(ctx);
2054+
binding.fchown(fd, uid, gid);
20572055
}
20582056

20592057
/**

src/node_file.cc

+5-7
Original file line numberDiff line numberDiff line change
@@ -2687,17 +2687,15 @@ static void FChown(const FunctionCallbackInfo<Value>& args) {
26872687
CHECK(IsSafeJsInt(args[2]));
26882688
const uv_gid_t gid = static_cast<uv_gid_t>(args[2].As<Integer>()->Value());
26892689

2690-
FSReqBase* req_wrap_async = GetReqWrap(args, 3);
2691-
if (req_wrap_async != nullptr) { // fchown(fd, uid, gid, req)
2690+
if (argc > 3) { // fchown(fd, uid, gid, req)
2691+
FSReqBase* req_wrap_async = GetReqWrap(args, 3);
26922692
FS_ASYNC_TRACE_BEGIN0(UV_FS_FCHOWN, req_wrap_async)
26932693
AsyncCall(env, req_wrap_async, args, "fchown", UTF8, AfterNoArgs,
26942694
uv_fs_fchown, fd, uid, gid);
2695-
} else { // fchown(fd, uid, gid, undefined, ctx)
2696-
CHECK_EQ(argc, 5);
2697-
FSReqWrapSync req_wrap_sync;
2695+
} else { // fchown(fd, uid, gid)
2696+
FSReqWrapSync req_wrap_sync("fchown");
26982697
FS_SYNC_TRACE_BEGIN(fchown);
2699-
SyncCall(env, args[4], &req_wrap_sync, "fchown",
2700-
uv_fs_fchown, fd, uid, gid);
2698+
SyncCallAndThrowOnError(env, &req_wrap_sync, uv_fs_fchown, fd, uid, gid);
27012699
FS_SYNC_TRACE_END(fchown);
27022700
}
27032701
}

typings/internalBinding/fs.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ declare namespace InternalFSBinding {
8181
function fchmod(fd: number, mode: number, usePromises: typeof kUsePromises): Promise<void>;
8282

8383
function fchown(fd: number, uid: number, gid: number, req: FSReqCallback): void;
84-
function fchown(fd: number, uid: number, gid: number, req: undefined, ctx: FSSyncContext): void;
84+
function fchown(fd: number, uid: number, gid: number): void;
8585
function fchown(fd: number, uid: number, gid: number, usePromises: typeof kUsePromises): Promise<void>;
8686

8787
function fdatasync(fd: number, req: FSReqCallback): void;

0 commit comments

Comments
 (0)