diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-19 02:26:38 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-19 02:26:38 +0100 |
| commit | 302af9e3d1ea7e83f382b9c97fa9fe4099345126 (patch) | |
| tree | e41f6f62cc3e8fbd9de4ed09a255742d12b3858e /procps/watch.c | |
| parent | 7be97c5b6b0f186edd893ce3696047709f638cf6 (diff) | |
| download | busybox-302af9e3d1ea7e83f382b9c97fa9fe4099345126.tar.gz | |
watch: compat: use stderr to determine screen dimensions
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'procps/watch.c')
| -rw-r--r-- | procps/watch.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/procps/watch.c b/procps/watch.c index ad44b3a3e..126945c40 100644 --- a/procps/watch.c +++ b/procps/watch.c @@ -32,13 +32,19 @@ int watch_main(int argc UNUSED_PARAM, char **argv) char *header; char *cmd; +#if 0 // maybe ENABLE_DESKTOP? + // procps3 compat - "echo TEST | watch cat" doesn't show TEST: + close(STDIN_FILENO); + xopen("/dev/null", O_RDONLY); +#endif + opt_complementary = "-1:n+"; // at least one param; -n NUM // "+": stop at first non-option (procps 3.x only) opt = getopt32(argv, "+dtn:", &period); argv += optind; // watch from both procps 2.x and 3.x does concatenation. Example: - // watch ls -l "a /tmp" "2>&1" -- ls won't see "a /tmp" as one param + // watch ls -l "a /tmp" "2>&1" - ls won't see "a /tmp" as one param cmd = *argv; while (*++argv) cmd = xasprintf("%s %s", cmd, *argv); // leaks cmd @@ -51,7 +57,9 @@ int watch_main(int argc UNUSED_PARAM, char **argv) const unsigned time_len = sizeof("1234-67-90 23:56:89"); time_t t; - get_terminal_width_height(STDIN_FILENO, &new_width, NULL); + // STDERR_FILENO is procps3 compat: + // "watch ls 2>/dev/null" does not detect tty size + get_terminal_width_height(STDERR_FILENO, &new_width, NULL); if (new_width != width) { width = new_width; free(header); @@ -62,7 +70,8 @@ int watch_main(int argc UNUSED_PARAM, char **argv) strftime(header + width - time_len, time_len, "%Y-%m-%d %H:%M:%S", localtime(&t)); - printf("%s\n\n", header); /* compat: empty line */ + // compat: empty line between header and cmd output + printf("%s\n\n", header); } fflush_all(); // TODO: 'real' watch pipes cmd's output to itself |