#include "log.h"
#include "sd-readahead.h"
#include "build.h"
+#include "env-util.h"
static bool arg_ready = false;
static pid_t arg_pid = 0;
{ "status", required_argument, NULL, ARG_STATUS },
{ "booted", no_argument, NULL, ARG_BOOTED },
{ "readahead", required_argument, NULL, ARG_READAHEAD },
- { NULL, 0, NULL, 0 }
+ {}
};
int c;
switch (c) {
case 'h':
- help();
- return 0;
+ return help();
case ARG_VERSION:
puts(PACKAGE_STRING);
- puts(DISTRIBUTION);
puts(SYSTEMD_FEATURES);
return 0;
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
}
log_parse_environment();
log_open();
- if ((r = parse_argv(argc, argv)) <= 0) {
+ r = parse_argv(argc, argv);
+ if (r <= 0) {
retval = r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
goto finish;
}