SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus: fix bus_print_property with strv

Browse Source
This commit is contained in:
Marc-Antoine Perennou
2013-11-07 18:55:21 +01:00
committed by Lennart Poettering
parent 405cd3aa0b
commit 261afec5ae
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-bus/bus-util.c
+12 -17
View File
@@ -545,33 +545,28 @@ int bus_print_property(const char *name, sd_bus_message *property, bool all) {
case SD_BUS_TYPE_ARRAY:
if (streq(contents, "s")) {
bool space = false;
char tp;
const char *cnt;
bool first = true;
const char *str;
r = sd_bus_message_enter_container(property, SD_BUS_TYPE_ARRAY, contents);
if (r < 0)
return r;
r = sd_bus_message_peek_type(property, &tp, &cnt);
while((r = sd_bus_message_read_basic(property, SD_BUS_TYPE_STRING, &str)) > 0) {
if (first)
printf("%s=", name);
printf("%s%s", first ? "" : " ", str);
first = false;
}
if (r < 0)
return r;
if (all || cnt) {
const char *str;
if (first && all)
printf("%s=", name);
while((r = sd_bus_message_read_basic(property, SD_BUS_TYPE_STRING, &str)) >= 0) {
printf("%s%s", space ? " " : "", str);
space = true;
}
if (r < 0)
return r;
if (!first || all)
puts("");
}
r = sd_bus_message_exit_container(property);
if (r < 0)