udevadm: info - unify -V and --version

diff --git a/TODO b/TODO
index 3320d913471fcaef58111c4b934e0d9c2b14a4ce..4d6f6d4d192e4d786cc82a526995ef0f8e6ae0fd 100644 (file)
--- 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 d30fc0031ce23b8183207e70dadb6520fdfe9f49..745b4fdb7b9aad3f94194c7df4485896ec4bcae6 100644 (file)
--- 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"