emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

busybox --install -s: prevent puzzling "/bin/busybox: Invalid argument" message

Browse Source 
libbb: comment out realpath, add readlink which doesn't warn
This commit is contained in:
Denis Vlasenko
2007-09-05 11:30:34 +00:00
parent 7e0fbf9c26
commit beffd43d8e
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applets/applets.c
View File

@ -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;
}