Skip to content

cp: symlink flags fixing conflicting flag logic to use last flag #9960

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
cakebaker merged 2 commits into from
Jan 1, 2026
Merged

cp: symlink flags fixing conflicting flag logic to use last flag #9960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db1afb4
Adding overrides_with_all for symlink flags for ordering
Dylans123 Dec 31, 2025
ec4567f
Adding regression tests for symlink flag ordering
Dylans123 Dec 31, 2025
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
32 changes: 30 additions & 2 deletions src/uu/cp/src/cp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,12 @@ pub fn uu_app() -> Command {
Arg::new(options::NO_DEREFERENCE)
.short('P')
.long(options::NO_DEREFERENCE)
.overrides_with(options::DEREFERENCE)
.overrides_with_all([
options::DEREFERENCE,
options::CLI_SYMBOLIC_LINKS,
options::ARCHIVE,
options::NO_DEREFERENCE_PRESERVE_LINKS,
])
// -d sets this option
.help(translate!("cp-help-no-dereference"))
.action(ArgAction::SetTrue),
Expand All @@ -698,26 +703,49 @@ pub fn uu_app() -> Command {
Arg::new(options::DEREFERENCE)
.short('L')
.long(options::DEREFERENCE)
.overrides_with(options::NO_DEREFERENCE)
.overrides_with_all([
options::NO_DEREFERENCE,
options::CLI_SYMBOLIC_LINKS,
options::ARCHIVE,
options::NO_DEREFERENCE_PRESERVE_LINKS,
])
.help(translate!("cp-help-dereference"))
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(options::CLI_SYMBOLIC_LINKS)
.short('H')
.overrides_with_all([
options::DEREFERENCE,
options::NO_DEREFERENCE,
options::ARCHIVE,
options::NO_DEREFERENCE_PRESERVE_LINKS,
])
.help(translate!("cp-help-cli-symbolic-links"))
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(options::ARCHIVE)
.short('a')
.long(options::ARCHIVE)
.overrides_with_all([
options::DEREFERENCE,
options::NO_DEREFERENCE,
options::CLI_SYMBOLIC_LINKS,
options::NO_DEREFERENCE_PRESERVE_LINKS,
])
.help(translate!("cp-help-archive"))
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(options::NO_DEREFERENCE_PRESERVE_LINKS)
.short('d')
.overrides_with_all([
options::DEREFERENCE,
options::NO_DEREFERENCE,
options::CLI_SYMBOLIC_LINKS,
options::ARCHIVE,
])
.help(translate!("cp-help-no-dereference-preserve-links"))
.action(ArgAction::SetTrue),
)
Expand Down
44 changes: 44 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 @@ -7400,3 +7400,47 @@ fn test_cp_recurse_verbose_output_with_symlink_already_exists() {
.no_stderr()
.stdout_is(output);
}

#[test]
#[cfg(unix)]
fn test_cp_hlp_flag_ordering() {
// GNU cp: "If more than one of -H, -L, and -P is specified, only the final one takes effect"
let (at, mut ucmd) = at_and_ucmd!();
at.touch("file.txt");
at.symlink_file("file.txt", "symlink");

// -HP: P wins, copy symlink as symlink
ucmd.args(&["-HP", "symlink", "dest_hp"]).succeeds();
assert!(at.is_symlink("dest_hp"));

// -PH: H wins, copy target file
let (at, mut ucmd) = at_and_ucmd!();
at.touch("file.txt");
at.symlink_file("file.txt", "symlink");
ucmd.args(&["-PH", "symlink", "dest_ph"]).succeeds();
assert!(!at.is_symlink("dest_ph"));
assert!(at.file_exists("dest_ph"));
}

#[test]
#[cfg(unix)]
fn test_cp_archive_deref_flag_ordering() {
// (flags, expect_symlink): last flag wins; a/d imply -P, H/L dereference
for (flags, expect_symlink) in [
("-Ha", true),
("-aH", false),
("-Hd", true),
("-dH", false),
("-La", true),
("-aL", false),
("-Ld", true),
("-dL", false),
] {
let (at, mut ucmd) = at_and_ucmd!();
at.touch("file.txt");
at.symlink_file("file.txt", "symlink");
let dest = format!("dest{flags}");
ucmd.args(&[flags, "symlink", &dest]).succeeds();
assert_eq!(at.is_symlink(&dest), expect_symlink, "failed for {flags}");
}
}
Loading