diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-16 18:50:56 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-16 18:50:56 +0000 |
commit | e755e827f7c8ecb21787a4369d7afdeda54d112b (patch) | |
tree | 007b1506e69ffcc25bc6ba3b0e6686d806a34264 /applets/applets.c | |
parent | ed6ac53104d811ee88c71aff45c7cad666aaee46 (diff) | |
download | busybox-w32-1_7_1.tar.gz busybox-w32-1_7_1.tar.bz2 busybox-w32-1_7_1.zip |
apply post 1.7.0 patches, set version to 1.7.11_7_1
Diffstat (limited to 'applets/applets.c')
-rw-r--r-- | applets/applets.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/applets/applets.c b/applets/applets.c index 6de6db3cd..b40f01836 100644 --- a/applets/applets.c +++ b/applets/applets.c | |||
@@ -546,7 +546,7 @@ static int busybox_main(char **argv) | |||
546 | help: | 546 | help: |
547 | output_width = 80; | 547 | output_width = 80; |
548 | if (ENABLE_FEATURE_AUTOWIDTH) { | 548 | if (ENABLE_FEATURE_AUTOWIDTH) { |
549 | /* Obtain the terminal width. */ | 549 | /* Obtain the terminal width */ |
550 | get_terminal_width_height(0, &output_width, NULL); | 550 | get_terminal_width_height(0, &output_width, NULL); |
551 | } | 551 | } |
552 | /* leading tab and room to wrap */ | 552 | /* leading tab and room to wrap */ |
@@ -580,12 +580,11 @@ static int busybox_main(char **argv) | |||
580 | 580 | ||
581 | if (ENABLE_FEATURE_INSTALLER && strcmp(argv[1], "--install") == 0) { | 581 | if (ENABLE_FEATURE_INSTALLER && strcmp(argv[1], "--install") == 0) { |
582 | const char *busybox; | 582 | const char *busybox; |
583 | busybox = xmalloc_readlink_or_warn(bb_busybox_exec_path); | 583 | busybox = xmalloc_readlink(bb_busybox_exec_path); |
584 | if (!busybox) | 584 | if (!busybox) |
585 | busybox = bb_busybox_exec_path; | 585 | busybox = bb_busybox_exec_path; |
586 | /* -s makes symlinks */ | 586 | /* -s makes symlinks */ |
587 | install_links(busybox, | 587 | install_links(busybox, argv[2] && strcmp(argv[2], "-s") == 0); |
588 | argv[2] && strcmp(argv[2], "-s") == 0); | ||
589 | return 0; | 588 | return 0; |
590 | } | 589 | } |
591 | 590 | ||