chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make bus errno mappings non-static
[elogind.git]
/
src
/
shutdownd
/
shutdownd.c
diff --git
a/src/shutdownd/shutdownd.c
b/src/shutdownd/shutdownd.c
index 4a1719849ba2aec5e57da674909ce84e6f2b201e..0f008a6100b475b121641e395e7bb3174d47db90 100644
(file)
--- a/
src/shutdownd/shutdownd.c
+++ b/
src/shutdownd/shutdownd.c
@@
-30,8
+30,8
@@
#include <fcntl.h>
#include <stddef.h>
#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"
#include "log.h"
#include "macro.h"
@@
-52,8
+52,8
@@
static int read_packet(int fd, union shutdown_buffer *_b) {
union shutdown_buffer b; /* We maintain our own copy here, in
* order not to corrupt the last message */
struct iovec iovec = {
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;
};
union {
struct cmsghdr cmsghdr;
@@
-61,9
+61,9
@@
static int read_packet(int fd, union shutdown_buffer *_b) {
} control = {};
struct msghdr msghdr = {
.msg_iov = &iovec,
} 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);
};
assert(fd >= 0);
@@
-120,7
+120,7
@@
static int read_packet(int fd, union shutdown_buffer *_b) {
static void warn_wall(usec_t n, struct sd_shutdown_command *c) {
char date[FORMAT_TIMESTAMP_MAX];
const char *prefix;
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(c);
assert(c->warn_wall);
@@
-142,12
+142,10
@@
static void warn_wall(usec_t n, struct sd_shutdown_command *c) {
assert_not_reached("Unknown mode!");
if (asprintf(&l, "%s%s%s%s!", c->wall_message, c->wall_message[0] ? "\n" : "",
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");
log_error("Failed to allocate wall message");
- else {
- utmp_wall(l, NULL);
- free(l);
- }
}
_const_ static usec_t when_wall(usec_t n, usec_t elapse) {
}
_const_ static usec_t when_wall(usec_t n, usec_t elapse) {
@@
-199,8
+197,8
@@
static const char *mode_to_string(enum sd_shutdown_mode m) {
static int update_schedule_file(struct sd_shutdown_command *c) {
int r;
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);
assert(c);
@@
-217,7
+215,6
@@
static int update_schedule_file(struct sd_shutdown_command *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));
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;
}
return r;
}
@@
-237,8
+234,6
@@
static int update_schedule_file(struct sd_shutdown_command *c) {
if (!isempty(t))
fprintf(f, "WALL_MESSAGE=%s\n", t);
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) {
fflush(f);
if (ferror(f) || rename(temp_path, "/run/systemd/shutdown/scheduled") < 0) {
@@
-249,9
+244,6
@@
static int update_schedule_file(struct sd_shutdown_command *c) {
unlink("/run/systemd/shutdown/scheduled");
}
unlink("/run/systemd/shutdown/scheduled");
}
- fclose(f);
- free(temp_path);
-
return r;
}
return r;
}
@@
-313,7
+305,7
@@
int main(int argc, char *argv[]) {
}
}
}
}
- 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"
sd_notify(false,
"READY=1\n"
@@
-433,13
+425,12
@@
int main(int argc, char *argv[]) {
r = EXIT_SUCCESS;
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++)
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");
if (unlink_nologin)
unlink("/run/nologin");
@@
-465,6
+456,7
@@
finish:
}
sd_notify(false,
}
sd_notify(false,
+ "STOPPING=\n"
"STATUS=Exiting...");
return r;
"STATUS=Exiting...");
return r;