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

Merge pull request #5403 from sylvestre/rm

Browse source 
rm: In some cases, remove_dir is doing a better job than remove_dir_all
This commit is contained in:
Daniel Hofstetter 2023-10-16 09:35:44 +02:00 • committed by GitHub
commit 541ac6a813
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@
// For the full copyright and license information, please view the LICENSE // For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code. // file that was distributed with this source code.
// spell-checker:ignore (path) eacces // spell-checker:ignore (path) eacces inacc
use clap::{builder::ValueParser, crate_version, parser::ValueSource, Arg, ArgAction, Command}; use clap::{builder::ValueParser, crate_version, parser::ValueSource, Arg, ArgAction, Command};
use std::collections::VecDeque; use std::collections::VecDeque;
@ -330,14 +330,20 @@ fn handle_dir(path: &Path, options: &Options) -> bool {
if options.recursive && (!is_root || !options.preserve_root) { if options.recursive && (!is_root || !options.preserve_root) {
if options.interactive != InteractiveMode::Always && !options.verbose { if options.interactive != InteractiveMode::Always && !options.verbose {
if let Err(e) = fs::remove_dir_all(path) { if let Err(e) = fs::remove_dir_all(path) {
had_err = true; // GNU compatibility (rm/empty-inacc.sh)
if e.kind() == std::io::ErrorKind::PermissionDenied { // remove_dir_all failed. maybe it is because of the permissions
// GNU compatibility (rm/fail-eacces.sh) // but if the directory is empty, remove_dir might work.
// here, GNU doesn't use some kind of remove_dir_all // So, let's try that before failing for real
// It will show directory+file if let Err(_e) = fs::remove_dir(path) {
show_error!("cannot remove {}: {}", path.quote(), "Permission denied"); had_err = true;
} else { if e.kind() == std::io::ErrorKind::PermissionDenied {
show_error!("cannot remove {}: {}", path.quote(), e); // 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 { } 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)); 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] #[test]
#[cfg(not(windows))] #[cfg(not(windows))]
fn test_fifo_removal() { fn test_fifo_removal() {