Skip to content

fs: fix rmSync error code #57103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 1 commit into from
Feb 25, 2025
Merged

fs: fix rmSync error code #57103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fs: fix rmSync error code 
Return the correct error code, when a directory_not_empty error
occurred.

Fixes: #57095
  • Loading branch information
@koplas
koplas committed Feb 18, 2025
commit 2bff9c0bc2c3613d9b35a08b538e92080b249505
3 changes: 2 additions & 1 deletion src/node_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,7 +1705,8 @@ static void RmSync(const FunctionCallbackInfo<Value>& args) {
return env->ThrowErrnoException(EPERM, "rm", message.c_str(), path_c_str);
} else if (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);
} else if (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);
Expand Down
16 changes: 12 additions & 4 deletions test/parallel/test-fs-rm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
function makeDirectoryReadOnly(dir, mode) {
function makeDirectoryReadOnly(dir, allowExecute) {
let accessErrorCode = 'EACCES';
if (common.isMacOS && allowExecute) {
accessErrorCode = 'ENOTEMPTY';
}
if (common.isWindows) {
accessErrorCode = 'EPERM';
execSync(`icacls ${dir} /deny "everyone:(OI)(CI)(DE,DC)"`);
const permissions = ['DE', 'DC'];
if (!allowExecute) {
permissions.push('X');
}
execSync(`icacls ${dir} /deny "everyone:(OI)(CI)(${permissions.join(',')})"`);
} else {
const mode = allowExecute ? 0o555 : 0o444;
fs.chmodSync(dir, mode);
}
return accessErrorCode;
Expand All @@ -510,7 +518,7 @@ if (isGitPresent) {
try {
fs.mkdirSync(dirname, common.mustNotMutateObjectDeep({ recursive: true }));
fs.writeFileSync(filePath, 'hello');
const code = makeDirectoryReadOnly(dirname, 0o444);
const code = makeDirectoryReadOnly(dirname, false);
assert.throws(() => {
fs.rmSync(filePath, common.mustNotMutateObjectDeep({ force: true }));
}, {
Expand All @@ -532,7 +540,7 @@ if (isGitPresent) {
fs.mkdirSync(middle);
fs.mkdirSync(path.join(middle, 'leaf')); // Make `middle` non-empty
try {
const code = makeDirectoryReadOnly(middle, 0o555);
const code = makeDirectoryReadOnly(middle, true);
try {
assert.throws(() => {
fs.rmSync(root, common.mustNotMutateObjectDeep({ recursive: true }));
Expand Down