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

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

Fixes dracutdevs/dracut#468.
This commit is contained in:
Yu Watanabe
2018-09-21 17:45:26 +09:00
committed by Zbigniew Jędrzejewski-Szmek
parent 298950d055
commit 51b006e18d
10 changed files with 17 additions and 10 deletions

View File

@@ -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 '?':

View File

@@ -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 '?':

View File

@@ -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 '?':

View File

@@ -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 '?':

View File

@@ -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':

View File

@@ -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 '?':

View File

@@ -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 '?':

View File

@@ -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 '?':

View File

@@ -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) {

View File

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