RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-01 21:47:46 +00:00
Code Issues Activity

rm: split prompt_file() into two functions

Browse source
This commit is contained in:
Daniel Hofstetter 2023-08-10 15:27:20 +02:00
parent a8b6e500d4
commit bdd25c37cf
1 changed files with 49 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -370,7 +370,7 @@ fn handle_dir(path: &Path, options: &Options) -> bool {
} }
fn remove_dir(path: &Path, options: &Options) -> bool { fn remove_dir(path: &Path, options: &Options) -> bool {
if prompt_file(path, options, true) { if prompt_dir(path, options) {
if let Ok(mut read_dir) = fs::read_dir(path) { if let Ok(mut read_dir) = fs::read_dir(path) {
if options.dir || options.recursive { if options.dir || options.recursive {
if read_dir.next().is_none() { if read_dir.next().is_none() {
@ -415,7 +415,7 @@ fn remove_dir(path: &Path, options: &Options) -> bool {
} }
fn remove_file(path: &Path, options: &Options) -> bool { fn remove_file(path: &Path, options: &Options) -> bool {
if prompt_file(path, options, false) { if prompt_file(path, options) {
match fs::remove_file(path) { match fs::remove_file(path) {
Ok(_) => { Ok(_) => {
if options.verbose { if options.verbose {
@ -437,8 +437,23 @@ fn remove_file(path: &Path, options: &Options) -> bool {
false false
} }
fn prompt_dir(path: &Path, options: &Options) -> bool {
// If interactive is Never we never want to send prompts
if options.interactive == InteractiveMode::Never {
return true;
}
// We can't use metadata.permissions.readonly for directories because it only works on files
// So we have to handle whether a directory is writable manually
if let Ok(metadata) = fs::metadata(path) {
handle_writable_directory(path, options, &metadata)
} else {
true
}
}
#[allow(clippy::cognitive_complexity)] #[allow(clippy::cognitive_complexity)]
fn prompt_file(path: &Path, options: &Options, is_dir: bool) -> bool { fn prompt_file(path: &Path, options: &Options) -> bool {
// If interactive is Never we never want to send prompts // If interactive is Never we never want to send prompts
if options.interactive == InteractiveMode::Never { if options.interactive == InteractiveMode::Never {
return true; return true;
@ -451,15 +466,6 @@ fn prompt_file(path: &Path, options: &Options, is_dir: bool) -> bool {
} }
} }
} }
if is_dir {
// We can't use metadata.permissions.readonly for directories because it only works on files
// So we have to handle whether a directory is writable on not manually
if let Ok(metadata) = fs::metadata(path) {
handle_writable_directory(path, options, &metadata)
} else {
true
}
} else {
// File::open(path) doesn't open the file in write mode so we need to use file options to open it in also write mode to check if it can written too // File::open(path) doesn't open the file in write mode so we need to use file options to open it in also write mode to check if it can written too
match File::options().read(true).write(true).open(path) { match File::options().read(true).write(true).open(path) {
Ok(file) => { Ok(file) => {
@ -506,7 +512,6 @@ fn prompt_file(path: &Path, options: &Options, is_dir: bool) -> bool {
} }
} }
} }
}
// For directories finding if they are writable or not is a hassle. In Unix we can use the built-in rust crate to to check mode bits. But other os don't have something similar afaik // For directories finding if they are writable or not is a hassle. In Unix we can use the built-in rust crate to to check mode bits. But other os don't have something similar afaik
// Most cases are covered by keep eye out for edge cases // Most cases are covered by keep eye out for edge cases