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

watch: support fractional -n SEC

Browse Source 
function                                             old     new   delta
watch_main                                           212     232     +20

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-03-12 18:56:51 +01:00
parent 2452247ea3
commit 0ddc742c04
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -1040,9 +1040,11 @@ uint16_t xatou16(const char *numstr) FAST_FUNC;
#if ENABLE_FLOAT_DURATION #if ENABLE_FLOAT_DURATION
typedef double duration_t; typedef double duration_t;
void sleep_for_duration(duration_t duration) FAST_FUNC; void sleep_for_duration(duration_t duration) FAST_FUNC;
#define DURATION_FMT "f"
#else #else
typedef unsigned duration_t; typedef unsigned duration_t;
#define sleep_for_duration(duration) sleep(duration) #define sleep_for_duration(duration) sleep(duration)
#define DURATION_FMT "u"
#endif #endif
duration_t parse_duration_str(char *str) FAST_FUNC; duration_t parse_duration_str(char *str) FAST_FUNC;

17
procps/watch.c
View File

@ -22,7 +22,7 @@
//usage: "[-n SEC] [-t] PROG ARGS" //usage: "[-n SEC] [-t] PROG ARGS"
//usage:#define watch_full_usage "\n\n" //usage:#define watch_full_usage "\n\n"
//usage: "Run PROG periodically\n" //usage: "Run PROG periodically\n"
//usage: "\n -n Loop period in seconds (default 2)" //usage: "\n -n SEC Loop period (default 2)"
//usage: "\n -t Don't print header" //usage: "\n -t Don't print header"
//usage: //usage:
//usage:#define watch_example_usage //usage:#define watch_example_usage
@ -51,8 +51,9 @@
int watch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int watch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int watch_main(int argc UNUSED_PARAM, char **argv) int watch_main(int argc UNUSED_PARAM, char **argv)
{ {
duration_t period;
char *period_str = (char*) "2";
unsigned opt; unsigned opt;
unsigned period = 2;
unsigned width, new_width; unsigned width, new_width;
char *header; char *header;
char *cmd; char *cmd;
@ -65,7 +66,7 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
// "+": stop at first non-option (procps 3.x only); -n NUM // "+": stop at first non-option (procps 3.x only); -n NUM
// at least one param // at least one param
opt = getopt32(argv, "^+" "dtn:+" "\0" "-1", &period); opt = getopt32(argv, "^+" "dtn:" "\0" "-1", &period_str);
argv += optind; argv += optind;
// watch from both procps 2.x and 3.x does concatenation. Example: // watch from both procps 2.x and 3.x does concatenation. Example:
@ -74,6 +75,7 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
while (*++argv) while (*++argv)
cmd = xasprintf("%s %s", cmd, *argv); // leaks cmd cmd = xasprintf("%s %s", cmd, *argv); // leaks cmd
period = parse_duration_str(period_str);
width = (unsigned)-1; // make sure first time new_width != width width = (unsigned)-1; // make sure first time new_width != width
header = NULL; header = NULL;
while (1) { while (1) {
@ -88,7 +90,12 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
if (new_width != width) { if (new_width != width) {
width = new_width; width = new_width;
free(header); free(header);
header = xasprintf("Every %us: %-*s", period, (int)width, cmd); header = xasprintf("Every"
" %"IF_FLOAT_DURATION(".1")DURATION_FMT"s:"
" %-*s",
period,
(int)width, cmd
);
} }
if (time_len < width) { if (time_len < width) {
strftime_YYYYMMDDHHMMSS( strftime_YYYYMMDDHHMMSS(
@ -106,7 +113,7 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
// and does not allow it to overflow the screen // and does not allow it to overflow the screen
// (taking into account linewrap!) // (taking into account linewrap!)
system(cmd); system(cmd);
sleep(period); sleep_for_duration(period);
} }
return 0; // gcc thinks we can reach this :) return 0; // gcc thinks we can reach this :)
} }