chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
everywhere: port everything to sigprocmask_many() and friends
[elogind.git]
/
src
/
login
/
inhibit.c
diff --git
a/src/login/inhibit.c
b/src/login/inhibit.c
index 3034e20f0ec5789307f0ce0d57a3e0b1b1847052..0e5dce59258c47ae797a668af8dcc3d57be5ee6d 100644
(file)
--- a/
src/login/inhibit.c
+++ b/
src/login/inhibit.c
@@
-20,7
+20,6
@@
***/
#include <getopt.h>
***/
#include <getopt.h>
-#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
@@
-32,6
+31,9
@@
#include "util.h"
#include "build.h"
#include "strv.h"
#include "util.h"
#include "build.h"
#include "strv.h"
+#include "formats-util.h"
+#include "process-util.h"
+#include "signal-util.h"
static const char* arg_what = "idle:sleep:shutdown";
static const char* arg_who = NULL;
static const char* arg_what = "idle:sleep:shutdown";
static const char* arg_who = NULL;
@@
-235,7
+237,7
@@
int main(int argc, char *argv[]) {
r = sd_bus_default_system(&bus);
if (r < 0) {
r = sd_bus_default_system(&bus);
if (r < 0) {
- log_error_errno(
-
r, "Failed to connect to bus: %m");
+ log_error_errno(r, "Failed to connect to bus: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-260,27
+262,30
@@
int main(int argc, char *argv[]) {
fd = inhibit(bus, &error);
if (fd < 0) {
fd = inhibit(bus, &error);
if (fd < 0) {
- log_error("Failed to inhibit: %s", bus_error_message(&error,
-r
));
+ log_error("Failed to inhibit: %s", bus_error_message(&error,
fd
));
return EXIT_FAILURE;
}
pid = fork();
if (pid < 0) {
return EXIT_FAILURE;
}
pid = fork();
if (pid < 0) {
- log_error
(
"Failed to fork: %m");
+ log_error
_errno(errno,
"Failed to fork: %m");
return EXIT_FAILURE;
}
if (pid == 0) {
/* Child */
return EXIT_FAILURE;
}
if (pid == 0) {
/* Child */
+ (void) reset_all_signal_handlers();
+ (void) reset_signal_mask();
+
close_all_fds(NULL, 0);
execvp(argv[optind], argv + optind);
close_all_fds(NULL, 0);
execvp(argv[optind], argv + optind);
- log_error
(
"Failed to execute %s: %m", argv[optind]);
+ log_error
_errno(errno,
"Failed to execute %s: %m", argv[optind]);
_exit(EXIT_FAILURE);
}
_exit(EXIT_FAILURE);
}
- r = wait_for_terminate_and_warn(argv[optind], pid);
+ r = wait_for_terminate_and_warn(argv[optind], pid
, true
);
return r < 0 ? EXIT_FAILURE : r;
}
return r < 0 ? EXIT_FAILURE : r;
}