From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 28 Oct 2024 12:52:04 +0000 (+0100)
Subject: busctl: if --timeout= or --limit-messages= are specified with no argument, reset... 
X-Git-Tag: v257-rc1~116^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0be245a637ceb53a90af85692294667f659b40a5;p=thirdparty%2Fsystemd.git

busctl: if --timeout= or --limit-messages= are specified with no argument, reset to defaults.

Follow-up for: 989e843e7543b21b91de4368da44692d674722a5
See: #34048
---

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 1cbe07be112..7c2a2c1b00c 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -2717,6 +2717,11 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_TIMEOUT:
+                        if (isempty(optarg)) {
+                                arg_timeout = 0; /* Reset to default */
+                                break;
+                        }
+
                         r = parse_sec(optarg, &arg_timeout);
                         if (r < 0)
                                 return log_error_errno(r, "Failed to parse --timeout= parameter '%s': %m", optarg);
@@ -2751,6 +2756,11 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'N':
+                        if (isempty(optarg)) {
+                                arg_limit_messages = UINT64_MAX; /* Reset to default */
+                                break;
+                        }
+
                         r = safe_atou64(optarg, &arg_limit_messages);
                         if (r < 0)
                                 return log_error_errno(r, "Failed to parse --limit-messages= parameter: %s", optarg);