aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2018-08-03 19:53:49 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2018-08-03 19:53:49 +0200
commit3f2e963768cd9ceb52988db2848ecf0b930f3f44 (patch)
tree506f302c8ee22d261e69f2c449cc9c5d7f6b7362
parent277e00ed12264f7ae1d17f2cbc8be40d3dc0655d (diff)
downloadbusybox-3f2e963768cd9ceb52988db2848ecf0b930f3f44.tar.gz
busybox-3f2e963768cd9ceb52988db2848ecf0b930f3f44.tar.bz2
uptime: add -s support
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--procps/uptime.c30
1 files changed, 24 insertions, 6 deletions
diff --git a/procps/uptime.c b/procps/uptime.c
index b0ee8391b..3262f41b4 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -45,7 +45,6 @@
# include <sys/sysinfo.h>
#endif
-
#ifndef FSHIFT
# define FSHIFT 16 /* nr of bits of precision */
#endif
@@ -53,29 +52,48 @@
#define LOAD_INT(x) (unsigned)((x) >> FSHIFT)
#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100)
-
int uptime_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int uptime_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
{
unsigned updays, uphours, upminutes;
+ unsigned opts;
struct sysinfo info;
struct tm *current_time;
time_t current_secs;
+ opts = getopt32(argv, "s");
+
time(&current_secs);
+ sysinfo(&info);
+
+ if (opts) // -s
+ current_secs -= info.uptime;
+
current_time = localtime(&current_secs);
- sysinfo(&info);
+ if (opts) { // -s
+ printf("%04u-%02u-%02u %02u:%02u:%02u\n",
+ current_time->tm_year + 1900, current_time->tm_mon + 1, current_time->tm_mday,
+ current_time->tm_hour, current_time->tm_min, current_time->tm_sec
+ );
+ /* The above way of calculating boot time is wobbly,
+ * info.uptime has only 1 second precision, which makes
+ * "uptime -s" wander +- one second.
+ * /proc/uptime may be better, it has 0.01s precision.
+ */
+ return EXIT_SUCCESS;
+ }
printf(" %02u:%02u:%02u up ",
- current_time->tm_hour, current_time->tm_min, current_time->tm_sec);
+ current_time->tm_hour, current_time->tm_min, current_time->tm_sec
+ );
updays = (unsigned) info.uptime / (unsigned)(60*60*24);
- if (updays)
+ if (updays != 0)
printf("%u day%s, ", updays, (updays != 1) ? "s" : "");
upminutes = (unsigned) info.uptime / (unsigned)60;
uphours = (upminutes / (unsigned)60) % (unsigned)24;
upminutes %= 60;
- if (uphours)
+ if (uphours != 0)
printf("%2u:%02u", uphours, upminutes);
else
printf("%u min", upminutes);