diff options
Diffstat (limited to 'src/detect-virt/detect-virt.c')
-rw-r--r-- | src/detect-virt/detect-virt.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c index e8c6362a9c..f05f2279b3 100644 --- a/src/detect-virt/detect-virt.c +++ b/src/detect-virt/detect-virt.c @@ -5,6 +5,9 @@ #include <stdbool.h> #include <stdlib.h> +#include "alloc-util.h" +#include "main-func.h" +#include "pretty-print.h" #include "string-table.h" #include "util.h" #include "virt.h" @@ -18,7 +21,14 @@ static enum { ONLY_PRIVATE_USERS, } arg_mode = ANY_VIRTUALIZATION; -static void help(void) { +static int help(void) { + _cleanup_free_ char *link = NULL; + int r; + + r = terminal_urlify_man("systemd-detect-virt", "1", &link); + if (r < 0) + return log_oom(); + printf("%s [OPTIONS...]\n\n" "Detect execution in a virtualized environment.\n\n" " -h --help Show this help\n" @@ -29,7 +39,12 @@ static void help(void) { " --private-users Only detect whether we are running in a user namespace\n" " -q --quiet Don't output anything, just set return value\n" " --list List all known and detectable types of virtualization\n" - , program_invocation_short_name); + "\nSee the %s for details.\n" + , program_invocation_short_name + , link + ); + + return 0; } static int parse_argv(int argc, char *argv[]) { @@ -62,8 +77,7 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); - return 0; + return help(); case ARG_VERSION: return version(); @@ -99,15 +113,15 @@ static int parse_argv(int argc, char *argv[]) { assert_not_reached("Unhandled option"); } - if (optind < argc) { - log_error("%s takes no arguments.", program_invocation_short_name); - return -EINVAL; - } + if (optind < argc) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "%s takes no arguments.", + program_invocation_short_name); return 1; } -int main(int argc, char *argv[]) { +static int run(int argc, char *argv[]) { int r; /* This is mostly intended to be used for scripts which want @@ -119,59 +133,45 @@ int main(int argc, char *argv[]) { r = parse_argv(argc, argv); if (r <= 0) - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + return r; switch (arg_mode) { - case ONLY_VM: r = detect_vm(); - if (r < 0) { - log_error_errno(r, "Failed to check for VM: %m"); - return EXIT_FAILURE; - } - + if (r < 0) + return log_error_errno(r, "Failed to check for VM: %m"); break; case ONLY_CONTAINER: r = detect_container(); - if (r < 0) { - log_error_errno(r, "Failed to check for container: %m"); - return EXIT_FAILURE; - } - + if (r < 0) + return log_error_errno(r, "Failed to check for container: %m"); break; case ONLY_CHROOT: r = running_in_chroot(); - if (r < 0) { - log_error_errno(r, "Failed to check for chroot() environment: %m"); - return EXIT_FAILURE; - } - - return r ? EXIT_SUCCESS : EXIT_FAILURE; + if (r < 0) + return log_error_errno(r, "Failed to check for chroot() environment: %m"); + return !r; case ONLY_PRIVATE_USERS: r = running_in_userns(); - if (r < 0) { - log_error_errno(r, "Failed to check for user namespace: %m"); - return EXIT_FAILURE; - } - - return r ? EXIT_SUCCESS : EXIT_FAILURE; + if (r < 0) + return log_error_errno(r, "Failed to check for user namespace: %m"); + return !r; case ANY_VIRTUALIZATION: default: r = detect_virtualization(); - if (r < 0) { - log_error_errno(r, "Failed to check for virtualization: %m"); - return EXIT_FAILURE; - } - + if (r < 0) + return log_error_errno(r, "Failed to check for virtualization: %m"); break; } if (!arg_quiet) puts(virtualization_to_string(r)); - return r != VIRTUALIZATION_NONE ? EXIT_SUCCESS : EXIT_FAILURE; + return r == VIRTUALIZATION_NONE; } + +DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run); |