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

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

82
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,47 +309,48 @@ 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 =
// In that case, we don't want to do link resolution if settings.no_dereference && matches!(settings.overwrite, OverwriteMode::Force) {
// We need to clean the target // In that case, we don't want to do link resolution
if is_symlink(target_dir) { // We need to clean the target
if target_dir.is_file() { if is_symlink(target_dir) {
if let Err(e) = fs::remove_file(target_dir) { if target_dir.is_file() {
show_error!("Could not update {}: {}", target_dir.display(), e) if let Err(e) = fs::remove_file(target_dir) {
}; show_error!("Could not update {}: {}", target_dir.display(), e)
} };
if target_dir.is_dir() { }
// Not sure why but on Windows, the symlink can be if target_dir.is_dir() {
// considered as a dir // Not sure why but on Windows, the symlink can be
// See test_ln::test_symlink_no_deref_dir // considered as a dir
if let Err(e) = fs::remove_dir(target_dir) { // See test_ln::test_symlink_no_deref_dir
show_error!("Could not update {}: {}", target_dir.display(), e) if let Err(e) = fs::remove_dir(target_dir) {
}; show_error!("Could not update {}: {}", target_dir.display(), e)
} };
}
target_dir.to_path_buf()
} else {
match srcpath.as_os_str().to_str() {
Some(name) => {
match Path::new(name).file_name() {
Some(basename) => target_dir.join(basename),
// This can be None only for "." or "..". Trying
// to create a link with such name will fail with
// EEXIST, which agrees with the behavior of GNU
// coreutils.
None => target_dir.join(name),
} }
} }
None => { target_dir.to_path_buf()
show_error!( } else {
"cannot stat '{}': No such file or directory", match srcpath.as_os_str().to_str() {
srcpath.display() Some(name) => {
); match Path::new(name).file_name() {
all_successful = false; Some(basename) => target_dir.join(basename),
continue; // This can be None only for "." or "..". Trying
// to create a link with such name will fail with
// EEXIST, which agrees with the behavior of GNU
// coreutils.
None => target_dir.join(name),
}
}
None => {
show_error!(
"cannot stat '{}': No such file or directory",
srcpath.display()
);
all_successful = false;
continue;
}
} }
} };
};
if let Err(e) = link(srcpath, &targetpath, settings) { if let Err(e) = link(srcpath, &targetpath, settings) {
show_error!( show_error!(
@ -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)?;
} }