RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

Merge pull request #1444 from sylvestre/master

Browse source 
uptime: match the gnu version output
This commit is contained in:
Alex Lyon 2020-01-27 14:50:48 -08:00 • committed by GitHub
commit bf1cec8365
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/uptime/uptime.rs
View file

@ -139,9 +139,9 @@ fn process_utmpx() -> (Option<time_t>, usize) {
fn print_nusers(nusers: usize) { fn print_nusers(nusers: usize) {
if nusers == 1 { if nusers == 1 {
print!("1 user, "); print!("1 user, ");
} else if nusers > 1 { } else if nusers > 1 {
print!("{} users, ", nusers); print!("{} users, ", nusers);
} }
} }
@ -190,9 +190,9 @@ fn print_uptime(upsecs: i64) {
let uphours = (upsecs - (updays * 86400)) / 3600; let uphours = (upsecs - (updays * 86400)) / 3600;
let upmins = (upsecs - (updays * 86400) - (uphours * 3600)) / 60; let upmins = (upsecs - (updays * 86400) - (uphours * 3600)) / 60;
if updays == 1 { if updays == 1 {
print!("up {:1} day, {:2}:{:02}, ", updays, uphours, upmins); print!("up {:1} day, {:2}:{:02}, ", updays, uphours, upmins);
} else if updays > 1 { } else if updays > 1 {
print!("up {:1} days, {:2}:{:02}, ", updays, uphours, upmins); print!("up {:1} days, {:2}:{:02}, ", updays, uphours, upmins);
} else { } else {
print!("up {:2}:{:02}, ", uphours, upmins); print!("up {:2}:{:02}, ", uphours, upmins);
} }