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 v228: Add remaining updates from upstream (3/3)
[elogind.git]
/
src
/
login
/
inhibit.c
diff --git
a/src/login/inhibit.c
b/src/login/inhibit.c
index b81cf0f6887ff902efe6a7f1ead9b3028aa67d07..a8328592fcfd83c4911d0eacca906dfce9533c3d 100644
(file)
--- a/
src/login/inhibit.c
+++ b/
src/login/inhibit.c
@@
-19,19
+19,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 "formats-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;
@@
-177,9
+185,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;
@@
-221,9
+227,10
@@
static int parse_argv(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
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_bus_
flush_
close_unref_ 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,7
+267,7
@@
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;
}
return EXIT_FAILURE;
}
@@
-273,6
+280,9
@@
int main(int argc, char *argv[]) {
if (pid == 0) {
/* Child */
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);
@@
-280,7
+290,7
@@
int main(int argc, char *argv[]) {
_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;
}