RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

gnu/rm: match gnu's output

Browse source
This commit is contained in:
Sylvestre Ledru 2021-06-03 22:19:14 +02:00
parent 84330ca938
commit 6a8d15f92e
1 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -255,7 +255,18 @@ fn handle_dir(path: &Path, options: &Options) -> bool {
// correctly on Windows // correctly on Windows
if let Err(e) = remove_dir_all(path) { if let Err(e) = remove_dir_all(path) {
had_err = true; had_err = true;
show_error!("could not remove '{}': {}", path.display(), e); 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.display(),
"Permission denied"
);
} else {
show_error!("cannot remove '{}': {}", path.display(), e);
}
} }
} else { } else {
let mut dirs: VecDeque<DirEntry> = VecDeque::new(); let mut dirs: VecDeque<DirEntry> = VecDeque::new();
@ -314,7 +325,16 @@ fn remove_dir(path: &Path, options: &Options) -> bool {
} }
} }
Err(e) => { Err(e) => {
if e.kind() == std::io::ErrorKind::PermissionDenied {
// GNU compatibility (rm/fail-eacces.sh)
show_error!(
"cannot remove '{}': {}",
path.display(),
"Permission denied"
);
} else {
show_error!("cannot remove '{}': {}", path.display(), e); show_error!("cannot remove '{}': {}", path.display(), e);
}
return true; return true;
} }
} }
@ -352,7 +372,16 @@ fn remove_file(path: &Path, options: &Options) -> bool {
} }
} }
Err(e) => { Err(e) => {
show_error!("removing '{}': {}", path.display(), e); if e.kind() == std::io::ErrorKind::PermissionDenied {
// GNU compatibility (rm/fail-eacces.sh)
show_error!(
"cannot remove '{}': {}",
path.display(),
"Permission denied"
);
} else {
show_error!("cannot remove '{}': {}", path.display(), e);
}
return true; return true;
} }
} }