From b6a6a4dc6506db94ec7dc4702314c78bff3be0ab Mon Sep 17 00:00:00 2001 From: terade <134976752+terade@users.noreply.github.com.> Date: Tue, 17 Oct 2023 17:26:27 +0200 Subject: [PATCH] rm: apply suggestion of retrieving metatada in function --- src/uu/rm/src/rm.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs index 0f4d04598..43a7ec774 100644 --- a/src/uu/rm/src/rm.rs +++ b/src/uu/rm/src/rm.rs @@ -514,22 +514,18 @@ fn prompt_file(path: &Path, options: &Options) -> bool { prompt_yes!("remove file {}?", path.quote()) }; } - prompt_file_permission_readonly(path, Ok(metadata)) } Err(err) => { if err.kind() != ErrorKind::PermissionDenied { return true; } - prompt_file_permission_readonly(path, fs::metadata(path)) } } + prompt_file_permission_readonly(path) } -fn prompt_file_permission_readonly( - path: &Path, - metadata_or_err: Result, -) -> bool { - match metadata_or_err { +fn prompt_file_permission_readonly(path: &Path) -> bool { + match fs::metadata(path) { Ok(metadata) if !metadata.permissions().readonly() => true, Ok(metadata) if metadata.len() == 0 => prompt_yes!( "remove write-protected regular empty file {}?",