rm: fix prompt logic read-only files

Author: bitspill

src/uu/rm/src/rm.rs

@@ -636,19 +636,15 @@ fn prompt_file(path: &Path, options: &Options) -> bool {
             prompt_yes!("remove file {}?", path.quote())
         };
     }
-    let stdin_ok = options.__presume_input_tty.unwrap_or(false) || stdin().is_terminal();
-    let prompt_protected = stdin_ok && options.interactive == InteractiveMode::PromptProtected;
-    if prompt_protected || options.interactive == InteractiveMode::Always {
-        prompt_file_permission_readonly(path)
-    } else {
-        true
-    }
+    prompt_file_permission_readonly(path, options)
 }
 
-fn prompt_file_permission_readonly(path: &Path) -> bool {
-    match fs::metadata(path) {
-        Ok(_) if is_writable(path) => true,
-        Ok(metadata) if metadata.len() == 0 => prompt_yes!(
+fn prompt_file_permission_readonly(path: &Path, options: &Options) -> bool {
+    let stdin_ok = options.__presume_input_tty.unwrap_or(false) || stdin().is_terminal();
+    match (stdin_ok, fs::metadata(path), options.interactive) {
+        (false, _, InteractiveMode::PromptProtected) => true,
+        (_, Ok(_), _) if is_writable(path) => true,
+        (_, Ok(metadata), _) if metadata.len() == 0 => prompt_yes!(
             "remove write-protected regular empty file {}?",
             path.quote()
         ),