Skip to content

Commit

Permalink
Merge pull request #2998 from tertsdiepraam/cp-override-args
Browse files Browse the repository at this point in the history 
`cp`: override args instead of having them conflict
  • Loading branch information
@sylvestre
sylvestre authored Feb 28, 2022
2 parents 95765dc + 9aca050 commit bbef777
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 15 deletions.
36 changes: 21 additions & 15 deletions src/uu/cp/src/cp.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,13 @@ static DEFAULT_ATTRIBUTES: &[Attribute] = &[
];

pub fn uu_app<'a>() -> App<'a> {
const MODE_ARGS: &[&str] = &[
options::LINK,
options::REFLINK,
options::SYMBOLIC_LINK,
options::ATTRIBUTES_ONLY,
options::COPY_CONTENTS,
];
App::new(uucore::util_name())
.version(crate_version!())
.about(ABOUT)
Expand All @@ -314,17 +321,17 @@ pub fn uu_app<'a>() -> App<'a> {
.arg(Arg::new(options::INTERACTIVE)
.short('i')
.long(options::INTERACTIVE)
.conflicts_with(options::NO_CLOBBER)
.overrides_with(options::NO_CLOBBER)
.help("ask before overwriting files"))
.arg(Arg::new(options::LINK)
.short('l')
.long(options::LINK)
.overrides_with(options::REFLINK)
.overrides_with_all(MODE_ARGS)
.help("hard-link files instead of copying"))
.arg(Arg::new(options::NO_CLOBBER)
.short('n')
.long(options::NO_CLOBBER)
.conflicts_with(options::INTERACTIVE)
.overrides_with(options::INTERACTIVE)
.help("don't overwrite a file that already exists"))
.arg(Arg::new(options::RECURSIVE)
.short('r')
Expand All @@ -344,8 +351,7 @@ pub fn uu_app<'a>() -> App<'a> {
.arg(Arg::new(options::SYMBOLIC_LINK)
.short('s')
.long(options::SYMBOLIC_LINK)
.conflicts_with(options::LINK)
.overrides_with(options::REFLINK)
.overrides_with_all(MODE_ARGS)
.help("make symbolic links instead of copying"))
.arg(Arg::new(options::FORCE)
.short('f')
Expand All @@ -355,7 +361,7 @@ pub fn uu_app<'a>() -> App<'a> {
Currently not implemented for Windows."))
.arg(Arg::new(options::REMOVE_DESTINATION)
.long(options::REMOVE_DESTINATION)
.conflicts_with(options::FORCE)
.overrides_with(options::FORCE)
.help("remove each existing destination file before attempting to open it \
(contrast with --force). On Windows, current only works for writeable files."))
.arg(backup_control::arguments::backup())
Expand All @@ -370,11 +376,11 @@ pub fn uu_app<'a>() -> App<'a> {
.long(options::REFLINK)
.takes_value(true)
.value_name("WHEN")
.overrides_with_all(MODE_ARGS)
.help("control clone/CoW copies. See below"))
.arg(Arg::new(options::ATTRIBUTES_ONLY)
.long(options::ATTRIBUTES_ONLY)
.conflicts_with(options::COPY_CONTENTS)
.overrides_with(options::REFLINK)
.overrides_with_all(MODE_ARGS)
.help("Don't copy the file data, just the attributes"))
.arg(Arg::new(options::PRESERVE)
.long(options::PRESERVE)
Expand All @@ -384,21 +390,21 @@ pub fn uu_app<'a>() -> App<'a> {
.possible_values(PRESERVABLE_ATTRIBUTES)
.min_values(0)
.value_name("ATTR_LIST")
.conflicts_with_all(&[options::PRESERVE_DEFAULT_ATTRIBUTES, options::NO_PRESERVE])
.overrides_with_all(&[options::ARCHIVE, options::PRESERVE_DEFAULT_ATTRIBUTES, options::NO_PRESERVE])
// -d sets this option
// --archive sets this option
.help("Preserve the specified attributes (default: mode, ownership (unix only), timestamps), \
if possible additional attributes: context, links, xattr, all"))
.arg(Arg::new(options::PRESERVE_DEFAULT_ATTRIBUTES)
.short('p')
.long(options::PRESERVE_DEFAULT_ATTRIBUTES)
.conflicts_with_all(&[options::PRESERVE, options::NO_PRESERVE, options::ARCHIVE])
.overrides_with_all(&[options::PRESERVE, options::NO_PRESERVE, options::ARCHIVE])
.help("same as --preserve=mode,ownership(unix only),timestamps"))
.arg(Arg::new(options::NO_PRESERVE)
.long(options::NO_PRESERVE)
.takes_value(true)
.value_name("ATTR_LIST")
.conflicts_with_all(&[options::PRESERVE_DEFAULT_ATTRIBUTES, options::PRESERVE, options::ARCHIVE])
.overrides_with_all(&[options::PRESERVE_DEFAULT_ATTRIBUTES, options::PRESERVE, options::ARCHIVE])
.help("don't preserve the specified attributes"))
.arg(Arg::new(options::PARENTS)
.long(options::PARENTS)
Expand All @@ -407,18 +413,18 @@ pub fn uu_app<'a>() -> App<'a> {
.arg(Arg::new(options::NO_DEREFERENCE)
.short('P')
.long(options::NO_DEREFERENCE)
.conflicts_with(options::DEREFERENCE)
.overrides_with(options::DEREFERENCE)
// -d sets this option
.help("never follow symbolic links in SOURCE"))
.arg(Arg::new(options::DEREFERENCE)
.short('L')
.long(options::DEREFERENCE)
.conflicts_with(options::NO_DEREFERENCE)
.overrides_with(options::NO_DEREFERENCE)
.help("always follow symbolic links in SOURCE"))
.arg(Arg::new(options::ARCHIVE)
.short('a')
.long(options::ARCHIVE)
.conflicts_with_all(&[options::PRESERVE_DEFAULT_ATTRIBUTES, options::PRESERVE, options::NO_PRESERVE])
.overrides_with_all(&[options::PRESERVE_DEFAULT_ATTRIBUTES, options::PRESERVE, options::NO_PRESERVE])
.help("Same as -dR --preserve=all"))
.arg(Arg::new(options::NO_DEREFERENCE_PRESERVE_LINKS)
.short('d')
Expand All @@ -431,7 +437,7 @@ pub fn uu_app<'a>() -> App<'a> {
// TODO: implement the following args
.arg(Arg::new(options::COPY_CONTENTS)
.long(options::COPY_CONTENTS)
.conflicts_with(options::ATTRIBUTES_ONLY)
.overrides_with(options::ATTRIBUTES_ONLY)
.help("NotImplemented: copy contents of special files when recursive"))
.arg(Arg::new(options::SPARSE)
.long(options::SPARSE)
Expand Down
25 changes: 25 additions & 0 deletions tests/by-util/test_cp.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1517,3 +1517,28 @@ fn test_cp_dir_vs_file() {
.fails()
.stderr_only("cp: cannot overwrite non-directory with directory");
}

#[test]
fn test_cp_overriding_arguments() {
let s = TestScenario::new(util_name!());
s.fixtures.touch("file1");
for (arg1, arg2) in &[
#[cfg(not(windows))]
("--remove-destination", "--force"),
#[cfg(not(windows))]
("--force", "--remove-destination"),
("--interactive", "--no-clobber"),
("--link", "--symbolic-link"),
("--symbolic-link", "--link"),
("--dereference", "--no-dereference"),
("--no-dereference", "--dereference"),
] {
s.ucmd()
.arg(arg1)
.arg(arg2)
.arg("file1")
.arg("file2")
.succeeds();
s.fixtures.remove("file2");
}
}

0 comments on commit bbef777

Please sign in to comment.