picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Getopt is too dumb, the optional argument breaks "udevadm -q symlink".
This commit is contained in:
Kay Sievers 2009-06-10 15:55:24 +02:00
parent 20fa0fd6a0
commit ff5d99e0b0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
udev/udevadm-info.c
View file

@ -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;