diff options
author | Jani Nikula <jani@nikula.org> | 2014-11-05 01:25:54 +0100 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2014-11-05 23:17:00 +0100 |
commit | 4387112de00d27e6957ca2b6a268242f0bb5c756 (patch) | |
tree | b4a60cb6f04ca00062abb652d2ae99e2887a4915 | |
parent | f0dfceaf902681e7d5fd56a3c272a17a71996141 (diff) |
cli: add support for hierarchical command line option arrays
NOTMUCH_OPT_INHERIT expects a notmuch_opt_desc_t * pointer in
output_var.
The "Unrecognized option" message was moved out of parse_option() to
not be emitted twice or when parsing a non-inherited option.
-rw-r--r-- | command-line-arguments.c | 16 | ||||
-rw-r--r-- | command-line-arguments.h | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/command-line-arguments.c b/command-line-arguments.c index c6f72696..de6b4536 100644 --- a/command-line-arguments.c +++ b/command-line-arguments.c @@ -122,16 +122,18 @@ parse_position_arg (const char *arg_str, int pos_arg_index, */ notmuch_bool_t -parse_option (const char *arg, - const notmuch_opt_desc_t *options) { - - assert(arg); +parse_option (const char *_arg, const notmuch_opt_desc_t *options) +{ + assert(_arg); assert(options); - arg += 2; - + const char *arg = _arg + 2; /* _arg starts with -- */ const notmuch_opt_desc_t *try; for (try = options; try->opt_type != NOTMUCH_OPT_END; try++) { + if (try->opt_type == NOTMUCH_OPT_INHERIT && + parse_option (_arg, try->output_var)) + return TRUE; + if (! try->name) continue; @@ -170,7 +172,6 @@ parse_option (const char *arg, /*UNREACHED*/ } } - fprintf (stderr, "Unrecognized option: --%s\n", arg); return FALSE; } @@ -201,6 +202,7 @@ parse_arguments (int argc, char **argv, if (more_args) { opt_index++; } else { + fprintf (stderr, "Unrecognized option: %s\n", argv[opt_index]); opt_index = -1; } diff --git a/command-line-arguments.h b/command-line-arguments.h index 6444129a..309aaf2b 100644 --- a/command-line-arguments.h +++ b/command-line-arguments.h @@ -5,6 +5,7 @@ enum notmuch_opt_type { NOTMUCH_OPT_END = 0, + NOTMUCH_OPT_INHERIT, /* another options table */ NOTMUCH_OPT_BOOLEAN, /* --verbose */ NOTMUCH_OPT_INT, /* --frob=8 */ NOTMUCH_OPT_KEYWORD, /* --format=raw|json|text */ |