mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 19:47:45 +00:00
cp: preserve permission on -p --parents (#4853)
This commit is contained in:
parent
452be5a220
commit
7a31d841ba
2 changed files with 66 additions and 0 deletions
|
@ -1704,6 +1704,11 @@ fn copy_file(
|
||||||
}
|
}
|
||||||
|
|
||||||
copy_attributes(source, dest, &options.attributes)?;
|
copy_attributes(source, dest, &options.attributes)?;
|
||||||
|
if options.parents && should_preserve_attribute(options) {
|
||||||
|
for (x, y) in aligned_ancestors(source, dest) {
|
||||||
|
copy_attributes(x, y, &options.attributes)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if let Some(progress_bar) = progress_bar {
|
if let Some(progress_bar) = progress_bar {
|
||||||
progress_bar.inc(fs::metadata(source)?.len());
|
progress_bar.inc(fs::metadata(source)?.len());
|
||||||
|
@ -1753,6 +1758,27 @@ fn copy_helper(
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn should_preserve_attribute(options: &Options) -> bool {
|
||||||
|
let checks = [
|
||||||
|
&options.attributes.mode,
|
||||||
|
&options.attributes.timestamps,
|
||||||
|
&options.attributes.links,
|
||||||
|
&options.attributes.context,
|
||||||
|
&options.attributes.xattr,
|
||||||
|
];
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
let checks = [
|
||||||
|
checks.as_slice(),
|
||||||
|
[&options.attributes.ownership].as_slice(),
|
||||||
|
]
|
||||||
|
.concat();
|
||||||
|
|
||||||
|
checks
|
||||||
|
.iter()
|
||||||
|
.any(|attr| matches!(attr, Preserve::Yes { .. }))
|
||||||
|
}
|
||||||
|
|
||||||
// "Copies" a FIFO by creating a new one. This workaround is because Rust's
|
// "Copies" a FIFO by creating a new one. This workaround is because Rust's
|
||||||
// built-in fs::copy does not handle FIFOs (see rust-lang/rust/issues/79390).
|
// built-in fs::copy does not handle FIFOs (see rust-lang/rust/issues/79390).
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
|
|
|
@ -1075,6 +1075,46 @@ fn test_cp_parents_dest_not_directory() {
|
||||||
.stderr_contains("with --parents, the destination must be a directory");
|
.stderr_contains("with --parents, the destination must be a directory");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_cp_parents_with_permissions_copy_file() {
|
||||||
|
let (at, mut ucmd) = at_and_ucmd!();
|
||||||
|
|
||||||
|
let dir = "dir";
|
||||||
|
let file = "p1/p2/file";
|
||||||
|
|
||||||
|
at.mkdir(dir);
|
||||||
|
at.mkdir_all("p1/p2");
|
||||||
|
at.touch(file);
|
||||||
|
|
||||||
|
let p1_mode = 0o0777;
|
||||||
|
let p2_mode = 0o0711;
|
||||||
|
let file_mode = 0o0702;
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
at.set_mode("p1", p1_mode);
|
||||||
|
at.set_mode("p1/p2", p2_mode);
|
||||||
|
at.set_mode(file, file_mode);
|
||||||
|
}
|
||||||
|
|
||||||
|
ucmd.arg("-p")
|
||||||
|
.arg("--parents")
|
||||||
|
.arg(file)
|
||||||
|
.arg(dir)
|
||||||
|
.succeeds();
|
||||||
|
|
||||||
|
#[cfg(all(unix, not(target_os = "freebsd")))]
|
||||||
|
{
|
||||||
|
let p1_metadata = at.metadata("p1");
|
||||||
|
let p2_metadata = at.metadata("p1/p2");
|
||||||
|
let file_metadata = at.metadata(file);
|
||||||
|
|
||||||
|
assert_metadata_eq!(p1_metadata, at.metadata("dir/p1"));
|
||||||
|
assert_metadata_eq!(p2_metadata, at.metadata("dir/p1/p2"));
|
||||||
|
assert_metadata_eq!(file_metadata, at.metadata("dir/p1/p2/file"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
fn test_cp_writable_special_file_permissions() {
|
fn test_cp_writable_special_file_permissions() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue