From 577e5e9a5e5a0076389f3b197d93e36da4abea06 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 11 Feb 2026 23:15:24 +0100 Subject: [PATCH] parse-argument: make parse_tristate_argument() do something useful I expressed the issue I have with parse_tristate_argument() in #37751: it doesn't add any value to direct use of parse_tristate(); on the contrary, it doesn't support means to reset the arg to "auto"/-1 state. The mere reason it existed is that we need a int type ret param. Since the previous attempt to address this mess failed, let's try to make the function more useful by making it accept "auto". I figure this is useful on its own. As requested in https://github.com/systemd/systemd/pull/40652#discussion_r2831833996, the function name is suffixed with _with_auto() to establish that "auto" is handled internally. --- man/bootctl.xml | 7 ++++--- man/run0.xml | 5 +++-- man/systemd-dissect.xml | 8 ++++---- src/bootctl/bootctl.c | 2 +- src/dissect/dissect.c | 2 +- src/run/run.c | 2 +- src/shared/parse-argument.c | 28 +++++++++++++--------------- src/shared/parse-argument.h | 2 +- src/systemctl/systemctl.c | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/man/bootctl.xml b/man/bootctl.xml index 0c46edb6105..5f53023c83d 100644 --- a/man/bootctl.xml +++ b/man/bootctl.xml @@ -407,10 +407,11 @@ - + Controls whether to touch the firmware's boot loader list stored in EFI variables, - and other EFI variables. If not specified defaults to no when execution in a container runtime is - detected, yes otherwise. + and other EFI variables. If not specified or set to , EFI variables will not + be modified when execution in a container runtime is detected. may be used to + explicit override the check. diff --git a/man/run0.xml b/man/run0.xml index 831b63a541d..186383dbbe1 100644 --- a/man/run0.xml +++ b/man/run0.xml @@ -255,8 +255,9 @@ Controls whether to activate the per-user service manager for the target user. By - default if the target user is root or a system user the per-user service manager - is not activated as effect of the run0 invocation, otherwise it is. + default (unset or set to ), if the target user is root or + a system user the per-user service manager is not activated as effect of the run0 + invocation, otherwise it is. This ultimately controls the $XDG_SESSION_CLASS environment variable pam_systemd8 diff --git a/man/systemd-dissect.xml b/man/systemd-dissect.xml index 9368d90a528..b4ff042bb9d 100644 --- a/man/systemd-dissect.xml +++ b/man/systemd-dissect.xml @@ -555,10 +555,10 @@ Controls whether file ownership (user and group) is preserved when copying files - with or . Takes a boolean. If - yes, ownership is always preserved. If no, ownership is never - preserved and the current user's UID/GID is used instead. If not specified, ownership is preserved - when copying directory trees, but not when copying individual regular files. + with or . Takes a boolean, or . + If yes, ownership is always preserved. If no, ownership is never + preserved and the current user's UID/GID is used instead. If not specified or , + ownership is preserved when copying directory trees, but not when copying individual regular files. diff --git a/src/bootctl/bootctl.c b/src/bootctl/bootctl.c index 7e59fd01681..b69720d66c6 100644 --- a/src/bootctl/bootctl.c +++ b/src/bootctl/bootctl.c @@ -521,7 +521,7 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_VARIABLES: - r = parse_tristate_argument("--variables=", optarg, &arg_touch_variables); + r = parse_tristate_argument_with_auto("--variables=", optarg, &arg_touch_variables); if (r < 0) return r; break; diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 33ddb53d0a6..250be1af3d1 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -637,7 +637,7 @@ static int parse_argv(int argc, char *argv[]) { } case ARG_COPY_OWNERSHIP: - r = parse_tristate_argument("--copy-ownership=", optarg, &arg_copy_ownership); + r = parse_tristate_argument_with_auto("--copy-ownership=", optarg, &arg_copy_ownership); if (r < 0) return r; break; diff --git a/src/run/run.c b/src/run/run.c index e614f27c288..f1bbbe1f393 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -1083,7 +1083,7 @@ static int parse_argv_sudo_mode(int argc, char *argv[]) { break; case ARG_LIGHTWEIGHT: - r = parse_tristate_argument("--lightweight=", optarg, &arg_lightweight); + r = parse_tristate_argument_with_auto("--lightweight=", optarg, &arg_lightweight); if (r < 0) return r; break; diff --git a/src/shared/parse-argument.c b/src/shared/parse-argument.c index f8cd7f30ff7..39e5328e703 100644 --- a/src/shared/parse-argument.c +++ b/src/shared/parse-argument.c @@ -20,10 +20,12 @@ int parse_boolean_argument(const char *optname, const char *s, bool *ret) { /* Returns the result through *ret and the return value. */ + assert(optname); + if (s) { r = parse_boolean(s); if (r < 0) - return log_error_errno(r, "Failed to parse boolean argument to %s: %s.", optname, s); + return log_error_errno(r, "Failed to parse boolean argument to '%s': %s", optname, s); if (ret) *ret = r; @@ -36,24 +38,20 @@ int parse_boolean_argument(const char *optname, const char *s, bool *ret) { } } -int parse_tristate_argument(const char *optname, const char *s, int *ret) { +int parse_tristate_argument_with_auto(const char *optname, const char *s, int *ret) { int r; - if (s) { - r = parse_boolean(s); - if (r < 0) - return log_error_errno(r, "Failed to parse boolean argument to %s: %s.", optname, s); - - if (ret) - *ret = r; + assert(optname); + assert(s); /* We refuse NULL optarg here, since that would be ambiguous on cmdline: + for --enable-a[=BOOL], --enable-a is intuitively interpreted as true rather than "auto" + (parse_boolean_argument() does exactly that). IOW, tristate options should require + arguments. */ - return r; - } else { - if (ret) - *ret = -1; + r = parse_tristate_full(s, "auto", ret); + if (r < 0) + return log_error_errno(r, "Failed to parse tristate argument to '%s': %s", optname, s); - return 0; - } + return 0; } int parse_json_argument(const char *s, sd_json_format_flags_t *ret) { diff --git a/src/shared/parse-argument.h b/src/shared/parse-argument.h index 75098b8eb1a..0df7fc3b5e0 100644 --- a/src/shared/parse-argument.h +++ b/src/shared/parse-argument.h @@ -4,7 +4,7 @@ #include "shared-forward.h" int parse_boolean_argument(const char *optname, const char *s, bool *ret); -int parse_tristate_argument(const char *optname, const char *s, int *ret); +int parse_tristate_argument_with_auto(const char *optname, const char *s, int *ret); int parse_json_argument(const char *s, sd_json_format_flags_t *ret); int parse_path_argument(const char *path, bool suppress_root, char **arg); int parse_signal_argument(const char *s, int *ret); diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 01b5517d142..382a50e3123 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -830,9 +830,9 @@ static int systemctl_parse_argv(int argc, char *argv[]) { break; case ARG_CHECK_INHIBITORS: - r = parse_tristate_full(optarg, "auto", &arg_check_inhibitors); + r = parse_tristate_argument_with_auto("--check-inhibitors=", optarg, &arg_check_inhibitors); if (r < 0) - return log_error_errno(r, "Failed to parse --check-inhibitors= argument: %s", optarg); + return r; break; case ARG_PLAIN: -- 2.47.3