udevadm: show only version number for '--version' option

yuwata · keszybz · commit 51b006e18de4 · 2018-09-21T10:58:54.000+02:00
This effectively reverts 2bc54be and relevant changes in systemd#9920, as it is used to determine the version of udev, e.g., dracut. Fixes dracutdevs/dracut#468.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
+}

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ int control_main(int argc, char argv[], void userdata) {`
`144`	`144`	`break;`
`145`	`145`	`}`
`146`	`146`	`case 'V':`
`147`		`- return version();`
	`147`	`+ return print_version();`
`148`	`148`	`case 'h':`
`149`	`149`	`return help();`
`150`	`150`	`case '?':`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ static int parse_argv(int argc, char *argv[]) {`
`205`	`205`	`break;`
`206`	`206`	`}`
`207`	`207`	`case 'V':`
`208`		`- return version();`
	`208`	`+ return print_version();`
`209`	`209`	`case 'h':`
`210`	`210`	`return help();`
`211`	`211`	`case '?':`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ static int parse_argv(int argc, char *argv[]) {`
`62`	`62`	`}`
`63`	`63`	`break;`
`64`	`64`	`case 'V':`
`65`		`- return version();`
	`65`	`+ return print_version();`
`66`	`66`	`case 'h':`
`67`	`67`	`return help();`
`68`	`68`	`case '?':`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ int trigger_main(int argc, char argv[], void userdata) {`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`case 'V':`
`235`		`- return version();`
	`235`	`+ return print_version();`
`236`	`236`	`case 'h':`
`237`	`237`	`return help();`
`238`	`238`	`case '?':`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static int parse_argv(int argc, char *argv[]) {`
`68`	`68`	`return help();`
`69`	`69`
`70`	`70`	`case 'V':`
`71`		`- return version();`
	`71`	`+ return print_version();`
`72`	`72`
`73`	`73`	`case '?':`
`74`	`74`	`return -EINVAL;`
`@@ -81,7 +81,7 @@ static int parse_argv(int argc, char *argv[]) {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`static int version_main(int argc, char argv[], void userdata) {`
`84`		`- return version();`
	`84`	`+ return print_version();`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`static int help_main(int argc, char argv[], void userdata) {`