fs: throw errors from fs.unlinkSync in JS

PR-URL: #18348 Refs: #18106 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs · Feb 1, 2018 · 776f6cd · 776f6cd
1 parent eca93e6
commit 776f6cd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/lib/fs.js b/lib/fs.js
@@ -1328,7 +1328,11 @@ fs.unlinkSync = function(path) {
   handleError((path = getPathFromURL(path)));
   nullCheck(path);
   validatePath(path);
-  return binding.unlink(pathModule.toNamespacedPath(path));
+  const ctx = { path };
+  binding.unlink(pathModule.toNamespacedPath(path), undefined, ctx);
+  if (ctx.errno !== undefined) {
+    throw new errors.uvException(ctx);
+  }
 };
 
 fs.fchmod = function(fd, mode, callback) {

diff --git a/src/node_file.cc b/src/node_file.cc
@@ -777,17 +777,21 @@ static void Fsync(const FunctionCallbackInfo<Value>& args) {
 static void Unlink(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
-  CHECK_GE(args.Length(), 1);
+  const int argc = args.Length();
+  CHECK_GE(argc, 2);
 
   BufferValue path(env->isolate(), args[0]);
   CHECK_NE(*path, nullptr);
 
-  if (args[1]->IsObject()) {
-    CHECK_EQ(args.Length(), 2);
+  if (args[1]->IsObject()) {  // unlink(fd, req)
+    CHECK_EQ(argc, 2);
     AsyncCall(env, args, "unlink", UTF8, AfterNoArgs,
               uv_fs_unlink, *path);
-  } else {
-    SYNC_CALL(unlink, *path, *path)
+  } else {  // unlink(fd, undefined, ctx)
+    CHECK_EQ(argc, 3);
+    fs_req_wrap req_wrap;
+    SyncCall(env, args[2], &req_wrap, "unlink",
+             uv_fs_unlink, *path);
   }
 }