chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v234.3: Set defaults for the sleep config *after* loading the config file.
[elogind.git]
/
src
/
login
/
inhibit.c
diff --git
a/src/login/inhibit.c
b/src/login/inhibit.c
index db977ccc59b133ed87117b5ec9060e1e3e306df6..896fd570a5b6eabd8b6e58e20b6efca009a4c8cb 100644
(file)
--- a/
src/login/inhibit.c
+++ b/
src/login/inhibit.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-19,19
+17,27
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <fcntl.h>
#include <getopt.h>
#include <getopt.h>
-#include <assert.h>
-#include <stdlib.h>
#include <stdio.h>
#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
#include <unistd.h>
-#include <fcntl.h>
#include "sd-bus.h"
#include "sd-bus.h"
-#include "bus-util.h"
+
+#include "alloc-util.h"
#include "bus-error.h"
#include "bus-error.h"
-#include "util.h"
-#include "build.h"
+#include "bus-util.h"
+#include "fd-util.h"
+#include "format-util.h"
+#include "process-util.h"
+#include "signal-util.h"
#include "strv.h"
#include "strv.h"
+#include "user-util.h"
+#include "util.h"
+
+/// Additional includes needed by elogind
+#include "musl_missing.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;
@@
-44,7
+50,7
@@
static enum {
} arg_action = ACTION_INHIBIT;
static int inhibit(sd_bus *bus, sd_bus_error *error) {
} arg_action = ACTION_INHIBIT;
static int inhibit(sd_bus *bus, sd_bus_error *error) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
int r;
int fd;
int r;
int fd;
@@
-72,7
+78,7
@@
static int inhibit(sd_bus *bus, sd_bus_error *error) {
}
static int print_inhibitors(sd_bus *bus, sd_bus_error *error) {
}
static int print_inhibitors(sd_bus *bus, sd_bus_error *error) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
const char *what, *who, *why, *mode;
unsigned int uid, pid;
unsigned n = 0;
const char *what, *who, *why, *mode;
unsigned int uid, pid;
unsigned n = 0;
@@
-177,9
+183,7
@@
static int parse_argv(int argc, char *argv[]) {
return 0;
case ARG_VERSION:
return 0;
case ARG_VERSION:
- puts(PACKAGE_STRING);
- puts(SYSTEMD_FEATURES);
- return 0;
+ return version();
case ARG_WHAT:
arg_what = optarg;
case ARG_WHAT:
arg_what = optarg;
@@
-220,10
+224,11
@@
static int parse_argv(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
- _cleanup_
bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
- _cleanup_
bus_close_unref_
sd_bus *bus = NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_flush_close_unrefp)
sd_bus *bus = NULL;
int r;
int r;
+ elogind_set_program_name(argv[0]);
log_parse_environment();
log_open();
log_parse_environment();
log_open();
@@
-260,27
+265,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;
}