1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00

Merge pull request #5431 from cakebaker/cp_remove_destination_shouldnt_fail_hardlink

cp --remove-destination: don't fail if destination is hardlink to source
This commit is contained in:
Sylvestre Ledru 2023-12-25 13:02:50 +01:00 committed by GitHub
commit 356023b055
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 2 deletions

View file

@ -32,8 +32,8 @@ use platform::copy_on_write;
use uucore::display::Quotable; use uucore::display::Quotable;
use uucore::error::{set_exit_code, UClapError, UError, UResult, UUsageError}; use uucore::error::{set_exit_code, UClapError, UError, UResult, UUsageError};
use uucore::fs::{ use uucore::fs::{
canonicalize, is_symlink_loop, paths_refer_to_same_file, FileInformation, MissingHandling, are_hardlinks_to_same_file, canonicalize, is_symlink_loop, paths_refer_to_same_file,
ResolveMode, FileInformation, MissingHandling, ResolveMode,
}; };
use uucore::{backup_control, update_control}; use uucore::{backup_control, update_control};
// These are exposed for projects (e.g. nushell) that want to create an `Options` value, which // These are exposed for projects (e.g. nushell) that want to create an `Options` value, which
@ -1672,6 +1672,15 @@ fn copy_file(
} }
} }
if are_hardlinks_to_same_file(source, dest)
&& matches!(
options.overwrite,
OverwriteMode::Clobber(ClobberMode::RemoveDestination)
)
{
fs::remove_file(dest)?;
}
if file_or_link_exists(dest) { if file_or_link_exists(dest) {
handle_existing_dest(source, dest, options, source_in_command_line)?; handle_existing_dest(source, dest, options, source_in_command_line)?;
} }

View file

@ -2881,6 +2881,24 @@ fn test_cp_mode_hardlink_no_dereference() {
assert_eq!(at.read_symlink("z"), "slink"); assert_eq!(at.read_symlink("z"), "slink");
} }
#[cfg(not(any(windows, target_os = "android")))]
#[test]
fn test_remove_destination_with_destination_being_a_hardlink_to_source() {
let (at, mut ucmd) = at_and_ucmd!();
let file = "file";
let hardlink = "hardlink";
at.touch(file);
at.hard_link(file, hardlink);
ucmd.args(&["--remove-destination", file, hardlink])
.succeeds();
assert_eq!("", at.resolve_link(hardlink));
assert!(at.file_exists(file));
assert!(at.file_exists(hardlink));
}
#[test] #[test]
fn test_remove_destination_with_destination_being_a_symlink_to_source() { fn test_remove_destination_with_destination_being_a_symlink_to_source() {
let (at, mut ucmd) = at_and_ucmd!(); let (at, mut ucmd) = at_and_ucmd!();