projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version to 1.32.0
[oweals/busybox.git]
/
procps
/
watch.c
diff --git
a/procps/watch.c
b/procps/watch.c
index 420e6d3d145cb6b9e8b31f989b59d1ab24b3a50c..059eb1dda7c664064d1034c78b906fe899608b5d 100644
(file)
--- a/
procps/watch.c
+++ b/
procps/watch.c
@@
-8,7
+8,7
@@
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
//config:config WATCH
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
//config:config WATCH
-//config: bool "watch (4.
1
kb)"
+//config: bool "watch (4.
4
kb)"
//config: default y
//config: help
//config: watch is used to execute a program periodically, showing
//config: default y
//config: help
//config: watch is used to execute a program periodically, showing
@@
-22,7
+22,7
@@
//usage: "[-n SEC] [-t] PROG ARGS"
//usage:#define watch_full_usage "\n\n"
//usage: "Run PROG periodically\n"
//usage: "[-n SEC] [-t] PROG ARGS"
//usage:#define watch_full_usage "\n\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:
//usage:#define watch_example_usage
//usage: "\n -t Don't print header"
//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 UNUSED_PARAM, char **argv)
{
int watch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
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;
char *header;
char *cmd;
unsigned width, new_width;
char *header;
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
// at least one param
// "+": stop at first non-option (procps 3.x only); -n NUM
// at least one param
- opt = getopt32(argv, "^+" "dtn:
+" "\0" "-1", &period
);
+ opt = getopt32(argv, "^+" "dtn:
" "\0" "-1", &period_str
);
argv += optind;
// watch from both procps 2.x and 3.x does concatenation. Example:
argv += optind;
// 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)
cmd = xasprintf("%s %s", cmd, *argv); // leaks cmd
while (*++argv)
cmd = xasprintf("%s %s", cmd, *argv); // leaks cmd
+ period = parse_duration_str(period_str);
width = (unsigned)-1; // make sure first time new_width != width
header = NULL;
while (1) {
width = (unsigned)-1; // make sure first time new_width != width
header = NULL;
while (1) {
@@
-88,7
+90,12
@@
int watch_main(int argc UNUSED_PARAM, char **argv)
if (new_width != width) {
width = new_width;
free(header);
if (new_width != width) {
width = new_width;
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) {
strftime_YYYYMMDDHHMMSS(
}
if (time_len < width) {
strftime_YYYYMMDDHHMMSS(
@@
-106,7
+113,7
@@
int watch_main(int argc UNUSED_PARAM, char **argv)
// and does not allow it to overflow the screen
// (taking into account linewrap!)
system(cmd);
// and does not allow it to overflow the screen
// (taking into account linewrap!)
system(cmd);
- sleep(period);
+ sleep
_for_duration
(period);
}
return 0; // gcc thinks we can reach this :)
}
}
return 0; // gcc thinks we can reach this :)
}