34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
|
From bfb0eadc38e789737dec7f14dd7a7ac00f5f0761 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Robert Malz <mail.robert.malz@gmail.com>
|
||
|
|
Date: Thu, 21 Sep 2023 16:45:49 +1000
|
||
|
|
Subject: [PATCH] uptime: fix output on 60 seconds
|
||
|
|
|
||
|
|
When procps_uptime will return 60 seconds uptime -p will not
|
||
|
|
provide any output except "up". To stay consistent with other
|
||
|
|
time units the expected output is "up 0 minutes".
|
||
|
|
|
||
|
|
References:
|
||
|
|
#302
|
||
|
|
|
||
|
|
Signed-off-by: Craig Small <csmall@dropbear.xyz>
|
||
|
|
---
|
||
|
|
library/uptime.c | 2 +-
|
||
|
|
1 files changed, 1 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/library/uptime.c b/library/uptime.c
|
||
|
|
index b41538f5..5faeefca 100644
|
||
|
|
--- a/library/uptime.c
|
||
|
|
+++ b/library/uptime.c
|
||
|
|
@@ -258,7 +258,7 @@ PROCPS_EXPORT char *procps_uptime_sprint_short(void)
|
||
|
|
comma += 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (upminutes || (!upminutes && uptime_secs < 60)) {
|
||
|
|
+ if (upminutes || (!upminutes && uptime_secs <= 60)) {
|
||
|
|
pos += sprintf(shortbuf + pos, "%s%d %s",
|
||
|
|
comma > 0 ? ", " : "", upminutes,
|
||
|
|
upminutes != 1 ? "minutes" : "minute");
|
||
|
|
--
|
||
|
|
GitLab
|
||
|
|
|