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

ls,ps,watch: measure terminal width on fd 0, not 1

Browse Source
This commit is contained in:
Denis Vlasenko
2007-08-09 08:27:24 +00:00
parent 501bfe2630
commit f893da875a
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
procps/ps.c
View File

@@ -322,7 +322,7 @@ int ps_main(int argc, char **argv)
* and such large widths */
terminal_width = MAX_WIDTH;
if (isatty(1)) {
get_terminal_width_height(1, &terminal_width, NULL);
get_terminal_width_height(0, &terminal_width, NULL);
if (--terminal_width > MAX_WIDTH)
terminal_width = MAX_WIDTH;
}
@@ -364,7 +364,7 @@ int ps_main(int argc, char **argv)
if (w_count) {
terminal_width = (w_count==1) ? 132 : MAX_WIDTH;
} else {
get_terminal_width_height(1, &terminal_width, NULL);
get_terminal_width_height(0, &terminal_width, NULL);
/* Go one less... */
if (--terminal_width > MAX_WIDTH)
terminal_width = MAX_WIDTH;