From 062fc7852a7e58f3cbcd09b4963076f8b2d75673 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 26 Oct 2021 07:48:33 -0500 Subject: [PATCH] client: Only print daemon info in interactive mode --- client/daemon.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/client/daemon.c b/client/daemon.c index 3f773db4..509f8137 100644 --- a/client/daemon.c +++ b/client/daemon.c @@ -30,6 +30,7 @@ #include "client/dbus-proxy.h" #include "client/display.h" +#include "client/command.h" #include "client/daemon.h" static bool netconfig_enabled; @@ -62,12 +63,23 @@ static void get_info_callback(struct l_dbus_message *message, void *user_data) } while (l_dbus_message_iter_next_entry(&iter, &key, &variant)) { - if (!strcmp(key, "NetworkConfigurationEnabled") && - l_dbus_message_iter_get_variant(&variant, "b", - &netconfig_enabled)) - display("%s: %s\n", key, + if (strcmp(key, "NetworkConfigurationEnabled")) + continue; + + l_dbus_message_iter_get_variant(&variant, "b", + &netconfig_enabled); + break; + } + + if (!command_is_interactive_mode()) + return; + + l_dbus_message_get_arguments(message, "a{sv}", &iter); + display("NetworkConfigurationEnabled: %s\n", netconfig_enabled ? "enabled" : "disabled"); - else if (!strcmp(key, "Version") || + + while (l_dbus_message_iter_next_entry(&iter, &key, &variant)) { + if (!strcmp(key, "Version") || !strcmp(key, "StateDirectory")) { const char *sval;