bus: introduce concept of a "default" event loop per-thread and make use of it everywhere

[elogind.git] / src / machine / machinectl.c

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index ee802b1e8bd2993774cbe75fbabdc50937845e43..a1890aa855a82a389a37ca6c4f14d9e20828ab60 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -19,13 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <sys/socket.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <getopt.h>
 #include <pwd.h>
 #include <locale.h>
-#include <socket.h>
 #include <fcntl.h>
 
 #include "sd-bus.h"
@@ -84,12 +84,11 @@ static int list_machines(sd_bus *bus, char **args, unsigned n) {
                 return r;
         }
 
-        if (on_tty())
-                printf("%-32s %-9s %-16s\n", "MACHINE", "CONTAINER", "SERVICE");
+        printf("%-32s %-9s %-16s\n", "MACHINE", "CONTAINER", "SERVICE");
 
         r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssso)");
         if (r < 0)
-                goto fail;
+                return bus_log_parse_error(r);
 
         while ((r = sd_bus_message_read(reply, "(ssso)", &name, &class, &service, &object)) > 0) {
                 printf("%-32s %-9s %-16s\n", name, class, service);
@@ -97,20 +96,15 @@ static int list_machines(sd_bus *bus, char **args, unsigned n) {
                 k++;
         }
         if (r < 0)
-                goto fail;
+                return bus_log_parse_error(r);
 
         r = sd_bus_message_exit_container(reply);
         if (r < 0)
-                goto fail;
+                return bus_log_parse_error(r);
 
-        if (on_tty())
-                printf("\n%u machines listed.\n", k);
+        printf("\n%u machines listed.\n", k);
 
         return 0;
-
-fail:
-        log_error("Failed to parse reply: %s", strerror(-r));
-        return r;
 }
 
 static int show_scope_cgroup(sd_bus *bus, const char *unit, pid_t leader) {
@@ -146,10 +140,8 @@ static int show_scope_cgroup(sd_bus *bus, const char *unit, pid_t leader) {
         }
 
         r = sd_bus_message_read(reply, "s", &cgroup);
-        if (r < 0) {
-                log_error("Failed to parse reply: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return bus_log_parse_error(r);
 
         if (isempty(cgroup))
                 return 0;
@@ -234,7 +226,7 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) {
 }
 
 static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_line) {
-        MachineStatusInfo info = {};
+
         static const struct bus_properties_map map[]  = {
                 { "Name",          "s",  NULL,          offsetof(MachineStatusInfo, name) },
                 { "Class",         "s",  NULL,          offsetof(MachineStatusInfo, class) },
@@ -246,6 +238,8 @@ static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_
                 { "Id",            "ay", bus_map_id128, offsetof(MachineStatusInfo, id) },
                 {}
         };
+
+        MachineStatusInfo info = {};
         int r;
 
         assert(path);
@@ -284,7 +278,7 @@ static int show_properties(sd_bus *bus, const char *path, bool *new_line) {
 
         *new_line = true;
 
-        r = bus_print_all_properties(bus, path, arg_property, arg_all);
+        r = bus_print_all_properties(bus, "org.freedesktop.machine1", path, arg_property, arg_all);
         if (r < 0)
                 log_error("Could not get properties: %s", strerror(-r));
 
@@ -334,10 +328,8 @@ static int show(sd_bus *bus, char **args, unsigned n) {
                 }
 
                 r = sd_bus_message_read(reply, "o", &path);
-                if (r < 0) {
-                        log_error("Failed to parse reply: %s", strerror(-r));
-                        break;
-                }
+                if (r < 0)
+                        return bus_log_parse_error(r);
 
                 if (properties)
                         r = show_properties(bus, path, &new_line);
@@ -409,11 +401,14 @@ static int openpt_in_namespace(pid_t pid, int flags) {
         _cleanup_close_ int nsfd = -1, rootfd = -1;
         _cleanup_free_ char *ns = NULL, *root = NULL;
         _cleanup_close_pipe_ int sock[2] = { -1, -1 };
-        struct msghdr mh;
         union {
                 struct cmsghdr cmsghdr;
                 uint8_t buf[CMSG_SPACE(sizeof(int))];
-        } control;
+        } control = {};
+        struct msghdr mh = {
+                .msg_control = &control,
+                .msg_controllen = sizeof(control),
+        };
         struct cmsghdr *cmsg;
         int master = -1, r;
         pid_t child;
@@ -438,11 +433,6 @@ static int openpt_in_namespace(pid_t pid, int flags) {
         if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sock) < 0)
                 return -errno;
 
-        zero(control);
-        zero(mh);
-        mh.msg_control = &control;
-        mh.msg_controllen = sizeof(control);
-
         child = fork();
         if (child < 0)
                 return -errno;
@@ -549,10 +539,8 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) {
         }
 
         r = sd_bus_message_read(reply, "o", &path);
-        if (r < 0) {
-                log_error("Failed to parse reply: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return bus_log_parse_error(r);
 
         r = sd_bus_get_property(
                         bus,
@@ -569,10 +557,8 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) {
         }
 
         r = sd_bus_message_read(reply2, "u", &leader);
-        if (r < 0) {
-                log_error("Failed to parse reply: %s", strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return bus_log_parse_error(r);
 
         master = openpt_in_namespace(leader, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY);
         if (master < 0) {
@@ -619,6 +605,8 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) {
                 return r;
         }
 
+        container_bus = sd_bus_unref(container_bus);
+
         assert_se(sigemptyset(&mask) == 0);
         sigset_add_many(&mask, SIGWINCH, SIGTERM, SIGINT, -1);
         assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
@@ -686,7 +674,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "host",            required_argument, NULL, 'H'                 },
                 { "machine",         required_argument, NULL, 'M'                 },
                 { "no-ask-password", no_argument,       NULL, ARG_NO_ASK_PASSWORD },
-                { NULL,              0,                 NULL, 0                   }
+                {}
         };
 
         int c, r;
@@ -699,8 +687,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 case 'h':
-                        help();
-                        return 0;
+                        return help();
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
@@ -760,8 +747,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return -EINVAL;
 
                 default:
-                        log_error("Unknown option code %c", c);
-                        return -EINVAL;
+                        assert_not_reached("Unhandled option");
                 }
         }
 
@@ -797,7 +783,7 @@ static int machinectl_main(sd_bus *bus, int argc, char *argv[]) {
         left = argc - optind;
 
         if (left <= 0)
-                /* Special rule: no arguments means "list-sessions" */
+                /* Special rule: no arguments means "list" */
                 i = 0;
         else {
                 if (streq(argv[optind], "help")) {