#include <stdio.h>
#include <getopt.h>
-#include <error.h>
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <systemd/sd-daemon.h>
+#include "systemd/sd-daemon.h"
#include "strv.h"
#include "util.h"
#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;
static const char *arg_status = NULL;
static bool arg_booted = false;
-static const char *arg_readahead = NULL;
-
-static int help(void) {
+static void help(void) {
printf("%s [OPTIONS...] [VARIABLE=VALUE...]\n\n"
"Notify the init system about service status updates.\n\n"
" -h --help Show this help\n"
" --ready Inform the init system about service start-up completion\n"
" --pid[=PID] Set main pid of daemon\n"
" --status=TEXT Set status text\n"
- " --booted Returns 0 if the system was booted up with systemd, non-zero otherwise\n"
- " --readahead=ACTION Controls read-ahead operations\n",
+ " --booted Returns 0 if the system was booted up with systemd, non-zero otherwise\n",
program_invocation_short_name);
-
- return 0;
}
static int parse_argv(int argc, char *argv[]) {
ARG_PID,
ARG_STATUS,
ARG_BOOTED,
- ARG_READAHEAD
};
static const struct option options[] = {
{ "pid", optional_argument, NULL, ARG_PID },
{ "status", required_argument, NULL, ARG_STATUS },
{ "booted", no_argument, NULL, ARG_BOOTED },
- { "readahead", required_argument, NULL, ARG_READAHEAD },
- { NULL, 0, NULL, 0 }
+ {}
};
int c;
arg_booted = true;
break;
- case ARG_READAHEAD:
- arg_readahead = optarg;
- break;
-
case '?':
return -EINVAL;
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ assert_not_reached("Unhandled option");
}
}
!arg_ready &&
!arg_status &&
!arg_pid &&
- !arg_booted &&
- !arg_readahead) {
+ !arg_booted) {
help();
return -EINVAL;
}
}
int main(int argc, char* argv[]) {
- char* our_env[4], **final_env = NULL;
+ _cleanup_free_ char *status = NULL, *cpid = NULL, *n = NULL;
+ _cleanup_strv_free_ char **final_env = NULL;
+ char* our_env[4];
unsigned i = 0;
- char *status = NULL, *cpid = NULL, *n = NULL;
- int r, retval = EXIT_FAILURE;
+ int r;
log_parse_environment();
log_open();
- if ((r = parse_argv(argc, argv)) <= 0) {
- retval = r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ r = parse_argv(argc, argv);
+ if (r <= 0)
goto finish;
- }
if (arg_booted)
return sd_booted() <= 0;
- if (arg_readahead) {
- if ((r = sd_readahead(arg_readahead)) < 0) {
- log_error("Failed to issue read-ahead control command: %s", strerror(-r));
- goto finish;
- }
- }
-
if (arg_ready)
our_env[i++] = (char*) "READY=1";
if (arg_status) {
- if (!(status = strappend("STATUS=", arg_status))) {
- log_error("Failed to allocate STATUS string.");
+ status = strappend("STATUS=", arg_status);
+ if (!status) {
+ r = log_oom();
goto finish;
}
}
if (arg_pid > 0) {
- if (asprintf(&cpid, "MAINPID=%lu", (unsigned long) arg_pid) < 0) {
- log_error("Failed to allocate MAINPID string.");
+ if (asprintf(&cpid, "MAINPID="PID_FMT, arg_pid) < 0) {
+ r = log_oom();
goto finish;
}
our_env[i++] = NULL;
- if (!(final_env = strv_env_merge(2, our_env, argv + optind))) {
- log_error("Failed to merge string sets.");
+ final_env = strv_env_merge(2, our_env, argv + optind);
+ if (!final_env) {
+ r = log_oom();
goto finish;
}
if (strv_length(final_env) <= 0) {
- retval = EXIT_SUCCESS;
+ r = 0;
goto finish;
}
- if (!(n = strv_join(final_env, "\n"))) {
- log_error("Failed to concatenate strings.");
+ n = strv_join(final_env, "\n");
+ if (!n) {
+ r = log_oom();
goto finish;
}
- if ((r = sd_notify(false, n)) < 0) {
- log_error("Failed to notify init system: %s", strerror(-r));
+ r = sd_pid_notify(arg_pid, false, n);
+ if (r < 0) {
+ log_error_errno(r, "Failed to notify init system: %m");
goto finish;
}
- retval = r <= 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ if (r == 0)
+ r = -ENOTSUP;
finish:
- free(status);
- free(cpid);
- free(n);
-
- strv_free(final_env);
-
- return retval;
+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}