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

rm: apply suggestion of retrieving metatada in function

Browse source
This commit is contained in:
terade 2023-10-17 17:26:27 +02:00
parent f18e8983b1
commit b6a6a4dc65
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -514,22 +514,18 @@ fn prompt_file(path: &Path, options: &Options) -> bool {
prompt_yes!("remove file {}?", path.quote()) prompt_yes!("remove file {}?", path.quote())
}; };
} }
prompt_file_permission_readonly(path, Ok(metadata))
} }
Err(err) => { Err(err) => {
if err.kind() != ErrorKind::PermissionDenied { if err.kind() != ErrorKind::PermissionDenied {
return true; return true;
} }
prompt_file_permission_readonly(path, fs::metadata(path))
} }
} }
prompt_file_permission_readonly(path)
} }
fn prompt_file_permission_readonly( fn prompt_file_permission_readonly(path: &Path) -> bool {
path: &Path, match fs::metadata(path) {
metadata_or_err: Result<Metadata, std::io::Error>,
) -> bool {
match metadata_or_err {
Ok(metadata) if !metadata.permissions().readonly() => true, Ok(metadata) if !metadata.permissions().readonly() => true,
Ok(metadata) if metadata.len() == 0 => prompt_yes!( Ok(metadata) if metadata.len() == 0 => prompt_yes!(
"remove write-protected regular empty file {}?", "remove write-protected regular empty file {}?",