bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Unify fs::copy and io::copy

Browse source
This commit is contained in:
Alex Saveau 2024-12-17 12:40:39 -05:00 • committed by Alex Saveau
parent 387b245664
commit 73b41fbcfa
No known key found for this signature in database
GPG key ID: 3F8D5B16EB169D48
1 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
library/std/src/sys/pal/unix/fs.rs
View file

@ -1980,7 +1980,7 @@ fn open_to_and_set_permissions(
Ok((writer, writer_metadata))
}
#[cfg(not(any(target_os = "linux", target_os = "android", target_vendor = "apple")))]
#[cfg(not(target_vendor = "apple"))]
pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
let (mut reader, reader_metadata) = open_from(from)?;
let (mut writer, _) = open_to_and_set_permissions(to, reader_metadata)?;
@ -1988,24 +1988,6 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
io::copy(&mut reader, &mut writer)
}
#[cfg(any(target_os = "linux", target_os = "android"))]
pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
let (mut reader, reader_metadata) = open_from(from)?;
let max_len = u64::MAX;
let (mut writer, _) = open_to_and_set_permissions(to, reader_metadata)?;
use super::kernel_copy::{CopyResult, copy_regular_files};
match copy_regular_files(reader.as_raw_fd(), writer.as_raw_fd(), max_len) {
CopyResult::Ended(bytes) => Ok(bytes),
CopyResult::Error(e, _) => Err(e),
CopyResult::Fallback(written) => match io::copy::generic_copy(&mut reader, &mut writer) {
Ok(bytes) => Ok(bytes + written),
Err(e) => Err(e),
},
}
}
#[cfg(target_vendor = "apple")]
pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
const COPYFILE_ALL: libc::copyfile_flags_t = libc::COPYFILE_METADATA | libc::COPYFILE_DATA;