chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal-upload: avoid calling printf with maximum precision
[elogind.git]
/
src
/
initctl
/
initctl.c
diff --git
a/src/initctl/initctl.c
b/src/initctl/initctl.c
index f9a6ed44ed5758c7ec9c29a6a76c66746b01c589..f1c2b8dfb4ad8652d9829ccb065b6d694797c383 100644
(file)
--- a/
src/initctl/initctl.c
+++ b/
src/initctl/initctl.c
@@
-218,7
+218,7
@@
static int fifo_process(Fifo *f) {
return 0;
log_warning("Failed to read from fifo: %m");
return 0;
log_warning("Failed to read from fifo: %m");
- return -
1
;
+ return -
errno
;
}
f->bytes_read += l;
}
f->bytes_read += l;
@@
-383,7
+383,8
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- if ((n = sd_listen_fds(true)) < 0) {
+ n = sd_listen_fds(true);
+ if (n < 0) {
log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
return EXIT_FAILURE;
}
log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
return EXIT_FAILURE;
}
@@
-430,6
+431,7
@@
int main(int argc, char *argv[]) {
fail:
sd_notify(false,
fail:
sd_notify(false,
+ "STOPPING=1\n"
"STATUS=Shutting down...");
server_done(&server);
"STATUS=Shutting down...");
server_done(&server);