From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 13 Nov 2008 06:31:04 +0000 (+0100)
Subject: udevadm: info - unify -V and --version
X-Git-Tag: 174~1326
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=50025605e0f9942da513c9dcfde289495afefd17

udevadm: info - unify -V and --version
---

diff --git a/TODO b/TODO
index 3320d9134..4d6f6d4d1 100644
--- a/TODO
+++ b/TODO
@@ -7,5 +7,4 @@
     the default rules
   o "udevadm control" commands will only accept the --<command> syntax
   o symlink names to udevadm will no longer be resolved to old command names
-  o fix "udevadm info -V" format
   o get distros to agree on a default set of rules
diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index d30fc0031..745b4fdb7 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -228,7 +228,7 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		{ "device-id-of-file", required_argument, NULL, 'd' },
 		{ "export", no_argument, NULL, 'x' },
 		{ "export-prefix", required_argument, NULL, 'P' },
-		{ "version", no_argument, NULL, 1 }, /* -V outputs braindead format */
+		{ "version", no_argument, NULL, 'V' },
 		{ "help", no_argument, NULL, 'h' },
 		{}
 	};
@@ -366,11 +366,8 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		case 'P':
 			export_prefix = optarg;
 			break;
-		case 1:
-			printf("%s\n", VERSION);
-			goto exit;
 		case 'V':
-			printf("udevinfo, version %s\n", VERSION);
+			printf("%s\n", VERSION);
 			goto exit;
 		case 'h':
 			printf("Usage: udevadm info OPTIONS\n"