chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: split up HandleSleepKey= into HandleSuspendKey= and HandleHibernateKey=
[elogind.git]
/
src
/
login
/
inhibit.c
diff --git
a/src/login/inhibit.c
b/src/login/inhibit.c
index 62a8223e6381a84a8c455fe227b473798a8c823e..28ce553b3e6c65c5f69ff3a805b00cb0e94930b6 100644
(file)
--- a/
src/login/inhibit.c
+++ b/
src/login/inhibit.c
@@
-43,9
+43,9
@@
static enum {
static int inhibit(DBusConnection *bus, DBusError *error) {
DBusMessage *reply = NULL;
static int inhibit(DBusConnection *bus, DBusError *error) {
DBusMessage *reply = NULL;
- int
fd
;
+ int
r
;
-
fd = bus_method_call_with_reply
(
+
r = bus_method_call_with_reply
(
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
@@
-58,26
+58,26
@@
static int inhibit(DBusConnection *bus, DBusError *error) {
DBUS_TYPE_STRING, &arg_why,
DBUS_TYPE_STRING, &arg_mode,
DBUS_TYPE_INVALID);
DBUS_TYPE_STRING, &arg_why,
DBUS_TYPE_STRING, &arg_mode,
DBUS_TYPE_INVALID);
- if (
fd
)
- return
fd
;
+ if (
r < 0
)
+ return
r
;
if (!dbus_message_get_args(reply, error,
if (!dbus_message_get_args(reply, error,
- DBUS_TYPE_UNIX_FD, &
fd
,
+ DBUS_TYPE_UNIX_FD, &
r
,
DBUS_TYPE_INVALID))
DBUS_TYPE_INVALID))
-
fd
= -EIO;
+
r
= -EIO;
dbus_message_unref(reply);
dbus_message_unref(reply);
- return
fd
;
+ return
r
;
}
static int print_inhibitors(DBusConnection *bus, DBusError *error) {
}
static int print_inhibitors(DBusConnection *bus, DBusError *error) {
- DBusMessage *reply;
+ DBusMessage *reply
= NULL
;
unsigned n = 0;
DBusMessageIter iter, sub, sub2;
int r;
unsigned n = 0;
DBusMessageIter iter, sub, sub2;
int r;
- r = bus_method_call_with_reply
(
+ r = bus_method_call_with_reply(
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
@@
-86,10
+86,8
@@
static int print_inhibitors(DBusConnection *bus, DBusError *error) {
&reply,
NULL,
DBUS_TYPE_INVALID);
&reply,
NULL,
DBUS_TYPE_INVALID);
- if (r) {
- r = -ENOMEM;
+ if (r < 0)
goto finish;
goto finish;
- }
if (!dbus_message_iter_init(reply, &iter)) {
r = -ENOMEM;
if (!dbus_message_iter_init(reply, &iter)) {
r = -ENOMEM;
@@
-100,7
+98,6
@@
static int print_inhibitors(DBusConnection *bus, DBusError *error) {
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
- dbus_message_iter_recurse(&iter, &sub);
printf("%-21s %-20s %-20s %-5s %6s %6s\n",
"WHAT",
printf("%-21s %-20s %-20s %-5s %6s %6s\n",
"WHAT",
@@
-110,7
+107,7
@@
static int print_inhibitors(DBusConnection *bus, DBusError *error) {
"UID",
"PID");
"UID",
"PID");
-
+ dbus_message_iter_recurse(&iter, &sub);
while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
const char *what, *who, *why, *mode;
char *ewho, *ewhy;
while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
const char *what, *who, *why, *mode;
char *ewho, *ewhy;
@@
-163,8
+160,9
@@
static int help(void) {
"Execute a process while inhibiting shutdown/sleep/idle.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
"Execute a process while inhibiting shutdown/sleep/idle.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
- " --what=WHAT Operations to inhibit, colon separated list of idle,\n"
- " sleep, shutdown\n"
+ " --what=WHAT Operations to inhibit, colon separated list of:\n"
+ " shutdown, sleep, idle, handle-power-key,\n"
+ " handle-sleep-key, handle-lid-switch\n"
" --who=STRING A descriptive string who is inhibiting\n"
" --why=STRING A descriptive string why is being inhibited\n"
" --mode=MODE One of block or delay\n"
" --who=STRING A descriptive string who is inhibiting\n"
" --why=STRING A descriptive string why is being inhibited\n"
" --mode=MODE One of block or delay\n"
@@
-306,6
+304,8
@@
int main(int argc, char *argv[]) {
/* Child */
close_nointr_nofail(fd);
/* Child */
close_nointr_nofail(fd);
+ close_all_fds(NULL, 0);
+
execvp(argv[optind], argv + optind);
log_error("Failed to execute %s: %m", argv[optind]);
_exit(EXIT_FAILURE);
execvp(argv[optind], argv + optind);
log_error("Failed to execute %s: %m", argv[optind]);
_exit(EXIT_FAILURE);