aboutsummaryrefslogtreecommitdiff
path: root/procps/ps.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2015-10-23 01:44:22 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2015-10-23 01:44:22 +0200
commit641caaec3d495f3a92f652f12ab70b02ba9312ac (patch)
tree2a1aeb78c4344d1cd4423cdd96b581a797392b58 /procps/ps.c
parenta96074874857b31361d02ead97a1152164568918 (diff)
downloadbusybox-w32-641caaec3d495f3a92f652f12ab70b02ba9312ac.tar.gz
busybox-w32-641caaec3d495f3a92f652f12ab70b02ba9312ac.tar.bz2
busybox-w32-641caaec3d495f3a92f652f12ab70b02ba9312ac.zip
libbb: factor out code which queries screen width
function old new delta get_terminal_width - 17 +17 stty_main 1196 1197 +1 pstree_main 321 319 -2 ls_main 735 731 -4 watch_main 232 225 -7 bb_progress_update 714 706 -8 ps_main 555 543 -12 run_applet_and_exit 708 695 -13 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 1/6 up/down: 18/-46) Total: -28 byte Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'procps/ps.c')
-rw-r--r--procps/ps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/procps/ps.c b/procps/ps.c
index bde5f9485..fbafa68a9 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -622,7 +622,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv)
622 * and such large widths */ 622 * and such large widths */
623 terminal_width = MAX_WIDTH; 623 terminal_width = MAX_WIDTH;
624 if (isatty(1)) { 624 if (isatty(1)) {
625 get_terminal_width_height(0, &terminal_width, NULL); 625 terminal_width = get_terminal_width(0);
626 if (--terminal_width > MAX_WIDTH) 626 if (--terminal_width > MAX_WIDTH)
627 terminal_width = MAX_WIDTH; 627 terminal_width = MAX_WIDTH;
628 } 628 }
@@ -672,7 +672,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
672 if (w_count) { 672 if (w_count) {
673 terminal_width = (w_count == 1) ? 132 : MAX_WIDTH; 673 terminal_width = (w_count == 1) ? 132 : MAX_WIDTH;
674 } else { 674 } else {
675 get_terminal_width_height(0, &terminal_width, NULL); 675 terminal_width = get_terminal_width(0);
676 /* Go one less... */ 676 /* Go one less... */
677 if (--terminal_width > MAX_WIDTH) 677 if (--terminal_width > MAX_WIDTH)
678 terminal_width = MAX_WIDTH; 678 terminal_width = MAX_WIDTH;