diff options
author | Denis Vlasenko | 2007-09-16 18:50:56 +0000 |
---|---|---|
committer | Denis Vlasenko | 2007-09-16 18:50:56 +0000 |
commit | e755e827f7c8ecb21787a4369d7afdeda54d112b (patch) | |
tree | 007b1506e69ffcc25bc6ba3b0e6686d806a34264 /applets/applets.c | |
parent | ed6ac53104d811ee88c71aff45c7cad666aaee46 (diff) | |
download | busybox-1_7_1.zip busybox-1_7_1.tar.gz |
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 6de6db3..b40f018 100644 --- a/applets/applets.c +++ b/applets/applets.c @@ -546,7 +546,7 @@ static int busybox_main(char **argv) help: output_width = 80; if (ENABLE_FEATURE_AUTOWIDTH) { - /* Obtain the terminal width. */ + /* Obtain the terminal width */ get_terminal_width_height(0, &output_width, NULL); } /* leading tab and room to wrap */ @@ -580,12 +580,11 @@ static int busybox_main(char **argv) if (ENABLE_FEATURE_INSTALLER && strcmp(argv[1], "--install") == 0) { const char *busybox; - busybox = xmalloc_readlink_or_warn(bb_busybox_exec_path); + busybox = xmalloc_readlink(bb_busybox_exec_path); if (!busybox) busybox = bb_busybox_exec_path; /* -s makes symlinks */ - install_links(busybox, - argv[2] && strcmp(argv[2], "-s") == 0); + install_links(busybox, argv[2] && strcmp(argv[2], "-s") == 0); return 0; } |