emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uptime: add -s support

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-08-03 19:53:49 +02:00
parent 277e00ed12
commit 3f2e963768
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
procps/uptime.c
View File

@ -45,7 +45,6 @@
# include <sys/sysinfo.h> # include <sys/sysinfo.h>
#endif #endif
#ifndef FSHIFT #ifndef FSHIFT
# define FSHIFT 16 /* nr of bits of precision */ # define FSHIFT 16 /* nr of bits of precision */
#endif #endif
@ -53,29 +52,48 @@
#define LOAD_INT(x) (unsigned)((x) >> FSHIFT) #define LOAD_INT(x) (unsigned)((x) >> FSHIFT)
#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1 - 1)) * 100) #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, char **argv) MAIN_EXTERNALLY_VISIBLE;
int uptime_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) int uptime_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
{ {
unsigned updays, uphours, upminutes; unsigned updays, uphours, upminutes;
unsigned opts;
struct sysinfo info; struct sysinfo info;
struct tm *current_time; struct tm *current_time;
time_t current_secs; time_t current_secs;
time(&current_secs); opts = getopt32(argv, "s");
current_time = localtime(&current_secs);
time(&current_secs);
sysinfo(&info); sysinfo(&info);
if (opts) // -s
current_secs -= info.uptime;
current_time = localtime(&current_secs);
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 ", 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); updays = (unsigned) info.uptime / (unsigned)(60*60*24);
if (updays) if (updays != 0)
printf("%u day%s, ", updays, (updays != 1) ? "s" : ""); printf("%u day%s, ", updays, (updays != 1) ? "s" : "");
upminutes = (unsigned) info.uptime / (unsigned)60; upminutes = (unsigned) info.uptime / (unsigned)60;
uphours = (upminutes / (unsigned)60) % (unsigned)24; uphours = (upminutes / (unsigned)60) % (unsigned)24;
upminutes %= 60; upminutes %= 60;
if (uphours) if (uphours != 0)
printf("%2u:%02u", uphours, upminutes); printf("%2u:%02u", uphours, upminutes);
else else
printf("%u min", upminutes); printf("%u min", upminutes);