diff options
author | Ron Yorston <rmy@pobox.com> | 2015-10-31 17:13:47 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-10-31 17:13:47 +0000 |
commit | 4432dbba6559d3d88e18ecf2c33d9e5a39e82074 (patch) | |
tree | f6db886523a04e0b45926336223ff8c32761dc43 /procps/ps.c | |
parent | bc09f29f78547856e2152dc47051aeed548f28e8 (diff) | |
parent | 6bd3fff51aa74e2ee2d87887b12182a3b09792ef (diff) | |
download | busybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.tar.gz busybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.tar.bz2 busybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'procps/ps.c')
-rw-r--r-- | procps/ps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/procps/ps.c b/procps/ps.c index 07ff7568f..8c373376d 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -638,7 +638,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv) | |||
638 | * and such large widths */ | 638 | * and such large widths */ |
639 | terminal_width = MAX_WIDTH; | 639 | terminal_width = MAX_WIDTH; |
640 | if (isatty(1)) { | 640 | if (isatty(1)) { |
641 | get_terminal_width_height(0, &terminal_width, NULL); | 641 | terminal_width = get_terminal_width(0); |
642 | if (--terminal_width > MAX_WIDTH) | 642 | if (--terminal_width > MAX_WIDTH) |
643 | terminal_width = MAX_WIDTH; | 643 | terminal_width = MAX_WIDTH; |
644 | } | 644 | } |
@@ -688,7 +688,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
688 | if (w_count) { | 688 | if (w_count) { |
689 | terminal_width = (w_count == 1) ? 132 : MAX_WIDTH; | 689 | terminal_width = (w_count == 1) ? 132 : MAX_WIDTH; |
690 | } else { | 690 | } else { |
691 | get_terminal_width_height(0, &terminal_width, NULL); | 691 | terminal_width = get_terminal_width(0); |
692 | /* Go one less... */ | 692 | /* Go one less... */ |
693 | if (--terminal_width > MAX_WIDTH) | 693 | if (--terminal_width > MAX_WIDTH) |
694 | terminal_width = MAX_WIDTH; | 694 | terminal_width = MAX_WIDTH; |