Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 09:48:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

rm: fix for -d to match GNU's output #1769

Browse source
This commit is contained in:
Jan Scheer 2021-03-18 14:46:56 +01:00
parent 99be7a3172
commit 58b9372dbe
2 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -305,16 +305,28 @@ fn remove_dir(path: &Path, options: &Options) -> bool {
true
};
if response {
match fs::remove_dir(path) {
Ok(_) => {
if options.verbose {
println!("removed '{}'", path.display());
if let Ok(mut read_dir) = fs::read_dir(path) {
if options.dir && read_dir.next().is_none() {
match fs::remove_dir(path) {
Ok(_) => {
if options.verbose {
println!("removed directory '{}'", path.display());
}
}
Err(e) => {
show_error!("cannot remove '{}': {}", path.display(), e);
return true;
}
}
}
Err(e) => {
show_error!("removing '{}': {}", path.display(), e);
} else {
// directory can be read but is not empty
show_error!("cannot remove '{}': Directory not empty", path.display());
return true;
}
} else {
// GNU's rm shows this message if directory is empty but not readable
show_error!("cannot remove '{}': Directory not empty", path.display());
return true;
}
}

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

@ -115,6 +115,23 @@ fn test_rm_empty_directory() {
assert!(!at.dir_exists(dir));
}
#[test]
fn test_rm_non_empty_directory() {
let (at, mut ucmd) = at_and_ucmd!();
let dir = "test_rm_non_empty_dir";
let file_a = &format!("{}/test_rm_non_empty_file_a", dir);
at.mkdir(dir);
at.touch(file_a);
let result = ucmd.arg("-d").arg(dir).fails();
assert!(result
.stderr
.contains(&format!("cannot remove '{}': Directory not empty", dir)));
assert!(at.file_exists(file_a));
assert!(at.dir_exists(dir));
}
#[test]
fn test_rm_recursive() {
let (at, mut ucmd) = at_and_ucmd!();