mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
parse-options: add parse_options_check to validate option specs.
It only searches for now for the dreaded LASTARG_DEFAULT | OPTARG combination, but can be extended to check for any other forbidden combination. Options are checked each time we call parse_options_start. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
9a8531eeba
commit
cb9d398c35
|
@ -306,6 +306,28 @@ static void check_typos(const char *arg, const struct option *options)
|
|||
}
|
||||
}
|
||||
|
||||
static void parse_options_check(const struct option *opts)
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
for (; opts->type != OPTION_END; opts++) {
|
||||
if ((opts->flags & PARSE_OPT_LASTARG_DEFAULT) &&
|
||||
(opts->flags & PARSE_OPT_OPTARG)) {
|
||||
if (opts->long_name) {
|
||||
error("`--%s` uses incompatible flags "
|
||||
"LASTARG_DEFAULT and OPTARG", opts->long_name);
|
||||
} else {
|
||||
error("`-%c` uses incompatible flags "
|
||||
"LASTARG_DEFAULT and OPTARG", opts->short_name);
|
||||
}
|
||||
err |= 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (err)
|
||||
exit(129);
|
||||
}
|
||||
|
||||
void parse_options_start(struct parse_opt_ctx_t *ctx,
|
||||
int argc, const char **argv, const char *prefix,
|
||||
int flags)
|
||||
|
@ -331,6 +353,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
|
|||
{
|
||||
int internal_help = !(ctx->flags & PARSE_OPT_NO_INTERNAL_HELP);
|
||||
|
||||
parse_options_check(options);
|
||||
|
||||
/* we must reset ->opt, unknown short option leave it dangling */
|
||||
ctx->opt = NULL;
|
||||
|
||||
|
|
Loading…
Reference in a new issue