fs: fix rmSync error code

Return the correct error code, when a directory_not_empty error occurred. Fixes: #57095 PR-URL: #57103 Reviewed-By: Jason Zhang <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

Author: Paul Schwabauer

src/node_file.cc

@@ -1705,7 +1705,8 @@ static void RmSync(const FunctionCallbackInfo<Value>& args){
 return env->ThrowErrnoException(EPERM, "rm", message.c_str(), path_c_str);
  } elseif (error == std::errc::directory_not_empty){
  std::string message = "Directory not empty: " + file_path_str;
-return env->ThrowErrnoException(EACCES, "rm", message.c_str(), path_c_str);
+return env->ThrowErrnoException(
+ ENOTEMPTY, "rm", message.c_str(), path_c_str);
  } elseif (error == std::errc::not_a_directory){
  std::string message = "Not a directory: " + file_path_str;
 return env->ThrowErrnoException(ENOTDIR, "rm", message.c_str(), path_c_str);

test/parallel/test-fs-rm.js

@@ -481,12 +481,20 @@ if (isGitPresent){
 // IBMi has a different access permission mechanism
 // This test should not be run as `root`
 if(!common.isIBMi&&(common.isWindows||process.getuid()!==0)){
-functionmakeDirectoryReadOnly(dir,mode){
+functionmakeDirectoryReadOnly(dir,allowExecute){
 letaccessErrorCode='EACCES';
+if(common.isMacOS&&allowExecute){
+accessErrorCode='ENOTEMPTY';
+}
 if(common.isWindows){
 accessErrorCode='EPERM';
-execSync(`icacls ${dir} /deny "everyone:(OI)(CI)(DE,DC)"`);
+constpermissions=['DE','DC'];
+if(!allowExecute){
+permissions.push('X');
+}
+execSync(`icacls ${dir} /deny "everyone:(OI)(CI)(${permissions.join(',')})"`);
 }else{
+constmode=allowExecute ? 0o555 : 0o444;
 fs.chmodSync(dir,mode);
 }
 returnaccessErrorCode;
@@ -510,7 +518,7 @@ if (isGitPresent){
 try{
 fs.mkdirSync(dirname,common.mustNotMutateObjectDeep({recursive: true}));
 fs.writeFileSync(filePath,'hello');
-constcode=makeDirectoryReadOnly(dirname,0o444);
+constcode=makeDirectoryReadOnly(dirname,false);
 assert.throws(()=>{
 fs.rmSync(filePath,common.mustNotMutateObjectDeep({force: true}));
 },{
@@ -532,7 +540,7 @@ if (isGitPresent){
 fs.mkdirSync(middle);
 fs.mkdirSync(path.join(middle,'leaf'));// Make `middle` non-empty
 try{
-constcode=makeDirectoryReadOnly(middle,0o555);
+constcode=makeDirectoryReadOnly(middle,true);
 try{
 assert.throws(()=>{
 fs.rmSync(root,common.mustNotMutateObjectDeep({recursive: true}));