From 37ad11945109402b93dbd7f66a32742d94348f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 10 Dec 2025 15:48:48 +0100 Subject: [PATCH] homectl: trivial simplification --- src/home/homectl.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/home/homectl.c b/src/home/homectl.c index 6112a3a07c..ceb7fae7ee 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -4944,18 +4944,13 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_KEY_NAME: - if (isempty(optarg)) { - arg_key_name = mfree(arg_key_name); - return 0; - } + if (!isempty(optarg) && !filename_is_valid(optarg)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Parameter for --key-name= not a valid filename: %s", optarg); - if (!filename_is_valid(optarg)) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Specified key name not valid: %s", optarg); - - r = free_and_strdup_warn(&arg_key_name, optarg); + r = free_and_strdup_warn(&arg_key_name, empty_to_null(optarg)); if (r < 0) return r; - break; case ARG_SEIZE: