#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;
} control = {};
struct msghdr msghdr = {
.msg_iov = &iovec,
- msghdr.msg_iovlen = 1,
- msghdr.msg_control = &control,
- msghdr.msg_controllen = sizeof(control),
+ .msg_iovlen = 1,
+ .msg_control = &control,
+ .msg_controllen = sizeof(control),
};
assert(fd >= 0);
static void warn_wall(usec_t n, struct sd_shutdown_command *c) {
char date[FORMAT_TIMESTAMP_MAX];
const char *prefix;
- char *l = NULL;
+ _cleanup_free_ char *l = NULL;
assert(c);
assert(c->warn_wall);
assert_not_reached("Unknown mode!");
if (asprintf(&l, "%s%s%s%s!", c->wall_message, c->wall_message[0] ? "\n" : "",
- prefix, format_timestamp(date, sizeof(date), c->usec)) < 0)
+ prefix, format_timestamp(date, sizeof(date), c->usec)) >= 0)
+ utmp_wall(l, NULL, NULL);
+ else
log_error("Failed to allocate wall message");
- else {
- utmp_wall(l, NULL);
- free(l);
- }
}
-static usec_t when_wall(usec_t n, usec_t elapse) {
+_const_ static usec_t when_wall(usec_t n, usec_t elapse) {
static const struct {
usec_t delay;
static int update_schedule_file(struct sd_shutdown_command *c) {
int r;
- FILE *f;
- char *temp_path, *t;
+ _cleanup_fclose_ FILE *f = NULL;
+ _cleanup_free_ char *t = NULL, *temp_path = NULL;
assert(c);
r = fopen_temporary("/run/systemd/shutdown/scheduled", &f, &temp_path);
if (r < 0) {
log_error("Failed to save information about scheduled shutdowns: %s", strerror(-r));
- free(t);
return r;
}
fchmod(fileno(f), 0644);
fprintf(f,
- "USEC=%llu\n"
+ "USEC="USEC_FMT"\n"
"WARN_WALL=%i\n"
"MODE=%s\n",
- (unsigned long long) c->usec,
+ c->usec,
c->warn_wall,
mode_to_string(c->mode));
if (!isempty(t))
fprintf(f, "WALL_MESSAGE=%s\n", t);
- free(t);
-
fflush(f);
if (ferror(f) || rename(temp_path, "/run/systemd/shutdown/scheduled") < 0) {
unlink("/run/systemd/shutdown/scheduled");
}
- fclose(f);
- free(temp_path);
-
return r;
}
}
}
- 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;