Merge branch 'busybox' into merge

Conflicts:
	Makefile.flags

1 files changed, 6 insertions, 3 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 0c675db4d..116e275be 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -632,7 +632,10 @@ static int busybox_main(char **argv)
                         "See source distribution for full notice.\n"
                         "\n"
                         "Usage: busybox [function] [arguments]...\n"
-                        "   or: busybox --list[-full]\n"
+                        "   or: busybox --list"IF_FEATURE_INSTALLER("[-full]")"\n"
+                        IF_FEATURE_INSTALLER(
+                        "   or: busybox --install [-s] [DIR]\n"
+                        )
                         "   or: function [arguments]...\n"
                         "\n"
                         "\tBusyBox is a multi-call binary that combines many common Unix\n"
@@ -672,7 +675,7 @@ static int busybox_main(char **argv)
                 dup2(1, 2);
                 while (*a) {
 # if ENABLE_FEATURE_INSTALLER
-                        if (argv[1][6]) /* --list-path? */
+                        if (argv[1][6]) /* --list-full? */
                                 full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
 # endif
                         full_write2_str(a);
@@ -702,7 +705,7 @@ static int busybox_main(char **argv)
                  * -s: make symlinks
                  * DIR: directory to install links to
                  */
-                use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && argv++);
+                use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && ++argv);
                 install_links(busybox, use_symbolic_links, argv[2]);
                 return 0;
         }