1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 11:07:44 +00:00

uptime: improve readability of uptime_since

reduce number of cfgs, rename var
This commit is contained in:
Daniel Hofstetter 2025-06-13 17:08:28 +02:00
parent de68c27f31
commit 54d61cb2c8

View file

@ -188,20 +188,17 @@ fn uptime_with_file(file_path: &OsString) -> UResult<()> {
fn uptime_since() -> UResult<()> { fn uptime_since() -> UResult<()> {
#[cfg(unix)] #[cfg(unix)]
#[cfg(not(target_os = "openbsd"))] #[cfg(not(target_os = "openbsd"))]
let uptime = {
let (boot_time, _) = process_utmpx(None); let (boot_time, _) = process_utmpx(None);
get_uptime(boot_time)?
#[cfg(target_os = "openbsd")] };
let uptime = get_uptime(None)?; #[cfg(any(windows, target_os = "openbsd"))]
#[cfg(unix)]
#[cfg(not(target_os = "openbsd"))]
let uptime = get_uptime(boot_time)?;
#[cfg(target_os = "windows")]
let uptime = get_uptime(None)?; let uptime = get_uptime(None)?;
let initial_date = Local let since_date = Local
.timestamp_opt(Utc::now().timestamp() - uptime, 0) .timestamp_opt(Utc::now().timestamp() - uptime, 0)
.unwrap(); .unwrap();
println!("{}", initial_date.format("%Y-%m-%d %H:%M:%S")); println!("{}", since_date.format("%Y-%m-%d %H:%M:%S"));
Ok(()) Ok(())
} }