Skip to content

remove open call from uu-rm #7010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sylvestre merged 2 commits into from
Dec 29, 2024
Merged

remove open call from uu-rm #7010

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ba8dd6
remove open call from uu-rm
Dec 28, 2024
7d0e1a6
make clippy happy
elde-n Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions src/uu/rm/src/rm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
use clap::{builder::ValueParser, crate_version, parser::ValueSource, Arg, ArgAction, Command};
use std::collections::VecDeque;
use std::ffi::{OsStr, OsString};
use std::fs::{self, File, Metadata};
use std::io::ErrorKind;
use std::fs::{self, Metadata};
use std::ops::BitOr;
#[cfg(not(windows))]
use std::os::unix::ffi::OsStrExt;
Expand Down Expand Up @@ -526,26 +525,16 @@ fn prompt_file(path: &Path, options: &Options) -> bool {
}
}
// 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) {
Ok(file) => {
let Ok(metadata) = file.metadata() else {
return true;
};
let Ok(metadata) = fs::metadata(path) else {
return true;
};

if options.interactive == InteractiveMode::Always && !metadata.permissions().readonly()
{
return if metadata.len() == 0 {
prompt_yes!("remove regular empty file {}?", path.quote())
} else {
prompt_yes!("remove file {}?", path.quote())
};
}
}
Err(err) => {
if err.kind() != ErrorKind::PermissionDenied {
return true;
}
}
if options.interactive == InteractiveMode::Always && !metadata.permissions().readonly() {
return if metadata.len() == 0 {
prompt_yes!("remove regular empty file {}?", path.quote())
} else {
prompt_yes!("remove file {}?", path.quote())
};
}
prompt_file_permission_readonly(path)
}
Expand Down
Loading