diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2015-04-06 13:02:40 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-04-15 04:51:05 +0000 |
| commit | eff3100f0efcba12c4403b9c86c5227dd41916ac (patch) | |
| tree | bab651a0bcd76d8d7be648e0cb2394aa7892a1da | |
| parent | 2e13d5908097b5398586030d4a88be3ca3c83feb (diff) | |
| download | vboot-eff3100f0efcba12c4403b9c86c5227dd41916ac.tar.gz | |
futility: improve help message for show command
No functional changes, just tweak the help message a bit.
BUG=none
BRANCH=none
TEST=make runtests
Change-Id: I3c9987560924bd6766d4e1a756a587d9aa123bbb
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/265740
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | futility/cmd_show.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/futility/cmd_show.c b/futility/cmd_show.c index 44a3ab36..5d6c7c2b 100644 --- a/futility/cmd_show.c +++ b/futility/cmd_show.c @@ -401,35 +401,37 @@ enum no_short_opts { static const char usage[] = "\n" "Usage: " MYNAME " %s [OPTIONS] FILE [...]\n" "\n" - "Where FILE could be a\n" + "Where FILE could be\n" "\n" - "%s" - " keyblock (.keyblock)\n" - " firmware preamble signature (VBLOCK_A/B)\n" - " firmware image (bios.bin)\n" - " kernel partition (/dev/sda2, /dev/mmcblk0p2)\n" + " a keyblock (.keyblock)\n" + " a firmware preamble signature (VBLOCK_A/B)\n" + " a firmware image (bios.bin)\n" + " a kernel partition (/dev/sda2, /dev/mmcblk0p2)\n" + " keys in various formats (.vbpubk, .vbprivk, .pem)\n" + " several other file types related to verified boot\n" "\n" "Options:\n" " -t Just show the type of each file\n" + " --type TYPE Override the detected file type\n" + " Use \"--type help\" for a list\n" + "Type-specific options:\n" " -k|--publickey FILE" " Use this public key for validation\n" " -f|--fv FILE Verify this payload (FW_MAIN_A/B)\n" " --pad NUM Kernel vblock padding size\n" - " --type TYPE Override the detected file type\n" - " Use \"--type help\" for a list\n" - "%s" + " --strict " + "Fail unless all signatures are valid\n" "\n"; static void print_help(int argc, char *argv[]) { - if (strcmp(argv[0], "verify")) - printf(usage, argv[0], - " public key (.vbpubk)\n", - " --strict " - "Fail unless all signatures are valid\n"); - else - printf(usage, argv[0], "", - "\nIt will fail unless all signatures are valid\n"); + if (!strcmp(argv[0], "verify")) + printf("\nUsage: " MYNAME " %s [OPTIONS] FILE [...]\n\n" + "This is just an alias for\n\n" + " " MYNAME " show --strict\n\n", + argv[0]); + + printf(usage, "show"); } static const struct option long_opts[] = { |