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

cp: show errors in cow on linux

Browse source
This commit is contained in:
Michael Debertol 2021-06-01 23:06:38 +02:00
parent 3cf966810f
commit a323e9cda1
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1261,13 +1261,15 @@ fn copy_helper(source: &Path, dest: &Path, options: &Options) -> CopyResult<()>
fn copy_on_write_linux(source: &Path, dest: &Path, mode: ReflinkMode) -> CopyResult<()> { fn copy_on_write_linux(source: &Path, dest: &Path, mode: ReflinkMode) -> CopyResult<()> {
debug_assert!(mode != ReflinkMode::Never); debug_assert!(mode != ReflinkMode::Never);
let src_file = File::open(source).unwrap().into_raw_fd(); let src_file = File::open(source)
.context(&*context_for(source, dest))?
.into_raw_fd();
let dst_file = OpenOptions::new() let dst_file = OpenOptions::new()
.write(true) .write(true)
.truncate(false) .truncate(false)
.create(true) .create(true)
.open(dest) .open(dest)
.unwrap() .context(&*context_for(source, dest))?
.into_raw_fd(); .into_raw_fd();
match mode { match mode {
ReflinkMode::Always => unsafe { ReflinkMode::Always => unsafe {

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

@ -7,6 +7,8 @@ use std::fs::set_permissions;
#[cfg(not(windows))] #[cfg(not(windows))]
use std::os::unix::fs; use std::os::unix::fs;
#[cfg(target_os = "linux")]
use std::os::unix::fs::PermissionsExt;
#[cfg(windows)] #[cfg(windows)]
use std::os::windows::fs::symlink_file; use std::os::windows::fs::symlink_file;
@ -1257,3 +1259,20 @@ fn test_cp_reflink_bad() {
.fails() .fails()
.stderr_contains("invalid argument"); .stderr_contains("invalid argument");
} }
#[test]
#[cfg(target_os = "linux")]
fn test_cp_reflink_insufficient_permission() {
let (at, mut ucmd) = at_and_ucmd!();
at.make_file("unreadable")
.set_permissions(PermissionsExt::from_mode(0o000))
.unwrap();
ucmd.arg("-r")
.arg("--reflink=auto")
.arg("unreadable")
.arg(TEST_EXISTING_FILE)
.fails()
.stderr_only("cp: 'unreadable' -> 'existing_file.txt': Permission denied (os error 13)");
}