RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

cp: make --backup and --no-clobber are mutually exclusive (#7082)

Browse source 
* cp: make --backup and --no-clobber are mutually exclusive

Should fix tests/cp/cp-i.sh

* simplify the test

Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>

---------

Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>
This commit is contained in:
Sylvestre Ledru 2025-01-06 09:40:41 +01:00 • committed by GitHub
parent 7a78213edb
commit 934e85f4cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/uu/cp/src/cp.rs
View file

@ -932,6 +932,16 @@ impl Options {
};
let update_mode = update_control::determine_update_mode(matches);
if backup_mode != BackupMode::NoBackup
&& matches
.get_one::<String>(update_control::arguments::OPT_UPDATE)
.map_or(false, |v| v == "none" || v == "none-fail")
{
return Err(Error::InvalidArgument(
"--backup is mutually exclusive with -n or --update=none-fail".to_string(),
));
}
let backup_suffix = backup_control::determine_backup_suffix(matches);
let overwrite = OverwriteMode::from_matches(matches);

11
tests/by-util/test_cp.rs
View file

@ -2422,6 +2422,17 @@ fn test_cp_reflink_bad() {
.stderr_contains("error: invalid value 'bad' for '--reflink[=<WHEN>]'");
}
#[test]
fn test_cp_conflicting_update() {
new_ucmd!()
.arg("-b")
.arg("--update=none")
.arg("a")
.arg("b")
.fails()
.stderr_contains("--backup is mutually exclusive with -n or --update=none-fail");
}
#[test]
#[cfg(any(target_os = "linux", target_os = "android"))]
fn test_cp_reflink_insufficient_permission() {