[PATCH 3/5] parse-options: allow -h as a short option
- From
René Scharfe <l.s.r@web.de>
- Date
- Nov 17, 2015, 10:25 UTC
- Message-ID
- <564B00A2.5040801@web.de>
- In-Reply-To
- <564AFF32.1030406@web.de>
Let callers provide their own handler for the short option -h even without the flag PARSE_OPT_NO_INTERNAL_HELP, but call the internal handler (showing usage information) if that is the only parameter. Implement the first part by checking for -h only if parse_short_opt() can't find it and returns -2.
Signed-off-by: Rene Scharfe <l.s.r@web.de> --- parse-options.c | 15 ++++++++++----- parse-options.h | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/parse-options.c b/parse-options.c index 4863966..47a9192 100644 --- a/parse-options.c +++ b/parse-options.c @@ -410,7 +410,7 @@ void parse_options_start(struct parse_opt_ctx_t *ctx, const struct option *options, int flags) { memset(ctx, 0, sizeof(*ctx)); - ctx->argc = argc - 1; + ctx->argc = ctx->total = argc - 1; ctx->argv = argv + 1; ctx->out = argv; ctx->prefix = prefix; @@ -448,27 +448,32 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, continue; } + /* lone -h asks for help */ + if (internal_help && ctx->total == 1 && !strcmp(arg + 1, "h")) + goto show_usage; + if (arg[1] != '-') { ctx->opt = arg + 1; - if (internal_help && *ctx->opt == 'h') - goto show_usage; switch (parse_short_opt(ctx, options)) { case -1: goto show_usage_error; case -2: if (ctx->opt) check_typos(arg + 1, options); + if (internal_help && *ctx->opt == 'h') + goto show_usage; goto unknown; } if (ctx->opt) check_typos(arg + 1, options); while (ctx->opt) { - if (internal_help && *ctx->opt == 'h') - goto show_usage; switch (parse_short_opt(ctx, options)) { case -1: goto show_usage_error; case -2: + if (internal_help && *ctx->opt == 'h') + goto show_usage; + /* fake a short option thing to hide the fact that we may have * started to parse aggregated stuff * diff --git a/parse-options.h b/parse-options.h index e8b55ea..ea4af92 100644 --- a/parse-options.h +++ b/parse-options.h @@ -199,7 +199,7 @@ enum { struct parse_opt_ctx_t { const char **argv; const char **out; - int argc, cpidx; + int argc, cpidx, total; const char *opt; int flags; const char *prefix;
-- 2.6.3