Skip to content

cp: fix symlink-overwrite error-priority #6586

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
merged 6 commits into from
Oct 16, 2024
Merged

cp: fix symlink-overwrite error-priority #6586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5fc421a
fix-issue#6266
Luv-Ray Jul 20, 2024
aeae84b
symlink mode
Luv-Ray Jul 20, 2024
31882f0
fix windows test
Luv-Ray Jul 20, 2024
0d9d919
windows test
Luv-Ray Jul 20, 2024
aea45d8
Merge branch 'main' into fix-issue#6266
sylvestre Jul 26, 2024
a547404
Merge branch 'main' into fix-issue#6266
sylvestre Sep 16, 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
7 changes: 6 additions & 1 deletion src/uu/cp/src/cp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,12 @@ pub fn copy(sources: &[PathBuf], target: &Path, options: &Options) -> CopyResult
let dest = construct_dest_path(source, target, target_type, options)
.unwrap_or_else(|_| target.to_path_buf());

if fs::metadata(&dest).is_ok() && !fs::symlink_metadata(&dest)?.file_type().is_symlink()
if fs::metadata(&dest).is_ok()
&& !fs::symlink_metadata(&dest)?.file_type().is_symlink()
// if both `source` and `dest` are symlinks, it should be considered as an overwrite.
|| fs::metadata(source).is_ok()
&& fs::symlink_metadata(source)?.file_type().is_symlink()
|| matches!(options.copy_mode, CopyMode::SymLink)
{
// There is already a file and it isn't a symlink (managed in a different place)
if copied_destinations.contains(&dest)
Expand Down
53 changes: 53 additions & 0 deletions tests/by-util/test_cp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5745,6 +5745,59 @@ fn test_cp_parents_absolute_path() {
at.file_exists(res);
}

#[test]
fn test_copy_symlink_overwrite() {
let (at, mut ucmd) = at_and_ucmd!();
at.mkdir("a");
at.mkdir("b");
at.mkdir("c");

at.write("t", "hello");
at.relative_symlink_file("../t", "a/1");
at.relative_symlink_file("../t", "b/1");

ucmd.arg("--no-dereference")
.arg("a/1")
.arg("b/1")
.arg("c")
.fails()
.stderr_only(if cfg!(not(target_os = "windows")) {
"cp: will not overwrite just-created 'c/1' with 'b/1'\n"
} else {
"cp: will not overwrite just-created 'c\\1' with 'b/1'\n"
});
}

#[test]
fn test_symlink_mode_overwrite() {
let (at, mut ucmd) = at_and_ucmd!();
at.mkdir("a");
at.mkdir("b");

at.write("a/t", "hello");
at.write("b/t", "hello");

if cfg!(not(target_os = "windows")) {
ucmd.arg("-s")
.arg("a/t")
.arg("b/t")
.arg(".")
.fails()
.stderr_only("cp: will not overwrite just-created './t' with 'b/t'\n");

assert_eq!(at.read("./t"), "hello");
} else {
ucmd.arg("-s")
.arg("a\\t")
.arg("b\\t")
.arg(".")
.fails()
.stderr_only("cp: will not overwrite just-created '.\\t' with 'b\\t'\n");

assert_eq!(at.read(".\\t"), "hello");
}
}

// make sure that cp backup dest symlink before removing it.
#[test]
fn test_cp_with_options_backup_and_rem_when_dest_is_symlink() {
Expand Down
Loading