From dd2e383b7a0092f62e603393136d042a82aa4be8 Mon Sep 17 00:00:00 2001
From: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
Date: Tue, 8 Oct 2019 13:13:08 -0700
Subject: [PATCH] cli: add flags to the usage output

Add usage info wherever the flags -p and -i are relevant.

Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
---
 src/cli/cli.c  | 37 ++++++++++++++++++++++++++++++++++---
 src/cli/cli.h  |  1 +
 src/cli/main.c |  7 +++++++
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/cli/cli.c b/src/cli/cli.c
index 03d7c13..8a977e8 100644
--- a/src/cli/cli.c
+++ b/src/cli/cli.c
@@ -18,15 +18,46 @@
 
 #include "cli.h"
 
-static struct option default_opts[] = { { "path", required_argument, 0, 'p' },
-                                        { "image", no_argument, 0, 'i' },
-                                        { 0, 0, 0, 0 } };
+struct cli_option {
+        struct option opt;
+        char *desc;
+};
+
+#define OPTION(opt, req, flag, short_opt, desc)       \
+        { {opt, req, flag, short_opt}, desc }         \
+
+static struct cli_option cli_opts[] = {
+        OPTION("path", required_argument, 0, 'p', "Set the base path for boot management operations."),
+        OPTION("image", no_argument, 0, 'i', "Force clr-boot-manager to run in image mode."),
+        OPTION(0, 0, 0, 0, NULL),
+};
+
+void cli_print_default_args_help(void)
+{
+        int opt_len = (sizeof(cli_opts) / sizeof(struct cli_option)) - 1;
+
+        fprintf(stdout, "\nOptions:\n");
+
+        for (int i = 0; i < opt_len; i++) {
+                struct cli_option curr = cli_opts[i];
+                fprintf(stdout, "  -%c, --%s\t%s\n", curr.opt.val,
+                        curr.opt.name, curr.desc);
+        }
+}
 
 bool cli_default_args_init(int *argc, char ***argv, char **root, bool *forced_image)
 {
         int o_in = 0;
         int c;
         char *_root = NULL;
+        int opt_len = sizeof(cli_opts) / sizeof(struct cli_option);
+        struct option *default_opts;
+
+        default_opts = alloca(sizeof(struct option) * (long unsigned int)opt_len);
+
+        for (int i = 0; i < opt_len; i++) {
+                default_opts[i] = cli_opts[i].opt;
+        }
 
         /* We actually want to use getopt, so rewind one for getopt */;
         --(*argv);
diff --git a/src/cli/cli.h b/src/cli/cli.h
index f87ee31..0e920ce 100644
--- a/src/cli/cli.h
+++ b/src/cli/cli.h
@@ -25,6 +25,7 @@ typedef struct SubCommand {
 } SubCommand;
 
 bool cli_default_args_init(int *argc, char ***argv, char **root, bool *forced_image);
+void cli_print_default_args_help(void);
 
 /*
  * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
diff --git a/src/cli/main.c b/src/cli/main.c
index af5a1ad..54d77c5 100644
--- a/src/cli/main.c
+++ b/src/cli/main.c
@@ -56,6 +56,11 @@ static bool print_usage(int argc, char **argv)
                         command->name,
                         command->usage ? command->usage : "");
                 fprintf(stdout, "\n%s\n", command->help ? command->help : command->blurb);
+
+                if (!streq(argv[0], "help") && !streq(argv[0], "version")) {
+                        cli_print_default_args_help();
+                }
+
                 return true;
         }
 
@@ -66,6 +71,8 @@ static bool print_usage(int argc, char **argv)
                 fprintf(stdout, "%15s - %s\n", id, command->blurb);
         }
 
+        cli_print_default_args_help();
+
         return true;
 }