futility: Improve help messagesstabilize-6297.B

This provides help messages for the futility commands similar to
the way git does. These show the available commands:

  futility
  futility help
  futility --help

While these show help for a specific command:

  futility help COMMAND
  futility --help COMMAND
  futility COMMAND --help

BUG=none
BRANCH=ToT
TEST=manual

make runtests

And manually look at help messages for each command.

Change-Id: I1126471e242784c6ca7a2f11694fa7c505d833e8
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/219528
Reviewed-by: Randall Spangler <rspangler@chromium.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/futility/cmd_dump_kernel_config.c b/futility/cmd_dump_kernel_config.c
index 1bf411b2..520d2802 100644
--- a/futility/cmd_dump_kernel_config.c
+++ b/futility/cmd_dump_kernel_config.c
@@ -23,13 +23,10 @@ static const struct option long_opts[] = {
 };
 
 /* Print help and return error */
-static int PrintHelp(void)
+static void PrintHelp(const char *progname)
 {
-	puts("dump_kernel_config - Prints the kernel command line\n"
-	     "\n"
-	     "Usage:  dump_kernel_config [--kloadaddr <ADDRESS>] "
-	     "<image/blockdevice>\n" "\n" "");
-	return 1;
+	printf("\nUsage:  " MYNAME " %s [--kloadaddr ADDRESS] "
+	       "KERNEL_PARTITION\n\n", progname);
 }
 
 static int do_dump_kernel_config(int argc, char *argv[])
@@ -70,8 +67,10 @@ static int do_dump_kernel_config(int argc, char *argv[])
 	} else
 		infile = argv[optind];
 
-	if (parse_error)
-		return PrintHelp();
+	if (parse_error) {
+		PrintHelp(argv[0]);
+		return 1;
+	}
 
 	if (!infile || !*infile) {
 		fprintf(stderr, "Must specify filename\n");
@@ -89,4 +88,5 @@ static int do_dump_kernel_config(int argc, char *argv[])
 }
 
 DECLARE_FUTIL_COMMAND(dump_kernel_config, do_dump_kernel_config,
-		      "Prints the kernel command line");
+		      "Prints the kernel command line",
+		      PrintHelp);