chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Beginnings of handling suspend/etc within logind
[elogind.git]
/
src
/
login
/
inhibit.c
diff --git
a/src/login/inhibit.c
b/src/login/inhibit.c
index 8c9d1165d2577a52b9e23e171bad8efd2c8ec72f..9f349b7c73e8e529b458e7879ebb9e654916f936 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>
@@
-235,7
+234,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
("Failed to connect to bus: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to connect to bus: %m"
);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-260,13
+259,13
@@
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;
}
return EXIT_FAILURE;
}
@@
-276,11
+275,11
@@
int main(int argc, char *argv[]) {
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;
}