From b51f299ae17ebdedecf8f38d98cb94cfee763fa7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Nov 2013 21:37:32 +0100 Subject: busctl: when no match is specified, add default match --- src/libsystemd-bus/busctl.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/libsystemd-bus/busctl.c b/src/libsystemd-bus/busctl.c index b9b3305e93..4204adb5bc 100644 --- a/src/libsystemd-bus/busctl.c +++ b/src/libsystemd-bus/busctl.c @@ -129,6 +129,7 @@ static int list_bus_names(sd_bus *bus, char **argv) { } static int monitor(sd_bus *bus, char *argv[]) { + bool added_something = false; char **i; int r; @@ -149,6 +150,8 @@ static int monitor(sd_bus *bus, char *argv[]) { log_error("Failed to add match: %s", strerror(-r)); return r; } + + added_something = true; } STRV_FOREACH(i, arg_matches) { @@ -157,6 +160,16 @@ static int monitor(sd_bus *bus, char *argv[]) { log_error("Failed to add match: %s", strerror(-r)); return r; } + + added_something = true; + } + + if (!added_something) { + r = sd_bus_add_match(bus, "", NULL, NULL); + if (r < 0) { + log_error("Failed to add match: %s", strerror(-r)); + return r; + } } for (;;) { -- cgit v1.2.3-54-g00ecf