diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2009-05-07 19:45:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-09 07:29:47 (GMT) |
| commit | e0319ff5ed2b7927302389181449dcd029a26622 (patch) | |
| tree | 5185c782d22d57ce359f0493bc26aa5ac5215c77 /parse-options.c | |
| parent | 2f4b97f91071f5060bf2da482cf8b0d70486d808 (diff) | |
| download | git-e0319ff5ed2b7927302389181449dcd029a26622.zip git-e0319ff5ed2b7927302389181449dcd029a26622.tar.gz git-e0319ff5ed2b7927302389181449dcd029a26622.tar.bz2 | |
parseopt: add OPT_NUMBER_CALLBACK
Add a way to recognize numerical options. The number is passed to
a callback function as a string.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c index a8c05e3..aaa218d 100644 --- a/parse-options.c +++ b/parse-options.c @@ -129,11 +129,33 @@ static int get_value(struct parse_opt_ctx_t *p, static int parse_short_opt(struct parse_opt_ctx_t *p, const struct option *options) { + const struct option *numopt = NULL; + for (; options->type != OPTION_END; options++) { if (options->short_name == *p->opt) { p->opt = p->opt[1] ? p->opt + 1 : NULL; return get_value(p, options, OPT_SHORT); } + + /* + * Handle the numerical option later, explicit one-digit + * options take precedence over it. + */ + if (options->type == OPTION_NUMBER) + numopt = options; + } + if (numopt && isdigit(*p->opt)) { + size_t len = 1; + char *arg; + int rc; + + while (isdigit(p->opt[len])) + len++; + arg = xmemdupz(p->opt, len); + p->opt = p->opt[len] ? p->opt + len : NULL; + rc = (*numopt->callback)(numopt, arg, 0) ? (-1) : 0; + free(arg); + return rc; } return -2; } @@ -411,6 +433,8 @@ int usage_with_options_internal(const char * const *usagestr, pos += fprintf(stderr, ", "); if (opts->long_name) pos += fprintf(stderr, "--%s", opts->long_name); + if (opts->type == OPTION_NUMBER) + pos += fprintf(stderr, "-NUM"); switch (opts->type) { case OPTION_ARGUMENT: @@ -447,7 +471,7 @@ int usage_with_options_internal(const char * const *usagestr, pos += fprintf(stderr, " ..."); } break; - default: /* OPTION_{BIT,BOOLEAN,SET_INT,SET_PTR} */ + default: /* OPTION_{BIT,BOOLEAN,NUMBER,SET_INT,SET_PTR} */ break; } |