aboutsummaryrefslogtreecommitdiff
path: root/libbb/appletlib.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2015-10-31 17:13:47 +0000
committerRon Yorston <rmy@pobox.com>2015-10-31 17:13:47 +0000
commit4432dbba6559d3d88e18ecf2c33d9e5a39e82074 (patch)
treef6db886523a04e0b45926336223ff8c32761dc43 /libbb/appletlib.c
parentbc09f29f78547856e2152dc47051aeed548f28e8 (diff)
parent6bd3fff51aa74e2ee2d87887b12182a3b09792ef (diff)
downloadbusybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.tar.gz
busybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.tar.bz2
busybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/appletlib.c')
-rw-r--r--libbb/appletlib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 7da7cad1c..1d6a4b274 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -628,7 +628,7 @@ static int busybox_main(char **argv)
628 output_width = 80; 628 output_width = 80;
629 if (ENABLE_FEATURE_AUTOWIDTH) { 629 if (ENABLE_FEATURE_AUTOWIDTH) {
630 /* Obtain the terminal width */ 630 /* Obtain the terminal width */
631 get_terminal_width_height(0, &output_width, NULL); 631 output_width = get_terminal_width(2);
632 } 632 }
633 633
634 dup2(1, 2); 634 dup2(1, 2);
@@ -659,10 +659,10 @@ static int busybox_main(char **argv)
659 ) 659 )
660 IF_FEATURE_SH_STANDALONE( 660 IF_FEATURE_SH_STANDALONE(
661 "\tBusyBox is a multi-call binary that combines many common Unix\n" 661 "\tBusyBox is a multi-call binary that combines many common Unix\n"
662 "\tutilities into a single executable. The shell in this version\n" 662 "\tutilities into a single executable. The shell in this build\n"
663 "\thas been configured to prefer built-in utilities to external\n" 663 "\tis configured to run built-in utilities without $PATH search.\n"
664 "\tbinaries. This avoids having to install a link to busybox for\n" 664 "\tYou don't need to install a link to busybox for each utility.\n"
665 "\teach function to be invoked.\n" 665 "\tTo run external program, use full path (/sbin/ip instead of ip).\n"
666 ) 666 )
667 "\n" 667 "\n"
668#if ENABLE_GLOBBING 668#if ENABLE_GLOBBING