From 54d61cb2c83577d98f4d8d153667f6b9976d19ed Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Fri, 13 Jun 2025 17:08:28 +0200 Subject: [PATCH] uptime: improve readability of uptime_since reduce number of cfgs, rename var --- src/uu/uptime/src/uptime.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/uu/uptime/src/uptime.rs b/src/uu/uptime/src/uptime.rs index 3bf1b8d7927..70e818dc3e6 100644 --- a/src/uu/uptime/src/uptime.rs +++ b/src/uu/uptime/src/uptime.rs @@ -188,20 +188,17 @@ fn uptime_with_file(file_path: &OsString) -> UResult<()> { fn uptime_since() -> UResult<()> { #[cfg(unix)] #[cfg(not(target_os = "openbsd"))] - let (boot_time, _) = process_utmpx(None); - - #[cfg(target_os = "openbsd")] - let uptime = get_uptime(None)?; - #[cfg(unix)] - #[cfg(not(target_os = "openbsd"))] - let uptime = get_uptime(boot_time)?; - #[cfg(target_os = "windows")] + let uptime = { + let (boot_time, _) = process_utmpx(None); + get_uptime(boot_time)? + }; + #[cfg(any(windows, target_os = "openbsd"))] let uptime = get_uptime(None)?; - let initial_date = Local + let since_date = Local .timestamp_opt(Utc::now().timestamp() - uptime, 0) .unwrap(); - println!("{}", initial_date.format("%Y-%m-%d %H:%M:%S")); + println!("{}", since_date.format("%Y-%m-%d %H:%M:%S")); Ok(()) }