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

watch: compat: use stderr to determine screen dimensions

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-19 02:26:38 +01:00
parent 7be97c5b6b
commit 302af9e3d1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
procps/watch.c
View File

@ -32,13 +32,19 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
char *header; char *header;
char *cmd; 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 opt_complementary = "-1:n+"; // at least one param; -n NUM
// "+": stop at first non-option (procps 3.x only) // "+": stop at first non-option (procps 3.x only)
opt = getopt32(argv, "+dtn:", &period); opt = getopt32(argv, "+dtn:", &period);
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:
// 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; cmd = *argv;
while (*++argv) while (*++argv)
cmd = xasprintf("%s %s", cmd, *argv); // leaks cmd 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"); const unsigned time_len = sizeof("1234-67-90 23:56:89");
time_t t; 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) { if (new_width != width) {
width = new_width; width = new_width;
free(header); free(header);
@ -62,7 +70,8 @@ int watch_main(int argc UNUSED_PARAM, char **argv)
strftime(header + width - time_len, time_len, strftime(header + width - time_len, time_len,
"%Y-%m-%d %H:%M:%S", localtime(&t)); "%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(); fflush_all();
// TODO: 'real' watch pipes cmd's output to itself // TODO: 'real' watch pipes cmd's output to itself