RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

rm: In some cases, remove_dir is doing a better job than remove_dir_all

Browse source 
use it when remove_dir_all failed

GNU compatibility (rm/empty-inacc.sh)
This commit is contained in:
Sylvestre Ledru 2023-10-14 11:41:48 +02:00
parent 21c8538e0b
commit 505ef714b9
2 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/uu/rm/src/rm.rs
View file

@ -330,14 +330,20 @@ fn handle_dir(path: &Path, options: &Options) -> bool {
if options.recursive && (!is_root || !options.preserve_root) {
if options.interactive != InteractiveMode::Always && !options.verbose {
if let Err(e) = fs::remove_dir_all(path) {
had_err = true;
if e.kind() == std::io::ErrorKind::PermissionDenied {
// GNU compatibility (rm/fail-eacces.sh)
// here, GNU doesn't use some kind of remove_dir_all
// It will show directory+file
show_error!("cannot remove {}: {}", path.quote(), "Permission denied");
} else {
show_error!("cannot remove {}: {}", path.quote(), e);
// GNU compatibility (rm/empty-inacc.sh)
// remove_dir_all failed. maybe it is because of the permissions
// but if the directory is empty, remove_dir might work.
// So, let's try that before failing for real
if let Err(_e) = fs::remove_dir(path) {
had_err = true;
if e.kind() == std::io::ErrorKind::PermissionDenied {
// GNU compatibility (rm/fail-eacces.sh)
// here, GNU doesn't use some kind of remove_dir_all
// It will show directory+file
show_error!("cannot remove {}: {}", path.quote(), "Permission denied");
} else {
show_error!("cannot remove {}: {}", path.quote(), e);
}
}
}
} else {

15
tests/by-util/test_rm.rs
View file

@ -647,6 +647,21 @@ fn test_prompt_write_protected_no() {
assert!(at.file_exists(file_2));
}
#[cfg(feature = "chmod")]
#[test]
fn test_remove_inaccessible_dir() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;
let dir_1 = "test_rm_protected";
at.mkdir(dir_1);
scene.ccmd("chmod").arg("0").arg(dir_1).succeeds();
scene.ucmd().arg("-rf").arg(dir_1).succeeds();
assert!(!at.dir_exists(dir_1));
}
#[test]
#[cfg(not(windows))]
fn test_fifo_removal() {