From: David Tardon <dtardon@redhat.com>
Date: Wed, 7 May 2025 12:35:54 +0000 (+0200)
Subject: udevadm-info: reject devices passed via opts too
X-Git-Tag: v258-rc1~660^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31767b92a0b3980e0ae8a0f44715f86e72c35f77;p=thirdparty%2Fsystemd.git

udevadm-info: reject devices passed via opts too

Follow-up-for a6b4b2fa010f6dc5e18f1a14d93204c6c1416278
---

diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index 2eda70d1c01..373ecdbe5d5 100644
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -1250,11 +1250,10 @@ static int parse_argv(int argc, char *argv[]) {
         r = strv_extend_strv(&arg_devices, argv + optind, /* filter_duplicates= */ false);
         if (r < 0)
                 return log_error_errno(r, "Failed to build argument list: %m");
-        bool has_positional_args = r > 0;
 
-        if (IN_SET(arg_action_type, ACTION_DEVICE_ID_FILE, ACTION_CLEANUP_DB) && has_positional_args)
+        if (IN_SET(arg_action_type, ACTION_DEVICE_ID_FILE, ACTION_CLEANUP_DB) && !strv_isempty(arg_devices))
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Positional arguments are not allowed with -d/--device-id-of-file and -c/--cleanup-db.");
+                                       "Devices are not allowed with -d/--device-id-of-file and -c/--cleanup-db.");
 
         if (!IN_SET(arg_action_type, ACTION_DEVICE_ID_FILE, ACTION_CLEANUP_DB, ACTION_EXPORT, ACTION_TREE) &&
             strv_isempty(arg_devices))