RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

cp: copy attributes of dangling symbolic link

Browse source 
Fix a bug in which `cp` incorrectly exited with an error when
attempting to copy the attributes of a dangling symbolic link (that
is, when running `cp -P -p`).

Fixes #3531.
This commit is contained in:
Jeffrey Finkelstein 2022-07-03 13:01:23 -04:00
parent a7a9da9672
commit 4780690caa
2 changed files with 53 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1146,12 +1146,19 @@ fn copy_attribute(source: &Path, dest: &Path, attribute: &Attribute) -> CopyResu
let source_metadata = fs::symlink_metadata(source).context(context)?;
match *attribute {
Attribute::Mode => {
fs::set_permissions(dest, source_metadata.permissions()).context(context)?;
// FIXME: Implement this for windows as well
#[cfg(feature = "feat_acl")]
exacl::getfacl(source, None)
.and_then(|acl| exacl::setfacl(&[dest], &acl, None))
.map_err(|err| Error::Error(err.to_string()))?;
// The `chmod()` system call that underlies the
// `fs::set_permissions()` call is unable to change the
// permissions of a symbolic link. In that case, we just
// do nothing, since every symbolic link has the same
// permissions.
if !is_symlink(dest) {
fs::set_permissions(dest, source_metadata.permissions()).context(context)?;
// FIXME: Implement this for windows as well
#[cfg(feature = "feat_acl")]
exacl::getfacl(source, None)
.and_then(|acl| exacl::setfacl(&[dest], &acl, None))
.map_err(|err| Error::Error(err.to_string()))?;
}
}
#[cfg(unix)]
Attribute::Ownership => {
@ -1177,11 +1184,13 @@ fn copy_attribute(source: &Path, dest: &Path, attribute: &Attribute) -> CopyResu
.map_err(Error::Error)?;
}
Attribute::Timestamps => {
filetime::set_file_times(
Path::new(dest),
FileTime::from_last_access_time(&source_metadata),
FileTime::from_last_modification_time(&source_metadata),
)?;
let atime = FileTime::from_last_access_time(&source_metadata);
let mtime = FileTime::from_last_modification_time(&source_metadata);
if is_symlink(dest) {
filetime::set_symlink_file_times(dest, atime, mtime)?;
} else {
filetime::set_file_times(dest, atime, mtime)?;
}
}
#[cfg(feature = "feat_selinux")]
Attribute::Context => {

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

@ -9,6 +9,8 @@ use std::os::unix::fs;
#[cfg(unix)]
use std::os::unix::fs::symlink as symlink_file;
#[cfg(unix)]
use std::os::unix::fs::MetadataExt;
#[cfg(all(unix, not(target_os = "freebsd")))]
use std::os::unix::fs::PermissionsExt;
#[cfg(windows)]
@ -1536,6 +1538,37 @@ fn test_copy_through_dangling_symlink_no_dereference() {
.no_stdout();
}
/// Test for copying a dangling symbolic link and its permissions.
#[test]
fn test_copy_through_dangling_symlink_no_dereference_permissions() {
let (at, mut ucmd) = at_and_ucmd!();
// target name link name
at.symlink_file("no-such-file", "dangle");
// don't dereference the link
// | copy permissions, too
// | | from the link
// | | | to new file d2
// | | | |
// V V V V
ucmd.args(&["-P", "-p", "dangle", "d2"])
.succeeds()
.no_stderr()
.no_stdout();
assert!(at.symlink_exists("d2"));
// `-p` means `--preserve=mode,ownership,timestamps`
#[cfg(unix)]
{
let metadata1 = at.symlink_metadata("dangle");
let metadata2 = at.symlink_metadata("d2");
assert_eq!(metadata1.mode(), metadata2.mode());
assert_eq!(metadata1.uid(), metadata2.uid());
assert_eq!(metadata1.atime(), metadata2.atime());
assert_eq!(metadata1.mtime(), metadata2.mtime());
assert_eq!(metadata1.ctime(), metadata2.ctime());
}
}
#[test]
#[cfg(unix)]
fn test_cp_archive_on_nonexistent_file() {