From 51b006e18de49c91a26fae232ec1bc12e26942ea Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 21 Sep 2018 17:45:26 +0900
Subject: [PATCH] udevadm: show only version number for '--version' option

This effectively reverts 2bc54be485def3d1697a00209ff73ae21aa7f268
and relevant changes in #9920, as it is used to determine the version
of udev, e.g., dracut.

Fixes dracutdevs/dracut#468.
---
 src/udev/udevadm-control.c      | 2 +-
 src/udev/udevadm-hwdb.c         | 2 +-
 src/udev/udevadm-info.c         | 2 +-
 src/udev/udevadm-monitor.c      | 2 +-
 src/udev/udevadm-settle.c       | 2 +-
 src/udev/udevadm-test-builtin.c | 2 +-
 src/udev/udevadm-test.c         | 2 +-
 src/udev/udevadm-trigger.c      | 2 +-
 src/udev/udevadm.c              | 4 ++--
 src/udev/udevadm.h              | 7 +++++++
 10 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index 68c6b8104ca..3125a18088e 100644
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -144,7 +144,7 @@ int control_main(int argc, char *argv[], void *userdata) {
                         break;
                 }
                 case 'V':
-                        return version();
+                        return print_version();
                 case 'h':
                         return help();
                 case '?':
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index e1a322e5452..4eb2897b219 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -65,7 +65,7 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_root = optarg;
                         break;
                 case 'V':
-                        return version();
+                        return print_version();
                 case 'h':
                         return help();
                 case '?':
diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index 23a27d0a285..92c7cfe6bfd 100644
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -357,7 +357,7 @@ int info_main(int argc, char *argv[], void *userdata) {
                         export_prefix = optarg;
                         break;
                 case 'V':
-                        return version();
+                        return print_version();
                 case 'h':
                         return help();
                 case '?':
diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index ba6f30f17f2..8a0db2b89d8 100644
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -205,7 +205,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
                 }
                 case 'V':
-                        return version();
+                        return print_version();
                 case 'h':
                         return help();
                 case '?':
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index a172b25adad..7e02275ba4e 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -57,7 +57,7 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_exists = optarg;
                         break;
                 case 'V':
-                        return version();
+                        return print_version();
                 case 'h':
                         return help();
                 case 's':
diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c
index ac1a8c2d7da..940d691dd7d 100644
--- a/src/udev/udevadm-test-builtin.c
+++ b/src/udev/udevadm-test-builtin.c
@@ -40,7 +40,7 @@ static int parse_argv(int argc, char *argv[]) {
         while ((c = getopt_long(argc, argv, "Vh", options, NULL)) >= 0)
                 switch (c) {
                 case 'V':
-                        return version();
+                        return print_version();
                 case 'h':
                         return help();
                 case '?':
diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
index 65e14a86645..462c5818f45 100644
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -62,7 +62,7 @@ static int parse_argv(int argc, char *argv[]) {
                         }
                         break;
                 case 'V':
-                        return version();
+                        return print_version();
                 case 'h':
                         return help();
                 case '?':
diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
index 84a977e0942..e08d342f290 100644
--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
@@ -232,7 +232,7 @@ int trigger_main(int argc, char *argv[], void *userdata) {
                 }
 
                 case 'V':
-                        return version();
+                        return print_version();
                 case 'h':
                         return help();
                 case '?':
diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index 7c6eb3bf4c3..64092c55006 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -68,7 +68,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return help();
 
                 case 'V':
-                        return version();
+                        return print_version();
 
                 case '?':
                         return -EINVAL;
@@ -81,7 +81,7 @@ static int parse_argv(int argc, char *argv[]) {
 }
 
 static int version_main(int argc, char *argv[], void *userdata) {
-        return version();
+        return print_version();
 }
 
 static int help_main(int argc, char *argv[], void *userdata) {
diff --git a/src/udev/udevadm.h b/src/udev/udevadm.h
index 7c20e0a8ff8..98f9019a48a 100644
--- a/src/udev/udevadm.h
+++ b/src/udev/udevadm.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 #pragma once
 
+#include <stdio.h>
+
 int info_main(int argc, char *argv[], void *userdata);
 int trigger_main(int argc, char *argv[], void *userdata);
 int settle_main(int argc, char *argv[], void *userdata);
@@ -9,3 +11,8 @@ int monitor_main(int argc, char *argv[], void *userdata);
 int hwdb_main(int argc, char *argv[], void *userdata);
 int test_main(int argc, char *argv[], void *userdata);
 int builtin_main(int argc, char *argv[], void *userdata);
+
+static inline int print_version(void) {
+        puts(PACKAGE_VERSION);
+        return 0;
+}
-- 
2.47.3