From c9491adc74fd8da84ba0be76b1fefeac5b7488d5 Mon Sep 17 00:00:00 2001 From: Tj Date: Tue, 29 Mar 2016 17:49:59 +0100 Subject: [PATCH 1/1] modify usage() to optionally display help Signed-off-by: Tj --- cfe_generate_password.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cfe_generate_password.c b/cfe_generate_password.c index 904e04b..c1378e4 100644 --- a/cfe_generate_password.c +++ b/cfe_generate_password.c @@ -76,9 +76,9 @@ static const size_t MAC_ADDR_SIZE = 17; static const size_t DATESTRING_SIZE = 20; static void -pr_usage() +pr_usage(int verbose) { - fprintf(stderr, "%s\n", + fprintf(stderr, "Usage:\n" " -v show version\n" " -s 00:01:02:03:04:05 create seed from MAC address\n" @@ -87,6 +87,9 @@ pr_usage() " E.g. -s 01:02:03:04:05 \n" " -s 01:02:03:04:05 -p\n" " -p 000000030405\n" + "\n" + "%s", + verbose ? help : "" ); } @@ -103,7 +106,7 @@ pr_error_exit(unsigned int usage, const char *error, ...) va_end(args); fprintf(stderr, "Error: %s\n", error_message); - if (usage) pr_usage(); + if (usage) pr_usage(usage); exit(EXIT_FAILURE); } @@ -174,7 +177,7 @@ main(int argc, char **argv, char **env) int result = 0; if (argc == 1) { - pr_usage(); + pr_usage(0); } else { unsigned int arg; @@ -226,7 +229,7 @@ main(int argc, char **argv, char **env) } } if (! opt_seed && ! opt_pass) - pr_usage(); + pr_usage(0); else if (opt_seed && opt_seed != 2) pr_error_exit(1, "seed requires MAC-ADDRESS"); else if (! opt_seed && opt_pass && opt_pass != 2) -- 2.17.1