From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 22 Mar 2012 10:15:06 +0000 (+0100)
Subject: busybox: tweak help text
X-Git-Tag: 1_20_0~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ba88826c66411affc1da3614742b454654f7298a;p=oweals%2Fbusybox.git

busybox: tweak help text

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index efde3b69d..73f71f1d0 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;
 	}