#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
-#include <dbus.h>
#include <unistd.h>
+#include <fcntl.h>
-#include "dbus-common.h"
+#include "sd-bus.h"
+
+#include "bus-util.h"
+#include "bus-error.h"
#include "util.h"
#include "build.h"
#include "strv.h"
ACTION_LIST
} arg_action = ACTION_INHIBIT;
-static int inhibit(DBusConnection *bus, DBusError *error) {
- DBusMessage *reply = NULL;
+static int inhibit(sd_bus *bus, sd_bus_error *error) {
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
int r;
+ int fd;
- r = bus_method_call_with_reply(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
"org.freedesktop.login1.Manager",
"Inhibit",
+ error,
&reply,
- NULL,
- DBUS_TYPE_STRING, &arg_what,
- DBUS_TYPE_STRING, &arg_who,
- DBUS_TYPE_STRING, &arg_why,
- DBUS_TYPE_STRING, &arg_mode,
- DBUS_TYPE_INVALID);
+ "ssss", arg_what, arg_who, arg_why, arg_mode);
if (r < 0)
return r;
- if (!dbus_message_get_args(reply, error,
- DBUS_TYPE_UNIX_FD, &r,
- DBUS_TYPE_INVALID))
- r = -EIO;
+ r = sd_bus_message_read_basic(reply, SD_BUS_TYPE_UNIX_FD, &fd);
+ if (r < 0)
+ return -EIO;
- dbus_message_unref(reply);
+ r = dup(fd);
+ if (r < 0)
+ return -errno;
return r;
}
-static int print_inhibitors(DBusConnection *bus, DBusError *error) {
- DBusMessage *reply = NULL;
+static int print_inhibitors(sd_bus *bus, sd_bus_error *error) {
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ const char *what, *who, *why, *mode;
+ unsigned int uid, pid;
unsigned n = 0;
- DBusMessageIter iter, sub, sub2;
int r;
- r = bus_method_call_with_reply(
+ r = sd_bus_call_method(
bus,
"org.freedesktop.login1",
"/org/freedesktop/login1",
"org.freedesktop.login1.Manager",
"ListInhibitors",
+ error,
&reply,
- NULL,
- DBUS_TYPE_INVALID);
+ "");
if (r < 0)
- goto finish;
-
- if (!dbus_message_iter_init(reply, &iter)) {
- r = -ENOMEM;
- goto finish;
- }
-
- if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) {
- r = -EIO;
- goto finish;
- }
-
- printf("%-21s %-20s %-20s %-5s %6s %6s\n",
- "WHAT",
- "WHO",
- "WHY",
- "MODE",
- "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;
- dbus_uint32_t uid, pid;
-
- if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) {
- r = -EIO;
- goto finish;
- }
-
- dbus_message_iter_recurse(&sub, &sub2);
+ return r;
- if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &what, true) < 0 ||
- bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &who, true) < 0 ||
- bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &why, true) < 0 ||
- bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &mode, true) < 0 ||
- bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &uid, true) < 0 ||
- bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &pid, false) < 0) {
- r = -EIO;
- goto finish;
- }
+ r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssuu)");
+ if (r < 0)
+ return -EIO;
- ewho = ellipsize(who, 20, 66);
- ewhy = ellipsize(why, 20, 66);
+ while ((r = sd_bus_message_read(reply, "(ssssuu)", &what, &who, &why, &mode, &uid, &pid)) > 0) {
+ _cleanup_free_ char *comm = NULL, *u = NULL;
- printf("%-21s %-20s %-20s %-5s %6lu %6lu\n",
- what, ewho ? ewho : who, ewhy ? ewhy : why, mode, (unsigned long) uid, (unsigned long) pid);
- free(ewho);
- free(ewhy);
+ get_process_comm(pid, &comm);
+ u = uid_to_name(uid);
- dbus_message_iter_next(&sub);
+ printf(" Who: %s (UID %lu/%s, PID %lu/%s)\n"
+ " What: %s\n"
+ " Why: %s\n"
+ " Mode: %s\n\n",
+ who, (unsigned long) uid, strna(u), (unsigned long) pid, strna(comm),
+ what,
+ why,
+ mode);
n++;
}
+ if (r < 0)
+ return -EIO;
- printf("\n%u inhibitors listed.\n", n);
- r = 0;
-
-finish:
- if (reply)
- dbus_message_unref(reply);
+ r = sd_bus_message_exit_container(reply);
+ if (r < 0)
+ return -EIO;
- return r;
+ printf("%u inhibitors listed.\n", n);
+ return 0;
}
static int help(void) {
" --version Show package version\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"
+ " 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;
}
}
- if (arg_action == ACTION_INHIBIT && optind >= argc) {
+ if (arg_action == ACTION_INHIBIT && argc == 1)
+ arg_action = ACTION_LIST;
+
+ else if (arg_action == ACTION_INHIBIT && optind >= argc) {
log_error("Missing command line to execute.");
return -EINVAL;
}
}
int main(int argc, char *argv[]) {
- int r, exit_code = 0;
- DBusConnection *bus = NULL;
- DBusError error;
+ int r;
+ _cleanup_bus_unref_ sd_bus *bus = NULL;
+ _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
int fd = -1;
- dbus_error_init(&error);
-
log_parse_environment();
log_open();
r = parse_argv(argc, argv);
if (r <= 0)
- goto finish;
+ return EXIT_FAILURE;
- bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
- if (!bus) {
- log_error("Failed to connect to bus: %s", bus_error_message(&error));
- r = -EIO;
- goto finish;
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ log_error("Failed to connect to bus: %s", strerror(-r));
+ return EXIT_FAILURE;
}
if (arg_action == ACTION_LIST) {
r = print_inhibitors(bus, &error);
if (r < 0) {
- log_error("Failed to list inhibitors: %s", bus_error_message_or_strerror(&error, -r));
- goto finish;
+ log_error("Failed to list inhibitors: %s", bus_error_message(&error, -r));
+ return EXIT_FAILURE;
}
} else {
free(w);
if (fd < 0) {
- log_error("Failed to inhibit: %s", bus_error_message_or_strerror(&error, -r));
- r = fd;
- goto finish;
+ log_error("Failed to inhibit: %s", bus_error_message(&error, -r));
+ return EXIT_FAILURE;
}
pid = fork();
if (pid < 0) {
log_error("Failed to fork: %m");
- r = -errno;
- goto finish;
+ return EXIT_FAILURE;
}
if (pid == 0) {
/* Child */
- close_nointr_nofail(fd);
close_all_fds(NULL, 0);
execvp(argv[optind], argv + optind);
}
r = wait_for_terminate_and_warn(argv[optind], pid);
- if (r >= 0)
- exit_code = r;
- }
-
-finish:
- if (bus) {
- dbus_connection_close(bus);
- dbus_connection_unref(bus);
+ close(fd);
+ if (r < 0)
+ return EXIT_FAILURE;
+ else
+ return r;
}
- dbus_error_free(&error);
-
- if (fd >= 0)
- close_nointr_nofail(fd);
-
- return r < 0 ? EXIT_FAILURE : exit_code;
+ return 0;
}
~ianmdlvl / elogind.git / blobdiff