From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 10 Jun 2009 13:55:24 +0000 (+0200)
Subject: udevadm: info -revert "accept --query without argument"
X-Git-Tag: 174~986
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ff5d99e0b04d1e49204be60ac5641b01f89c34ac

udevadm: info -revert "accept --query without argument"

Getopt is too dumb, the optional argument breaks "udevadm -q symlink".
---

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 2ffce27ed..fa09b9829 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -221,7 +221,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 	static const struct option options[] = {
 		{ "name", required_argument, NULL, 'n' },
 		{ "path", required_argument, NULL, 'p' },
-		{ "query", optional_argument, NULL, 'q' },
+		{ "query", required_argument, NULL, 'q' },
 		{ "attribute-walk", no_argument, NULL, 'a' },
 		{ "export-db", no_argument, NULL, 'e' },
 		{ "root", no_argument, NULL, 'r' },
@@ -254,7 +254,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		int option;
 		struct stat statbuf;
 
-		option = getopt_long(argc, argv, "aed:n:p:q::rxPVh", options, NULL);
+		option = getopt_long(argc, argv, "aed:n:p:q:rxPVh", options, NULL);
 		if (option == -1)
 			break;
 
@@ -317,7 +317,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 			break;
 		case 'q':
 			action = ACTION_QUERY;
-			if (optarg == NULL || strcmp(optarg, "property") == 0 || strcmp(optarg, "env") == 0) {
+			if (strcmp(optarg, "property") == 0 || strcmp(optarg, "env") == 0) {
 				query = QUERY_PROPERTY;
 			} else if (strcmp(optarg, "name") == 0) {
 				query = QUERY_NAME;