averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

parse-options: add precision handling for OPTION_BIT

Browse Source 
Similar to 09705696f7 (parse-options: introduce precision handling for
`OPTION_INTEGER`, 2025-04-17) support value variables of different sizes
for OPTION_BIT.  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:45:33 +02:00
committed by Junio C Hamano
parent c898bbc5e4
commit 5228211c4b
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/write-tree.c
View File

@@ -35,6 +35,7 @@ int cmd_write_tree(int argc,
.type = OPTION_BIT, .type = OPTION_BIT,
.long_name = "ignore-cache-tree", .long_name = "ignore-cache-tree",
.value = &flags, .value = &flags,
.precision = sizeof(flags),
.help = N_("only useful for debugging"), .help = N_("only useful for debugging"),
.flags = PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, .flags = PARSE_OPT_HIDDEN | PARSE_OPT_NOARG,
.defval = WRITE_TREE_IGNORE_CACHE_TREE, .defval = WRITE_TREE_IGNORE_CACHE_TREE,

19
parse-options.c
View File

@@ -88,6 +88,14 @@ static int do_get_int_value(const void *value, size_t precision, intmax_t *ret)
} }
} }
static intmax_t get_int_value(const struct option *opt, enum opt_parsed flags)
{
intmax_t ret;
if (do_get_int_value(opt->value, opt->precision, &ret))
BUG("invalid precision for option %s", optname(opt, flags));
return ret;
}
static enum parse_opt_result set_int_value(const struct option *opt, static enum parse_opt_result set_int_value(const struct option *opt,
enum opt_parsed flags, enum opt_parsed flags,
intmax_t value) intmax_t value)
@@ -139,11 +147,14 @@ static enum parse_opt_result do_get_value(struct parse_opt_ctx_t *p,
return opt->ll_callback(p, opt, NULL, unset); return opt->ll_callback(p, opt, NULL, unset);
case OPTION_BIT: case OPTION_BIT:
{
intmax_t value = get_int_value(opt, flags);
if (unset) if (unset)
*(int *)opt->value &= ~opt->defval; value &= ~opt->defval;
else else
*(int *)opt->value |= opt->defval; value |= opt->defval;
return 0; return set_int_value(opt, flags, value);
}
case OPTION_NEGBIT: case OPTION_NEGBIT:
if (unset) if (unset)
@@ -631,11 +642,11 @@ static void parse_options_check(const struct option *opts)
optbug(opts, "OPTION_SET_INT 0 should not be negatable"); optbug(opts, "OPTION_SET_INT 0 should not be negatable");
switch (opts->type) { switch (opts->type) {
case OPTION_SET_INT: case OPTION_SET_INT:
case OPTION_BIT:
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_COUNTUP:
case OPTION_BIT:
case OPTION_NEGBIT: case OPTION_NEGBIT:
case OPTION_NUMBER: case OPTION_NUMBER:
case OPTION_BITOP: case OPTION_BITOP:

1
parse-options.h
View File

@@ -172,6 +172,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), \
.callback = NULL, \ .callback = NULL, \