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

ln: remove redundant force flag

Browse source 
This information is already encoded in the `OverwriteMode` enum.
This commit is contained in:
Michael Debertol 2021-06-02 20:56:37 +02:00
parent efa89de463
commit 87570bbc10
1 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/uu/ln/src/ln.rs
View file

@ -27,7 +27,6 @@ use uucore::fs::{canonicalize, CanonicalizeMode};
pub struct Settings { pub struct Settings {
overwrite: OverwriteMode, overwrite: OverwriteMode,
backup: BackupMode, backup: BackupMode,
force: bool,
suffix: String, suffix: String,
symbolic: bool, symbolic: bool,
relative: bool, relative: bool,
@ -244,7 +243,6 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
let settings = Settings { let settings = Settings {
overwrite: overwrite_mode, overwrite: overwrite_mode,
backup: backup_mode, backup: backup_mode,
force: matches.is_present(OPT_FORCE),
suffix: backup_suffix.to_string(), suffix: backup_suffix.to_string(),
symbolic: matches.is_present(OPT_SYMBOLIC), symbolic: matches.is_present(OPT_SYMBOLIC),
relative: matches.is_present(OPT_RELATIVE), relative: matches.is_present(OPT_RELATIVE),
@ -311,7 +309,8 @@ fn link_files_in_dir(files: &[PathBuf], target_dir: &Path, settings: &Settings)
let mut all_successful = true; let mut all_successful = true;
for srcpath in files.iter() { for srcpath in files.iter() {
let targetpath = if settings.no_dereference && settings.force { let targetpath =
if settings.no_dereference && matches!(settings.overwrite, OverwriteMode::Force) {
// In that case, we don't want to do link resolution // In that case, we don't want to do link resolution
// We need to clean the target // We need to clean the target
if is_symlink(target_dir) { if is_symlink(target_dir) {
@ -422,7 +421,8 @@ fn link(src: &Path, dst: &Path, settings: &Settings) -> Result<()> {
} }
} }
if settings.no_dereference && settings.force && dst.exists() { if settings.no_dereference && matches!(settings.overwrite, OverwriteMode::Force) && dst.exists()
{
fs::remove_file(dst)?; fs::remove_file(dst)?;
} }