X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Finhibit.c;h=29e50c1447c920803d4937f625f8f247e204fedc;hp=6f24a1b67176e2fb07e4aee1a5365b7c43baf4ee;hb=1ca208fb4f93e5869704af1812cbff7130a2fc03;hpb=4943c1c94ba751c98763f4232b4350481b22c90a diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 6f24a1b67..29e50c144 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -42,103 +42,65 @@ static enum { } arg_action = ACTION_INHIBIT; static int inhibit(DBusConnection *bus, DBusError *error) { - DBusMessage *m = NULL, *reply = NULL; - int fd; - - assert(bus); + _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; + int r; - m = dbus_message_new_method_call( + r = bus_method_call_with_reply( + bus, "org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", - "Inhibit"); - if (!m) - return -ENOMEM; - - if (!dbus_message_append_args(m, - DBUS_TYPE_STRING, &arg_what, - DBUS_TYPE_STRING, &arg_who, - DBUS_TYPE_STRING, &arg_why, - DBUS_TYPE_STRING, &arg_mode, - DBUS_TYPE_INVALID)) { - fd = -ENOMEM; - goto finish; - } - - reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error); - if (!reply) { - fd = -EIO; - goto finish; - } + "Inhibit", + &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 (r < 0) + return r; if (!dbus_message_get_args(reply, error, - DBUS_TYPE_UNIX_FD, &fd, - DBUS_TYPE_INVALID)){ - fd = -EIO; - goto finish; - } + DBUS_TYPE_UNIX_FD, &r, + DBUS_TYPE_INVALID)) + return -EIO; -finish: - if (m) - dbus_message_unref(m); - - if (reply) - dbus_message_unref(reply); - - return fd; + return r; } static int print_inhibitors(DBusConnection *bus, DBusError *error) { - DBusMessage *m, *reply; + _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; unsigned n = 0; DBusMessageIter iter, sub, sub2; int r; - assert(bus); - - m = dbus_message_new_method_call( + r = bus_method_call_with_reply( + bus, "org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", - "ListInhibitors"); - if (!m) + "ListInhibitors", + &reply, + NULL, + DBUS_TYPE_INVALID); + if (r < 0) + return r; + + if (!dbus_message_iter_init(reply, &iter)) return -ENOMEM; - reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error); - if (!reply) { - r = -EIO; - goto finish; - } - - if (!dbus_message_iter_init(reply, &iter)) { - r = -ENOMEM; - goto finish; - } + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) + return -EIO; - 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"); - - while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { const char *what, *who, *why, *mode; - char *ewho, *ewhy; + _cleanup_free_ char *comm = NULL, *u = NULL; dbus_uint32_t uid, pid; - if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) { - r = -EIO; - goto finish; - } + if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) + return -EIO; dbus_message_iter_recurse(&sub, &sub2); @@ -147,36 +109,28 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) { 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; - } + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &pid, false) < 0) + return -EIO; - ewho = ellipsize(who, 20, 66); - ewhy = ellipsize(why, 20, 66); + get_process_comm(pid, &comm); + u = uid_to_name(uid); - 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); + 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); dbus_message_iter_next(&sub); n++; } - printf("\n%u inhibitors listed.\n", n); - r = 0; - -finish: - if (m) - dbus_message_unref(m); - - if (reply) - dbus_message_unref(reply); - - return r; + printf("%u inhibitors listed.\n", n); + return 0; } static int help(void) { @@ -185,8 +139,10 @@ 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" - " --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" @@ -233,7 +189,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; @@ -263,7 +218,10 @@ static int parse_argv(int argc, char *argv[]) { } } - 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; } @@ -275,7 +233,7 @@ int main(int argc, char *argv[]) { int r, exit_code = 0; DBusConnection *bus = NULL; DBusError error; - int fd = -1; + _cleanup_close_ int fd = -1; dbus_error_init(&error); @@ -297,7 +255,7 @@ int main(int argc, char *argv[]) { r = print_inhibitors(bus, &error); if (r < 0) { - log_error("Failed to list inhibitors: %s", bus_error_message_or_strerror(&error, -r)); + log_error("Failed to list inhibitors: %s", bus_error(&error, r)); goto finish; } @@ -312,7 +270,7 @@ int main(int argc, char *argv[]) { free(w); if (fd < 0) { - log_error("Failed to inhibit: %s", bus_error_message_or_strerror(&error, -r)); + log_error("Failed to inhibit: %s", bus_error(&error, r)); r = fd; goto finish; } @@ -328,6 +286,8 @@ int main(int argc, char *argv[]) { /* 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); @@ -346,8 +306,5 @@ finish: dbus_error_free(&error); - if (fd >= 0) - close_nointr_nofail(fd); - return r < 0 ? EXIT_FAILURE : exit_code; }