admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse-options: add precision handling for OPTION_COUNTUP

Browse Source 
Similar to 09705696f7 (parse-options: introduce precision handling for
`OPTION_INTEGER`, 2025-04-17) support value variables of different sizes
for OPTION_COUNTUP.  Do that by requiring their "precision" to be set,
casting their "value" pointer accordingly and checking whether the value
fits.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2025-07-09 11:46:28 +02:00
committed by Junio C Hamano
parent 1d918bf2a5
commit c1e616c39b
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
parse-options.c
View File

@@ -177,10 +177,22 @@ static enum parse_opt_result do_get_value(struct parse_opt_ctx_t *p,
} }
case OPTION_COUNTUP: case OPTION_COUNTUP:
if (*(int *)opt->value < 0) {
*(int *)opt->value = 0; size_t bits = CHAR_BIT * opt->precision;
*(int *)opt->value = unset ? 0 : *(int *)opt->value + 1; intmax_t upper_bound = INTMAX_MAX >> (bitsizeof(intmax_t) - bits);
return 0; intmax_t value = get_int_value(opt, flags);
if (value < 0)
value = 0;
if (unset)
value = 0;
else if (value < upper_bound)
value++;
else
return error(_("value for %s exceeds %"PRIdMAX),
optname(opt, flags), upper_bound);
return set_int_value(opt, flags, value);
}
case OPTION_SET_INT: case OPTION_SET_INT:
return set_int_value(opt, flags, unset ? 0 : opt->defval); return set_int_value(opt, flags, unset ? 0 : opt->defval);
@@ -651,10 +663,10 @@ static void parse_options_check(const struct option *opts)
case OPTION_BIT: case OPTION_BIT:
case OPTION_NEGBIT: case OPTION_NEGBIT:
case OPTION_BITOP: case OPTION_BITOP:
case OPTION_COUNTUP:
if (!signed_int_fits(opts->defval, opts->precision)) if (!signed_int_fits(opts->defval, opts->precision))
optbug(opts, "has invalid defval"); optbug(opts, "has invalid defval");
/* fallthru */ /* fallthru */
case OPTION_COUNTUP:
case OPTION_NUMBER: case OPTION_NUMBER:
if ((opts->flags & PARSE_OPT_OPTARG) || if ((opts->flags & PARSE_OPT_OPTARG) ||
!(opts->flags & PARSE_OPT_NOARG)) !(opts->flags & PARSE_OPT_NOARG))

1
parse-options.h
View File

@@ -183,6 +183,7 @@ struct option {
.short_name = (s), \ .short_name = (s), \
.long_name = (l), \ .long_name = (l), \
.value = (v), \ .value = (v), \
.precision = sizeof(*v), \
.help = (h), \ .help = (h), \
.flags = PARSE_OPT_NOARG|(f), \ .flags = PARSE_OPT_NOARG|(f), \
} }

3
t/helper/test-parse-options.c
View File

@@ -178,6 +178,7 @@ int cmd__parse_options(int argc, const char **argv)
.type = OPTION_COUNTUP, .type = OPTION_COUNTUP,
.short_name = '+', .short_name = '+',
.value = &boolean, .value = &boolean,
.precision = sizeof(boolean),
.help = "same as -b", .help = "same as -b",
.flags = PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH, .flags = PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH,
}, },
@@ -185,6 +186,7 @@ int cmd__parse_options(int argc, const char **argv)
.type = OPTION_COUNTUP, .type = OPTION_COUNTUP,
.long_name = "ambiguous", .long_name = "ambiguous",
.value = &ambiguous, .value = &ambiguous,
.precision = sizeof(ambiguous),
.help = "positive ambiguity", .help = "positive ambiguity",
.flags = PARSE_OPT_NOARG | PARSE_OPT_NONEG, .flags = PARSE_OPT_NOARG | PARSE_OPT_NONEG,
}, },
@@ -192,6 +194,7 @@ int cmd__parse_options(int argc, const char **argv)
.type = OPTION_COUNTUP, .type = OPTION_COUNTUP,
.long_name = "no-ambiguous", .long_name = "no-ambiguous",
.value = &ambiguous, .value = &ambiguous,
.precision = sizeof(ambiguous),
.help = "negative ambiguity", .help = "negative ambiguity",
.flags = PARSE_OPT_NOARG | PARSE_OPT_NONEG, .flags = PARSE_OPT_NOARG | PARSE_OPT_NONEG,
}, },