X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmachine%2Fmachinectl.c;h=7bb7086056a051e6d2dadce399753bd77111133d;hb=4f8f66cb4236783cd3cbee97fefc9aaa8469ac08;hp=f60c66055dd7258e5d823302f30e90d920cb4147;hpb=46e65dcc3a522b5e992e165b5e61d14254026859;p=elogind.git diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index f60c66055..7bb708605 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -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); @@ -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); @@ -407,7 +399,6 @@ static int terminate_machine(sd_bus *bus, char **args, unsigned n) { 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 }; union { struct cmsghdr cmsghdr; @@ -419,20 +410,17 @@ static int openpt_in_namespace(pid_t pid, int flags) { }; struct cmsghdr *cmsg; int master = -1, r; + char *ns, *root; pid_t child; siginfo_t si; - r = asprintf(&ns, "/proc/%lu/ns/mnt", (unsigned long) pid); - if (r < 0) - return -ENOMEM; + ns = procfs_file_alloca(pid, "ns/mnt"); nsfd = open(ns, O_RDONLY|O_NOCTTY|O_CLOEXEC); if (nsfd < 0) return -errno; - r = asprintf(&root, "/proc/%lu/root", (unsigned long) pid); - if (r < 0) - return -ENOMEM; + root = procfs_file_alloca(pid, "root"); rootfd = open(root, O_RDONLY|O_NOCTTY|O_CLOEXEC|O_DIRECTORY); if (rootfd < 0) @@ -547,10 +535,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, @@ -567,10 +553,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) { @@ -617,6 +601,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); @@ -653,11 +639,11 @@ static int help(void) { " -s --signal=SIGNAL Which signal to send\n\n" "Commands:\n" " list List running VMs and containers\n" - " status [NAME...] Show VM/container status\n" - " show [NAME...] Show properties of one or more VMs/containers\n" - " terminate [NAME...] Terminate one or more VMs/containers\n" - " kill [NAME...] Send signal to processes of a VM/container\n" - " login [NAME] Get a login prompt on a container\n", + " status NAME... Show VM/container status\n" + " show NAME... Show properties of one or more VMs/containers\n" + " terminate NAME... Terminate one or more VMs/containers\n" + " kill NAME... Send signal to processes of a VM/container\n" + " login NAME Get a login prompt on a container\n", program_invocation_short_name); return 0;