Skip to content

std: sys: fs: uefi: Make time in FileAttr optional #149538

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

Merged
merged 1 commit into from
Dec 3, 2025
+50 −37
Merged

std: sys: fs: uefi: Make time in FileAttr optional #149538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 17 additions & 11 deletions library/std/src/sys/fs/uefi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ pub struct File(!);
pub struct FileAttr {
attr: u64,
size: u64,
accessed: SystemTime,
modified: SystemTime,
created: SystemTime,
file_time: FileTimes,
created: Option<SystemTime>,
}

pub struct ReadDir(!);
Expand Down Expand Up @@ -66,24 +65,31 @@ impl FileAttr {
}

pub fn modified(&self) -> io::Result<SystemTime> {
Ok(self.modified)
self.file_time
.modified
.ok_or(io::const_error!(io::ErrorKind::InvalidData, "modification time is not valid"))
}

pub fn accessed(&self) -> io::Result<SystemTime> {
Ok(self.accessed)
self.file_time
.accessed
.ok_or(io::const_error!(io::ErrorKind::InvalidData, "last access time is not valid"))
}

pub fn created(&self) -> io::Result<SystemTime> {
Ok(self.created)
self.created
.ok_or(io::const_error!(io::ErrorKind::InvalidData, "creation time is not valid"))
}

fn from_uefi(info: helpers::UefiBox<file::Info>) -> Self {
unsafe {
Self {
attr: (*info.as_ptr()).attribute,
size: (*info.as_ptr()).file_size,
modified: uefi_fs::uefi_to_systemtime((*info.as_ptr()).modification_time),
accessed: uefi_fs::uefi_to_systemtime((*info.as_ptr()).last_access_time),
file_time: FileTimes {
modified: uefi_fs::uefi_to_systemtime((*info.as_ptr()).modification_time),
accessed: uefi_fs::uefi_to_systemtime((*info.as_ptr()).last_access_time),
},
created: uefi_fs::uefi_to_systemtime((*info.as_ptr()).create_time),
}
}
Expand Down Expand Up @@ -627,9 +633,9 @@ mod uefi_fs {

/// EDK2 FAT driver uses EFI_UNSPECIFIED_TIMEZONE to represent localtime. So for proper
/// conversion to SystemTime, we use the current time to get the timezone in such cases.
pub(crate) fn uefi_to_systemtime(mut time: r_efi::efi::Time) -> SystemTime {
pub(crate) fn uefi_to_systemtime(mut time: r_efi::efi::Time) -> Option<SystemTime> {
time.timezone = if time.timezone == r_efi::efi::UNSPECIFIED_TIMEZONE {
time::system_time_internal::now().unwrap().timezone
time::system_time_internal::now().timezone
} else {
time.timezone
};
Expand All @@ -639,7 +645,7 @@ mod uefi_fs {
/// Convert to UEFI Time with the current timezone.
#[expect(dead_code)]
fn systemtime_to_uefi(time: SystemTime) -> r_efi::efi::Time {
let now = time::system_time_internal::now().unwrap();
let now = time::system_time_internal::now();
time.to_uefi_loose(now.timezone, now.daylight)
}
}
59 changes: 33 additions & 26 deletions library/std/src/sys/pal/uefi/time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ pub const UNIX_EPOCH: SystemTime = SystemTime::from_uefi(r_efi::efi::Time {
daylight: 0,
pad1: 0,
pad2: 0,
});
})
.unwrap();

const MAX_UEFI_TIME: SystemTime = SystemTime::from_uefi(r_efi::efi::Time {
year: 9999,
Expand All @@ -38,7 +39,8 @@ const MAX_UEFI_TIME: SystemTime = SystemTime::from_uefi(r_efi::efi::Time {
daylight: 0,
pad1: 0,
pad2: 0,
});
})
.unwrap();

impl Instant {
pub fn now() -> Instant {
Expand Down Expand Up @@ -68,8 +70,11 @@ impl Instant {
}

impl SystemTime {
pub(crate) const fn from_uefi(t: r_efi::efi::Time) -> Self {
Self(system_time_internal::from_uefi(&t))
pub(crate) const fn from_uefi(t: r_efi::efi::Time) -> Option<Self> {
match system_time_internal::from_uefi(&t) {
Some(x) => Some(Self(x)),
None => None,
}
}

pub(crate) const fn to_uefi(
Expand All @@ -96,9 +101,8 @@ impl SystemTime {
}

pub fn now() -> SystemTime {
system_time_internal::now()
.map(Self::from_uefi)
.unwrap_or_else(|| panic!("time not implemented on this platform"))
Self::from_uefi(system_time_internal::now())
.expect("time incorrectly implemented on this platform")
}

pub fn sub_time(&self, other: &SystemTime) -> Result<Duration, Duration> {
Expand Down Expand Up @@ -129,38 +133,41 @@ pub(crate) mod system_time_internal {
const SECS_IN_DAY: u64 = SECS_IN_HOUR * 24;
const SYSTEMTIME_TIMEZONE: i64 = -1440 * SECS_IN_MINUTE as i64;

pub(crate) fn now() -> Option<Time> {
let runtime_services: NonNull<RuntimeServices> = helpers::runtime_services()?;
pub(crate) fn now() -> Time {
let runtime_services: NonNull<RuntimeServices> =
helpers::runtime_services().expect("Runtime services are not available");
let mut t: MaybeUninit<Time> = MaybeUninit::uninit();
let r = unsafe {
((*runtime_services.as_ptr()).get_time)(t.as_mut_ptr(), crate::ptr::null_mut())
};
if r.is_error() {
return None;
panic!("time not implemented on this platform");
}

Some(unsafe { t.assume_init() })
unsafe { t.assume_init() }
}

/// This algorithm is a modified form of the one described in the post
/// https://blog.reverberate.org/2020/05/12/optimizing-date-algorithms.html
///
/// The changes are to use 1900-01-01-00:00:00 with timezone -1440 as anchor instead of UNIX
/// epoch used in the original algorithm.
pub(crate) const fn from_uefi(t: &Time) -> Duration {
assert!(t.month <= 12 && t.month != 0);
assert!(t.year >= 1900 && t.year <= 9999);
assert!(t.day <= 31 && t.day != 0);

assert!(t.second < 60);
assert!(t.minute < 60);
assert!(t.hour < 24);
assert!(t.nanosecond < 1_000_000_000);

assert!(
(t.timezone <= 1440 && t.timezone >= -1440)
|| t.timezone == r_efi::efi::UNSPECIFIED_TIMEZONE
);
pub(crate) const fn from_uefi(t: &Time) -> Option<Duration> {
if !(t.month <= 12
&& t.month != 0
&& t.year >= 1900
&& t.year <= 9999
&& t.day <= 31
&& t.day != 0
&& t.second < 60
&& t.minute <= 60
&& t.hour < 24
&& t.nanosecond < 1_000_000_000
&& ((t.timezone <= 1440 && t.timezone >= -1440)
|| t.timezone == r_efi::efi::UNSPECIFIED_TIMEZONE))
{
return None;
}

const YEAR_BASE: u32 = 4800; /* Before min year, multiple of 400. */

Expand Down Expand Up @@ -188,7 +195,7 @@ pub(crate) mod system_time_internal {
// Calculate the offset from 1/1/1900 at timezone -1440 min
let epoch = localtime_epoch.checked_add_signed(normalized_timezone).unwrap();

Duration::new(epoch, t.nanosecond)
Some(Duration::new(epoch, t.nanosecond))
}

/// This algorithm is a modified version of the one described in the post:
Expand Down
Loading