inhibit: print --list if no argument is given

[elogind.git] / src / login / inhibit.c

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 62a8223e6381a84a8c455fe227b473798a8c823e..a812195cae5820bac43160313474d1c518d783f3 100644 (file)
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -43,9 +43,9 @@ static enum {
 
 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",
@@ -58,26 +58,26 @@ static int inhibit(DBusConnection *bus, DBusError *error) {
                         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",
@@ -86,10 +86,8 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                         &reply,
                         NULL,
                         DBUS_TYPE_INVALID);
-        if (r) {
-                r = -ENOMEM;
+        if (r < 0)
                 goto finish;
-        }
 
         if (!dbus_message_iter_init(reply, &iter)) {
                 r = -ENOMEM;
@@ -100,20 +98,10 @@ 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",
-               "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) {
@@ -133,21 +121,21 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                         goto finish;
                 }
 
-                ewho = ellipsize(who, 20, 66);
-                ewhy = ellipsize(why, 20, 66);
-
-                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, PID %lu)\n"
+                       "    What: %s\n"
+                       "     Why: %s\n"
+                       "    Mode: %s\n\n",
+                       who, (unsigned long) uid, (unsigned long) pid,
+                       what,
+                       why,
+                       mode);
 
                 dbus_message_iter_next(&sub);
 
                 n++;
         }
 
-        printf("\n%u inhibitors listed.\n", n);
+        printf("%u inhibitors listed.\n", n);
         r = 0;
 
 finish:
@@ -163,8 +151,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"
@@ -211,7 +201,6 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
                         puts(SYSTEMD_FEATURES);
                         return 0;
 
@@ -241,7 +230,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;
         }
@@ -306,6 +298,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);