#include <fcntl.h>
#include <stddef.h>
-#include <systemd/sd-daemon.h>
-#include <systemd/sd-shutdown.h>
+#include "systemd/sd-daemon.h"
+#include "systemd/sd-shutdown.h"
#include "log.h"
#include "macro.h"
union shutdown_buffer b; /* We maintain our own copy here, in
* order not to corrupt the last message */
struct iovec iovec = {
- iovec.iov_base = &b,
- iovec.iov_len = sizeof(b) - 1,
+ .iov_base = &b,
+ .iov_len = sizeof(b) - 1,
};
union {
struct cmsghdr cmsghdr;
if (asprintf(&l, "%s%s%s%s!", c->wall_message, c->wall_message[0] ? "\n" : "",
prefix, format_timestamp(date, sizeof(date), c->usec)) >= 0)
- utmp_wall(l, NULL);
+ utmp_wall(l, NULL, NULL);
else
log_error("Failed to allocate wall message");
}
}
}
- log_debug("systemd-shutdownd running as pid %lu", (unsigned long) getpid());
+ log_debug("systemd-shutdownd running as pid "PID_FMT, getpid());
sd_notify(false,
"READY=1\n"
r = EXIT_SUCCESS;
- log_debug("systemd-shutdownd stopped as pid %lu", (unsigned long) getpid());
+ log_debug("systemd-shutdownd stopped as pid "PID_FMT, getpid());
finish:
for (i = 0; i < _FD_MAX; i++)
- if (pollfd[i].fd >= 0)
- close_nointr_nofail(pollfd[i].fd);
+ safe_close(pollfd[i].fd);
if (unlink_nologin)
unlink("/run/nologin");
}
sd_notify(false,
+ "STOPPING=\n"
"STATUS=Exiting...");
return r;