diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-05 11:30:34 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-05 11:30:34 +0000 |
| commit | beffd43d8e393b68787a00d9c6078a2b367afd01 (patch) | |
| tree | 485a6f36aa57e182801babc1365f128bfaa52f5e /applets | |
| parent | 7e0fbf9c26350a819661241bc925cb88f26bb992 (diff) | |
| download | busybox-beffd43d8e393b68787a00d9c6078a2b367afd01.tar.gz | |
busybox --install -s: prevent puzzling "/bin/busybox: Invalid argument" message
libbb: comment out realpath, add readlink which doesn't warn
Diffstat (limited to 'applets')
| -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 c2040b9a3..ec268ca2d 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; } |