diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs index c09f7a606..088edf219 100644 --- a/src/uu/ln/src/ln.rs +++ b/src/uu/ln/src/ln.rs @@ -53,8 +53,8 @@ pub enum OverwriteMode { enum LnError { TargetIsDirectory(PathBuf), SomeLinksFailed, - FailedToLink(String), - SameFile(PathBuf, PathBuf), + FailedToLink(PathBuf, PathBuf, String), + SameFile(), MissingDestination(PathBuf), ExtraOperand(OsString), } @@ -63,13 +63,12 @@ impl Display for LnError { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { Self::TargetIsDirectory(s) => write!(f, "target {} is not a directory", s.quote()), - Self::FailedToLink(e) => write!(f, "failed to link: {}", e), - Self::SameFile(e, e2) => write!( - f, - "'{}' and '{}' are the same file", - e2.display(), - e.display() - ), + Self::FailedToLink(s, d, e) => { + write!(f, "failed to link {} to {}: {}", s.quote(), d.quote(), e) + } + Self::SameFile() => { + write!(f, "Same file") + } Self::SomeLinksFailed => write!(f, "some links failed to create"), Self::MissingDestination(s) => { write!(f, "missing destination file operand after {}", s.quote()) @@ -91,8 +90,8 @@ impl UError for LnError { match self { Self::TargetIsDirectory(_) | Self::SomeLinksFailed - | Self::FailedToLink(_) - | Self::SameFile(_, _) + | Self::FailedToLink(_, _, _) + | Self::SameFile() | Self::MissingDestination(_) | Self::ExtraOperand(_) => 1, } @@ -293,7 +292,12 @@ fn exec(files: &[PathBuf], settings: &Settings) -> UResult<()> { match link(&files[0], &files[1], settings) { Ok(_) => Ok(()), - Err(e) => Err(LnError::FailedToLink(e.to_string()).into()), + Err(e) => { + Err( + LnError::FailedToLink(files[0].to_owned(), files[1].to_owned(), e.to_string()) + .into(), + ) + } } } @@ -398,18 +402,6 @@ fn link(src: &Path, dst: &Path, settings: &Settings) -> UResult<()> { }; if is_symlink(dst) || dst.exists() { - match settings.overwrite { - OverwriteMode::NoClobber => {} - OverwriteMode::Interactive => { - print!("{}: overwrite {}? ", uucore::util_name(), dst.quote()); - if !read_yes() { - return Ok(()); - } - fs::remove_file(dst)?; - } - OverwriteMode::Force => fs::remove_file(dst)?, - }; - backup_path = match settings.backup { BackupMode::NoBackup => None, BackupMode::SimpleBackup => Some(simple_backup_path(dst, &settings.suffix)), @@ -425,12 +417,28 @@ fn link(src: &Path, dst: &Path, settings: &Settings) -> UResult<()> { ResolveMode::Logical, )?; if dst_abs == source_abs { - return Err(LnError::SameFile(dst.to_path_buf(), source.to_path_buf()).into()); + return Err(LnError::SameFile().into()); } } if let Some(ref p) = backup_path { fs::rename(dst, p)?; } + match settings.overwrite { + OverwriteMode::NoClobber => {} + OverwriteMode::Interactive => { + print!("{}: overwrite {}? ", uucore::util_name(), dst.quote()); + if !read_yes() { + return Ok(()); + } + + if fs::remove_file(dst).is_ok() {}; + // In case of error, don't do anything + } + OverwriteMode::Force => { + if fs::remove_file(dst).is_ok() {}; + // In case of error, don't do anything + } + }; } if settings.symbolic { diff --git a/tests/by-util/test_ln.rs b/tests/by-util/test_ln.rs index 9bda5d412..0dcde3b35 100644 --- a/tests/by-util/test_ln.rs +++ b/tests/by-util/test_ln.rs @@ -622,5 +622,31 @@ fn test_backup_same_file() { at.touch("file1"); ucmd.args(&["--backup", "file1", "./file1"]) .fails() - .stderr_contains("'file1' and './file1' are the same file"); + .stderr_contains("n: failed to link 'file1' to './file1': Same file"); +} + +#[test] +fn test_backup_force() { + let scene = TestScenario::new(util_name!()); + let at = &scene.fixtures; + + at.write("a", "a\n"); + at.write("b", "b2\n"); + + scene.ucmd().args(&["-s", "b", "b~"]).succeeds().no_stderr(); + assert!(at.file_exists("a")); + assert!(at.file_exists("b")); + assert!(at.file_exists("b~")); + scene + .ucmd() + .args(&["-f", "--b=simple", "a", "b"]) + .succeeds() + .no_stderr(); + assert!(at.file_exists("a")); + assert!(at.file_exists("b")); + assert!(at.file_exists("b~")); + assert_eq!(at.read("a"), "a\n"); + assert_eq!(at.read("b"), "a\n"); + // we should have the same content as b as we had time to do a backup + assert_eq!(at.read("b~"), "b2\n"); } diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 4f02e8425..924d14d25 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -180,4 +180,4 @@ sed -i -e "s~ sed -n \"1s/'\\\/'/'OPT'/p\" < err >> pat || framework_failure_~ sed -i -e "s/rcexp=1$/rcexp=2\n case \"\$prg\" in chcon|dir|runcon|vdir) return;; esac/" tests/misc/usage_vs_getopt.sh # Update the GNU error message to match ours -sed -i -e "s/ln: 'f' and 'f' are the same file/ln: failed to link: 'f' and 'f' are the same file/g" tests/ln/hard-backup.sh +sed -i -e "s/ln: 'f' and 'f' are the same file/ln: failed to link 'f' to 'f': Same file/g" tests/ln/hard-backup.sh