/* SPDX-License-Identifier: LGPL-2.1+ */
#include <getopt.h>
+#include <locale.h>
#include "sd-event.h"
#include "sd-id128.h"
#include "hostname-util.h"
#include "import-util.h"
#include "machine-image.h"
+#include "main-func.h"
#include "parse-util.h"
#include "pull-raw.h"
#include "pull-tar.h"
local = l;
}
- if (isempty(local) || streq(local, "-"))
- local = NULL;
+ local = empty_or_dash_to_null(local);
if (local) {
r = tar_strip_suffixes(local, &ll);
local = l;
}
- if (isempty(local) || streq(local, "-"))
- local = NULL;
+ local = empty_or_dash_to_null(local);
if (local) {
r = raw_strip_suffixes(local, &ll);
case ARG_VERIFY:
arg_verify = import_verify_from_string(optarg);
- if (arg_verify < 0) {
- log_error("Invalid verification setting '%s'", optarg);
- return -EINVAL;
- }
+ if (arg_verify < 0)
+ return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+ "Invalid verification setting '%s'", optarg);
break;
case ARG_SETTINGS:
r = parse_boolean(optarg);
if (r < 0)
- return log_error_errno(r, "Failed to parse --settings= parameter '%s'", optarg);
+ return log_error_errno(r, "Failed to parse --settings= parameter '%s': %m", optarg);
arg_settings = r;
break;
case ARG_ROOTHASH:
r = parse_boolean(optarg);
if (r < 0)
- return log_error_errno(r, "Failed to parse --roothash= parameter '%s'", optarg);
+ return log_error_errno(r, "Failed to parse --roothash= parameter '%s': %m", optarg);
arg_roothash = r;
break;
}
static int pull_main(int argc, char *argv[]) {
-
static const Verb verbs[] = {
{ "help", VERB_ANY, VERB_ANY, 0, help },
{ "tar", 2, 3, 0, pull_tar },
return dispatch_verb(argc, argv, verbs, NULL);
}
-int main(int argc, char *argv[]) {
+static int run(int argc, char *argv[]) {
int r;
setlocale(LC_ALL, "");
r = parse_argv(argc, argv);
if (r <= 0)
- goto finish;
+ return r;
(void) ignore_signals(SIGPIPE, -1);
- r = pull_main(argc, argv);
-
-finish:
- return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ return pull_main(argc, argv);
}
+
+DEFINE_MAIN_FUNCTION(run);