shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-05 09:17:44 +03:00
Code

Merge pull request #21138 from bluca/show_extensions

Browse Source 
systemctl: pretty-print ExtensionImages property
This commit is contained in:
Yu Watanabe 2021-10-28 03:56:04 +09:00 committed by GitHub
commit 99987084f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 64 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/systemctl/systemctl-show.c
View File

@ -1617,11 +1617,13 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m
r = sd_bus_message_enter_container(m, 'r', "ssba(ss)"); r = sd_bus_message_enter_container(m, 'r', "ssba(ss)");
if (r < 0) if (r < 0)
return r; return bus_log_parse_error(r);
if (r == 0)
break;
r = sd_bus_message_read(m, "ssb", &source, &destination, &ignore_enoent); r = sd_bus_message_read(m, "ssb", &source, &destination, &ignore_enoent);
if (r <= 0) if (r < 0)
break; return bus_log_parse_error(r);
str = strjoin(ignore_enoent ? "-" : "", str = strjoin(ignore_enoent ? "-" : "",
source, source,
@ -1632,28 +1634,82 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m
r = sd_bus_message_enter_container(m, 'a', "(ss)"); r = sd_bus_message_enter_container(m, 'a', "(ss)");
if (r < 0) if (r < 0)
return r; return bus_log_parse_error(r);
while ((r = sd_bus_message_read(m, "(ss)", &partition, &mount_options)) > 0) while ((r = sd_bus_message_read(m, "(ss)", &partition, &mount_options)) > 0)
if (!strextend_with_separator(&str, ":", partition, ":", mount_options)) if (!strextend_with_separator(&str, ":", partition, mount_options))
return log_oom(); return log_oom();
if (r < 0) if (r < 0)
return r; return bus_log_parse_error(r);
if (!strextend_with_separator(&paths, " ", str)) if (!strextend_with_separator(&paths, " ", str))
return log_oom(); return log_oom();
r = sd_bus_message_exit_container(m); r = sd_bus_message_exit_container(m);
if (r < 0) if (r < 0)
return r; return bus_log_parse_error(r);
r = sd_bus_message_exit_container(m); r = sd_bus_message_exit_container(m);
if (r < 0) if (r < 0)
return r; return bus_log_parse_error(r);
} }
r = sd_bus_message_exit_container(m);
if (r < 0) if (r < 0)
return bus_log_parse_error(r); return bus_log_parse_error(r);
bus_print_property_value(name, expected_value, flags, paths);
return 1;
} else if (streq(name, "ExtensionImages")) {
_cleanup_free_ char *paths = NULL;
r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, "(sba(ss))");
if (r < 0)
return bus_log_parse_error(r);
for (;;) {
_cleanup_free_ char *str = NULL;
const char *source, *partition, *mount_options;
int ignore_enoent;
r = sd_bus_message_enter_container(m, 'r', "sba(ss)");
if (r < 0)
return bus_log_parse_error(r);
if (r == 0)
break;
r = sd_bus_message_read(m, "sb", &source, &ignore_enoent);
if (r < 0)
return bus_log_parse_error(r);
str = strjoin(ignore_enoent ? "-" : "", source);
if (!str)
return log_oom();
r = sd_bus_message_enter_container(m, 'a', "(ss)");
if (r < 0)
return bus_log_parse_error(r);
while ((r = sd_bus_message_read(m, "(ss)", &partition, &mount_options)) > 0)
if (!strextend_with_separator(&str, ":", partition, mount_options))
return log_oom();
if (r < 0)
return bus_log_parse_error(r);
if (!strextend_with_separator(&paths, " ", str))
return log_oom();
r = sd_bus_message_exit_container(m);
if (r < 0)
return bus_log_parse_error(r);
r = sd_bus_message_exit_container(m);
if (r < 0)
return bus_log_parse_error(r);
}
r = sd_bus_message_exit_container(m); r = sd_bus_message_exit_container(m);
if (r < 0) if (r < 0)
return bus_log_parse_error(r); return bus_log_parse_error(r);