Skip to content

Factor out helpers for file times #147504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+74 −42
Open

Factor out helpers for file times #147504

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e6b444
library: fs: Factor out a `file_time_to_timespec` function in prepara…
joshtriplett Oct 7, 2025
3bfda04
library: fs: Factor out the Apple file time to attrlist code for reuse
joshtriplett Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 74 additions & 42 deletions library/std/src/sys/fs/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1604,24 +1604,6 @@ impl File {
}

pub fn set_times(&self, times: FileTimes) -> io::Result<()> {
#[cfg(not(any(
target_os = "redox",
target_os = "espidf",
target_os = "horizon",
target_os = "nuttx",
)))]
let to_timespec = |time: Option<SystemTime>| match time {
Some(time) if let Some(ts) = time.t.to_timespec() => Ok(ts),
Some(time) if time > crate::sys::time::UNIX_EPOCH => Err(io::const_error!(
io::ErrorKind::InvalidInput,
"timestamp is too large to set as a file time",
)),
Some(_) => Err(io::const_error!(
io::ErrorKind::InvalidInput,
"timestamp is too small to set as a file time",
)),
None => Ok(libc::timespec { tv_sec: 0, tv_nsec: libc::UTIME_OMIT as _ }),
};
cfg_select! {
any(target_os = "redox", target_os = "espidf", target_os = "horizon", target_os = "nuttx") => {
// Redox doesn't appear to support `UTIME_OMIT`.
Expand All @@ -1634,36 +1616,18 @@ impl File {
))
}
target_vendor = "apple" => {
let mut buf = [mem::MaybeUninit::<libc::timespec>::uninit(); 3];
let mut num_times = 0;
let mut attrlist: libc::attrlist = unsafe { mem::zeroed() };
attrlist.bitmapcount = libc::ATTR_BIT_MAP_COUNT;
if times.created.is_some() {
buf[num_times].write(to_timespec(times.created)?);
num_times += 1;
attrlist.commonattr |= libc::ATTR_CMN_CRTIME;
}
if times.modified.is_some() {
buf[num_times].write(to_timespec(times.modified)?);
num_times += 1;
attrlist.commonattr |= libc::ATTR_CMN_MODTIME;
}
if times.accessed.is_some() {
buf[num_times].write(to_timespec(times.accessed)?);
num_times += 1;
attrlist.commonattr |= libc::ATTR_CMN_ACCTIME;
}
let ta = TimesAttrlist::from_times(&times)?;
cvt(unsafe { libc::fsetattrlist(
self.as_raw_fd(),
(&raw const attrlist).cast::<libc::c_void>().cast_mut(),
buf.as_ptr().cast::<libc::c_void>().cast_mut(),
num_times * size_of::<libc::timespec>(),
ta.attrlist(),
ta.times_buf(),
ta.times_buf_size(),
0
) })?;
Ok(())
}
target_os = "android" => {
let times = [to_timespec(times.accessed)?, to_timespec(times.modified)?];
let times = [file_time_to_timespec(times.accessed)?, file_time_to_timespec(times.modified)?];
// futimens requires Android API level 19
cvt(unsafe {
weak!(
Expand Down Expand Up @@ -1697,14 +1661,82 @@ impl File {
return Ok(());
}
}
let times = [to_timespec(times.accessed)?, to_timespec(times.modified)?];
let times = [file_time_to_timespec(times.accessed)?, file_time_to_timespec(times.modified)?];
cvt(unsafe { libc::futimens(self.as_raw_fd(), times.as_ptr()) })?;
Ok(())
}
}
}
}

#[cfg(not(any(
target_os = "redox",
target_os = "espidf",
target_os = "horizon",
target_os = "nuttx",
)))]
fn file_time_to_timespec(time: Option<SystemTime>) -> io::Result<libc::timespec> {
match time {
Some(time) if let Some(ts) = time.t.to_timespec() => Ok(ts),
Some(time) if time > crate::sys::time::UNIX_EPOCH => Err(io::const_error!(
io::ErrorKind::InvalidInput,
"timestamp is too large to set as a file time",
)),
Some(_) => Err(io::const_error!(
io::ErrorKind::InvalidInput,
"timestamp is too small to set as a file time",
)),
None => Ok(libc::timespec { tv_sec: 0, tv_nsec: libc::UTIME_OMIT as _ }),
}
}

#[cfg(target_vendor = "apple")]
struct TimesAttrlist {
buf: [mem::MaybeUninit<libc::timespec>; 3],
attrlist: libc::attrlist,
num_times: usize,
}

#[cfg(target_vendor = "apple")]
impl TimesAttrlist {
fn from_times(times: &FileTimes) -> io::Result<Self> {
let mut this = Self {
buf: [mem::MaybeUninit::<libc::timespec>::uninit(); 3],
attrlist: unsafe { mem::zeroed() },
num_times: 0,
};
this.attrlist.bitmapcount = libc::ATTR_BIT_MAP_COUNT;
if times.created.is_some() {
this.buf[this.num_times].write(file_time_to_timespec(times.created)?);
this.num_times += 1;
this.attrlist.commonattr |= libc::ATTR_CMN_CRTIME;
}
if times.modified.is_some() {
this.buf[this.num_times].write(file_time_to_timespec(times.modified)?);
this.num_times += 1;
this.attrlist.commonattr |= libc::ATTR_CMN_MODTIME;
}
if times.accessed.is_some() {
this.buf[this.num_times].write(file_time_to_timespec(times.accessed)?);
this.num_times += 1;
this.attrlist.commonattr |= libc::ATTR_CMN_ACCTIME;
}
Ok(this)
}

fn attrlist(&self) -> *mut libc::c_void {
(&raw const self.attrlist).cast::<libc::c_void>().cast_mut()
}

fn times_buf(&self) -> *mut libc::c_void {
self.buf.as_ptr().cast::<libc::c_void>().cast_mut()
}

fn times_buf_size(&self) -> usize {
self.num_times * size_of::<libc::timespec>()
}
}

impl DirBuilder {
pub fn new() -> DirBuilder {
DirBuilder { mode: 0o777 }
Expand Down
Loading