X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Finhibit.c;h=1f78e4b883d565179a354da6ffe19196e6fd403e;hp=029c9549d2ecafb73f7036402afe3610e8c5b384;hb=01c94c5d0aff09b4c0e429d483c8eeba40017071;hpb=b9c26b413497a0014ac2058a0ec04849a83df1ea diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 029c9549d..1f78e4b88 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -20,157 +20,125 @@ ***/ #include -#include #include #include -#include #include +#include -#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" +#include "formats-util.h" static const char* arg_what = "idle:sleep:shutdown"; static const char* arg_who = NULL; static const char* arg_why = "Unknown reason"; -static const char* arg_mode = "block"; +static const char* arg_mode = NULL; static enum { ACTION_INHIBIT, 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; - fd = 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); - if (fd) - return fd; - - if (!dbus_message_get_args(reply, error, - DBUS_TYPE_UNIX_FD, &fd, - DBUS_TYPE_INVALID)) - fd = -EIO; - - dbus_message_unref(reply); - - return fd; + "ssss", arg_what, arg_who, arg_why, arg_mode); + if (r < 0) + return r; + + r = sd_bus_message_read_basic(reply, SD_BUS_TYPE_UNIX_FD, &fd); + if (r < 0) + return r; + + r = fcntl(fd, F_DUPFD_CLOEXEC, 3); + if (r < 0) + return -errno; + + return r; } -static int print_inhibitors(DBusConnection *bus, DBusError *error) { - DBusMessage *reply; +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) - return -ENOMEM; - 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; - } - dbus_message_iter_recurse(&iter, &sub); - - printf("%-21s %-20s %-20s %-5s %6s %6s\n", - "WHAT", - "WHO", - "WHY", - "MODE", - "UID", - "PID"); + ""); + if (r < 0) + return r; + r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssuu)"); + if (r < 0) + return bus_log_parse_error(r); - 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; + while ((r = sd_bus_message_read(reply, "(ssssuu)", &what, &who, &why, &mode, &uid, &pid)) > 0) { + _cleanup_free_ char *comm = NULL, *u = NULL; - if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) { - r = -EIO; - goto finish; - } - - dbus_message_iter_recurse(&sub, &sub2); - - 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; - } - - ewho = ellipsize(who, 20, 66); - ewhy = ellipsize(why, 20, 66); + if (arg_mode && !streq(mode, arg_mode)) + continue; - printf("%-21s %-20s %-20s %-5s %6lu %6lu\n", - what, ewho ? ewho : who, ewhy ? ewhy : why, mode, (unsigned long) uid, (unsigned long) pid); + get_process_comm(pid, &comm); + u = uid_to_name(uid); - free(ewho); - free(ewhy); - - dbus_message_iter_next(&sub); + printf(" Who: %s (UID "UID_FMT"/%s, PID "PID_FMT"/%s)\n" + " What: %s\n" + " Why: %s\n" + " Mode: %s\n\n", + who, uid, strna(u), pid, strna(comm), + what, + why, + mode); n++; } + if (r < 0) + return bus_log_parse_error(r); - 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 bus_log_parse_error(r); - return r; + printf("%u inhibitors listed.\n", n); + return 0; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] {COMMAND} ...\n\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-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" - " --list List active inhibitors\n", - program_invocation_short_name); - - return 0; + " --list List active inhibitors\n" + , program_invocation_short_name); } static int parse_argv(int argc, char *argv[]) { @@ -192,7 +160,7 @@ static int parse_argv(int argc, char *argv[]) { { "why", required_argument, NULL, ARG_WHY }, { "mode", required_argument, NULL, ARG_MODE }, { "list", no_argument, NULL, ARG_LIST }, - { NULL, 0, NULL, 0 } + {} }; int c; @@ -200,7 +168,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "+h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "+h", options, NULL)) >= 0) switch (c) { @@ -210,7 +178,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; @@ -234,13 +201,17 @@ static int parse_argv(int argc, char *argv[]) { arg_action = ACTION_LIST; break; - default: - log_error("Unknown option code %c", c); + case '?': return -EINVAL; + + default: + assert_not_reached("Unhandled option"); } - } - if (arg_action == ACTION_INHIBIT && optind >= argc) { + if (arg_action == ACTION_INHIBIT && optind == argc) + arg_action = ACTION_LIST; + + else if (arg_action == ACTION_INHIBIT && optind >= argc) { log_error("Missing command line to execute."); return -EINVAL; } @@ -249,82 +220,69 @@ static int parse_argv(int argc, char *argv[]) { } int main(int argc, char *argv[]) { - int r, exit_code = 0; - DBusConnection *bus = NULL; - DBusError error; - int fd = -1; - - dbus_error_init(&error); + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; + int r; log_parse_environment(); log_open(); r = parse_argv(argc, argv); - if (r <= 0) - goto finish; - - 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; + if (r < 0) + return EXIT_FAILURE; + if (r == 0) + return EXIT_SUCCESS; + + r = sd_bus_default_system(&bus); + if (r < 0) { + log_error_errno(r, "Failed to connect to bus: %m"); + 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 { - char *w = NULL; + _cleanup_close_ int fd = -1; + _cleanup_free_ char *w = NULL; pid_t pid; if (!arg_who) arg_who = w = strv_join(argv + optind, " "); - fd = inhibit(bus, &error); - free(w); + if (!arg_mode) + arg_mode = "block"; + fd = inhibit(bus, &error); 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, fd)); + return EXIT_FAILURE; } pid = fork(); if (pid < 0) { - log_error("Failed to fork: %m"); - r = -errno; - goto finish; + log_error_errno(errno, "Failed to fork: %m"); + return EXIT_FAILURE; } if (pid == 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]); + log_error_errno(errno, "Failed to execute %s: %m", argv[optind]); _exit(EXIT_FAILURE); } - r = wait_for_terminate_and_warn(argv[optind], pid); - if (r >= 0) - exit_code = r; + r = wait_for_terminate_and_warn(argv[optind], pid, true); + return r < 0 ? EXIT_FAILURE : r; } -finish: - if (bus) { - dbus_connection_close(bus); - dbus_connection_unref(bus); - } - - dbus_error_free(&error); - - if (fd >= 0) - close_nointr_nofail(fd); - - return r < 0 ? EXIT_FAILURE : exit_code; + return 0; }