parse-options: add precision handling for OPTION_NEGBIT

Similar to 09705696f7 (parse-options: introduce precision handling for
`OPTION_INTEGER`, 2025-04-17) support value variables of different sizes
for OPTION_NEGBIT.  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>

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 2e8c4ee6784d84f7d0dc60bcf86ee615280f0d6d..e90562a3b8a84e397dccf6eb28d5dce022e14ac9 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1128,6 +1128,7 @@ int cmd_rebase(int argc,
                        .short_name = 'n',
                        .long_name = "no-stat",
                        .value = &options.flags,
+                       .precision = sizeof(options.flags),
                        .help = N_("do not show diffstat of what changed upstream"),
                        .flags = PARSE_OPT_NOARG,
                        .defval = REBASE_DIFFSTAT,

diff --git a/parse-options.c b/parse-options.c
index b5c877d5e1ea88a86a5c8ce5da3023a1d8e5abb6..ba89dc4d098d60cdaeb6ed7e5515bcbe38593bcd 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -157,11 +157,14 @@ static enum parse_opt_result do_get_value(struct parse_opt_ctx_t *p,
        }
 
        case OPTION_NEGBIT:
+       {
+               intmax_t value = get_int_value(opt, flags);
                if (unset)
-                       *(int *)opt->value |= opt->defval;
+                       value |= opt->defval;
                else
-                       *(int *)opt->value &= ~opt->defval;
-               return 0;
+                       value &= ~opt->defval;
+               return set_int_value(opt, flags, value);
+       }
 
        case OPTION_BITOP:
                if (unset)
@@ -643,11 +646,11 @@ static void parse_options_check(const struct option *opts)
                switch (opts->type) {
                case OPTION_SET_INT:
                case OPTION_BIT:
+               case OPTION_NEGBIT:
                        if (!signed_int_fits(opts->defval, opts->precision))
                                optbug(opts, "has invalid defval");
                        /* fallthru */
                case OPTION_COUNTUP:
-               case OPTION_NEGBIT:
                case OPTION_NUMBER:
                case OPTION_BITOP:
                        if ((opts->flags & PARSE_OPT_OPTARG) ||

diff --git a/parse-options.h b/parse-options.h
index 6501ca3c2793c9efbe04e7604bb9acf1abfd47be..076f88b3841da36a6c0aa53f9d4135e212e80c24 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -250,6 +250,7 @@ struct option {
        .short_name = (s), \
        .long_name = (l), \
        .value = (v), \
+       .precision = sizeof(*v), \
        .help = (h), \
        .flags = PARSE_OPT_NOARG, \
        .defval = (b), \