Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-14 15:22:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4123 from sssemil/preserve_noargs_4122

Browse source 
cp: make `--preserve` use the defaults when empty
This commit is contained in:
Terts Diepraam 2022-11-16 11:49:16 +01:00 committed by GitHub
commit 7330effa68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -745,7 +745,12 @@ impl Options {
attributes.push(Attribute::from_str(attribute_str)?);
}
}
attributes
// `--preserve` case, use the defaults
if attributes.is_empty() {
DEFAULT_ATTRIBUTES.to_vec()
} else {
attributes
}
}
}
} else if matches.get_flag(options::ARCHIVE) {

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

@ -881,11 +881,29 @@ fn test_cp_issue_1665() {
#[test]
fn test_cp_preserve_no_args() {
new_ucmd!()
.arg(TEST_COPY_FROM_FOLDER_FILE)
.arg(TEST_HELLO_WORLD_DEST)
let (at, mut ucmd) = at_and_ucmd!();
let src_file = "a";
let dst_file = "b";
// Prepare the source file
at.touch(src_file);
#[cfg(unix)]
at.set_mode(src_file, 0o0500);
// Copy
ucmd.arg(src_file)
.arg(dst_file)
.arg("--preserve")
.succeeds();
#[cfg(unix)]
{
// Assert that the mode, ownership, and timestamps are preserved
// NOTICE: the ownership is not modified on the src file, because that requires root permissions
let metadata_src = at.metadata(src_file);
let metadata_dst = at.metadata(dst_file);
assert_metadata_eq!(metadata_src, metadata_dst);
}
}
#[test]