diff options
Diffstat (limited to 'src/machine-id-setup/machine-id-setup-main.c')
-rw-r--r-- | src/machine-id-setup/machine-id-setup-main.c | 51 |
1 files changed, 32 insertions, 19 deletions
diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c index 966fd8e404..1b575d7725 100644 --- a/src/machine-id-setup/machine-id-setup-main.c +++ b/src/machine-id-setup/machine-id-setup-main.c @@ -5,17 +5,29 @@ #include <stdio.h> #include <stdlib.h> +#include "alloc-util.h" #include "id128-util.h" #include "log.h" #include "machine-id-setup.h" +#include "main-func.h" #include "path-util.h" +#include "pretty-print.h" #include "util.h" static char *arg_root = NULL; static bool arg_commit = false; static bool arg_print = false; -static void help(void) { +STATIC_DESTRUCTOR_REGISTER(arg_root, freep); + +static int help(void) { + _cleanup_free_ char *link = NULL; + int r; + + r = terminal_urlify_man("systemd-machine-id-setup", "1", &link); + if (r < 0) + return log_oom(); + printf("%s [OPTIONS...]\n\n" "Initialize /etc/machine-id from a random source.\n\n" " -h --help Show this help\n" @@ -23,7 +35,12 @@ static void help(void) { " --root=ROOT Filesystem root\n" " --commit Commit transient ID\n" " --print Print used machine ID\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[]) { @@ -54,8 +71,7 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); - return 0; + return help(); case ARG_VERSION: return version(); @@ -81,15 +97,14 @@ static int parse_argv(int argc, char *argv[]) { assert_not_reached("Unhandled option"); } - if (optind < argc) { - log_error("Extraneous arguments"); - return -EINVAL; - } + if (optind < argc) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "Extraneous arguments"); return 1; } -int main(int argc, char *argv[]) { +static int run(int argc, char *argv[]) { char buf[SD_ID128_STRING_MAX]; sd_id128_t id; int r; @@ -99,31 +114,29 @@ int main(int argc, char *argv[]) { r = parse_argv(argc, argv); if (r <= 0) - goto finish; + return r; if (arg_commit) { const char *etc_machine_id; r = machine_id_commit(arg_root); if (r < 0) - goto finish; + return r; etc_machine_id = prefix_roota(arg_root, "/etc/machine-id"); r = id128_read(etc_machine_id, ID128_PLAIN, &id); - if (r < 0) { - log_error_errno(r, "Failed to read machine ID back: %m"); - goto finish; - } + if (r < 0) + return log_error_errno(r, "Failed to read machine ID back: %m"); } else { r = machine_id_setup(arg_root, SD_ID128_NULL, &id); if (r < 0) - goto finish; + return r; } if (arg_print) puts(sd_id128_to_string(id, buf)); -finish: - free(arg_root); - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + return 0; } + +DEFINE_MAIN_FUNCTION(run); |