config.c: allow hiding specific command line options from --help

Since --includepath will be conditionally supported, add a flag to
struct config so we can suppress it from --help if genimage was built
against an old libconfuse. We will still accept the option and then
display an error message better than "invalid option --includepath",
but there's no reason to advertise it in --help.

This also makes writing a test case a little easier - or rather, the
condition for when to skip the test.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>

1 files changed, 3 insertions, 0 deletions

diff --git a/config.c b/config.c
index a70f941..17423d2 100644
--- a/config.c
+++ b/config.c
@@ -33,6 +33,7 @@ struct config {
 	struct list_head list;
 	char *value;
 	char *def;
+	int hidden;
 };
 
 static void show_help(const char *cmd)
@@ -47,6 +48,8 @@ static void show_help(const char *cmd)
 	       "  -v, --version\n", cmd);
 	list_for_each_entry(c, &optlist, list) {
 		char opt[20], def[20];
+		if (c->hidden)
+			continue;
 		snprintf(opt, 20, "%s <arg>", c->name);
 		snprintf(def, 20, "[ %s ]", c->def);
 		printf("  --%-20s %-20s (%s)\n", opt, c->def ? def : "", c->env);