X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Finhibit.c;h=28ce553b3e6c65c5f69ff3a805b00cb0e94930b6;hp=a817c84b3605b7e1d3a3379a0bbf03692a700310;hb=8e7fd6ade44ce5dde0867ba748c7978ed1206865;hpb=eecd1362f7f4de432483b5d77c56726c3621a83a

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index a817c84b3..28ce553b3 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -31,7 +31,7 @@
 #include "build.h"
 #include "strv.h"
 
-static const char* arg_what = "idle:suspend:shutdown";
+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";
@@ -42,73 +42,52 @@ static enum {
 } arg_action = ACTION_INHIBIT;
 
 static int inhibit(DBusConnection *bus, DBusError *error) {
-        DBusMessage *m = NULL, *reply = NULL;
-        int fd;
-
-        assert(bus);
+        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;
-        }
-
-finish:
-        if (m)
-                dbus_message_unref(m);
+                                   DBUS_TYPE_UNIX_FD, &r,
+                                   DBUS_TYPE_INVALID))
+                r = -EIO;
 
-        if (reply)
-                dbus_message_unref(reply);
+        dbus_message_unref(reply);
 
-        return fd;
+        return r;
 }
 
 static int print_inhibitors(DBusConnection *bus, DBusError *error) {
-        DBusMessage *m, *reply;
+        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)
-                return -ENOMEM;
-
-        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error);
-        if (!reply) {
-                r = -EIO;
+                        "ListInhibitors",
+                        &reply,
+                        NULL,
+                        DBUS_TYPE_INVALID);
+        if (r < 0)
                 goto finish;
-        }
 
         if (!dbus_message_iter_init(reply, &iter)) {
                 r = -ENOMEM;
@@ -119,7 +98,6 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                 r = -EIO;
                 goto finish;
         }
-        dbus_message_iter_recurse(&iter, &sub);
 
         printf("%-21s %-20s %-20s %-5s %6s %6s\n",
                "WHAT",
@@ -129,7 +107,7 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                "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;
@@ -170,9 +148,6 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
         r = 0;
 
 finish:
-        if (m)
-                dbus_message_unref(m);
-
         if (reply)
                 dbus_message_unref(reply);
 
@@ -182,11 +157,12 @@ finish:
 static int help(void) {
 
         printf("%s [OPTIONS...] {COMMAND} ...\n\n"
-               "Execute a process while inhibiting shutdown/suspend/idle.\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"
-               "                          suspend, 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"
@@ -328,6 +304,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);