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",
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,
- DBUS_TYPE_UNIX_FD, &fd,
+ DBUS_TYPE_UNIX_FD, &r,
DBUS_TYPE_INVALID))
- fd = -EIO;
+ r = -EIO;
dbus_message_unref(reply);
- return fd;
+ return r;
}
static int print_inhibitors(DBusConnection *bus, DBusError *error) {
- DBusMessage *reply;
+ DBusMessage *reply = NULL;
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",
&reply,
NULL,
DBUS_TYPE_INVALID);
- if (r)
- return -ENOMEM;
+ if (r < 0)
goto finish;
if (!dbus_message_iter_init(reply, &iter)) {
r = -EIO;
goto finish;
}
- dbus_message_iter_recurse(&iter, &sub);
printf("%-21s %-20s %-20s %-5s %6s %6s\n",
"WHAT",
"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;
"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-suspend-key, handle-hibernate-key,\n"
+ " 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"
case ARG_VERSION:
puts(PACKAGE_STRING);
- puts(DISTRIBUTION);
puts(SYSTEMD_FEATURES);
return 0;
/* 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);