diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2015-03-11 11:21:47 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-03-18 23:07:36 +0000 |
| commit | 01466d36afd10b3947de475bc9b4fb23848e81ce (patch) | |
| tree | 331e22905fc988641f111cdb5bd49b7970207290 /futility/cmd_vbutil_kernel.c | |
| parent | 49a422fab9afb3f013ee6115738c7e13d9ec8191 (diff) | |
| download | vboot-01466d36afd10b3947de475bc9b4fb23848e81ce.tar.gz | |
futility: Let each command provide its own help
Instead of a separate help function for each command, let's just
require each command to handle a --help option. This will make it
easier to layer the commands (for example, "sign" could have
several subcommand variants, each with its own help).
BUG=none
BRANCH=none
TEST=make runtests
I also compared the result of running "futility help CMD" before
and after this change. The help still shows up correctly.
Change-Id: I5c58176f32b41b0a2c2b8f0afb17dddd80fddc70
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/260495
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'futility/cmd_vbutil_kernel.c')
| -rw-r--r-- | futility/cmd_vbutil_kernel.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index 635acdc4..8ddc5ef2 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -64,6 +64,7 @@ enum { OPT_MINVERSION, OPT_VMLINUZ_OUT, OPT_FLAGS, + OPT_HELP, }; static const struct option long_opts[] = { @@ -87,6 +88,7 @@ static const struct option long_opts[] = { {"verbose", 0, &opt_verbose, 1}, {"vmlinuz-out", 1, 0, OPT_VMLINUZ_OUT}, {"flags", 1, 0, OPT_FLAGS}, + {"help", 0, 0, OPT_HELP}, {NULL, 0, 0, 0} }; @@ -270,6 +272,9 @@ static int do_vbutil_kernel(int argc, char *argv[]) case 0: /* silently handled option */ break; + case OPT_HELP: + print_help(argc, argv); + return !!parse_error; case OPT_MODE_PACK: case OPT_MODE_REPACK: @@ -646,7 +651,5 @@ static int do_vbutil_kernel(int argc, char *argv[]) return 1; } -DECLARE_FUTIL_COMMAND(vbutil_kernel, do_vbutil_kernel, - VBOOT_VERSION_1_0, - "Creates, signs, and verifies the kernel partition", - print_help); +DECLARE_FUTIL_COMMAND(vbutil_kernel, do_vbutil_kernel, VBOOT_VERSION_1_0, + "Creates, signs, and verifies the kernel partition"); |