]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
busctl: if --timeout= or --limit-messages= are specified with no argument, reset...
authorLennart Poettering <lennart@poettering.net>
Mon, 28 Oct 2024 12:52:04 +0000 (13:52 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 29 Oct 2024 15:50:08 +0000 (16:50 +0100)
Follow-up for: 989e843e7543b21b91de4368da44692d674722a5
See: #34048

src/busctl/busctl.c

index 1cbe07be112b5a596af7897125c9443342fc82d0..7c2a2c1b00c28209a547a41f9389a09d7b0ae23c 100644 (file)
@@ -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);