[PATCH 4/8] client: Complete only one service or technology where appropriate

[Patrik Flykt]

Create helper functions for completing only one service or technology
and use them with enable, disable, services, scan, connect and
disconnect commands.
---
 client/commands.c | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/client/commands.c b/client/commands.c
index 23b6de8..4cc8336 100644
--- a/client/commands.c
+++ b/client/commands.c
@@ -1796,6 +1796,16 @@ static char *lookup_service(const char *text, int state)
        return NULL;
 }
 
+static char *lookup_service_arg(const char *text, int state)
+{
+       if (__connmanctl_input_calc_level() > 1) {
+               __connmanctl_input_lookup_end();
+               return NULL;
+       }
+
+       return lookup_service(text, state);
+}
+
 static char *lookup_technology(const char *text, int state)
 {
        static int len = 0;
@@ -1816,12 +1826,27 @@ static char *lookup_technology(const char *text, int 
state)
        return NULL;
 }
 
+static char *lookup_technology_arg(const char *text, int state)
+{
+       if (__connmanctl_input_calc_level() > 1) {
+               __connmanctl_input_lookup_end();
+               return NULL;
+       }
+
+       return lookup_technology(text, state);
+}
+
 static char *lookup_technology_offline(const char *text, int state)
 {
        static int len = 0;
        static bool end = false;
        char *str;
 
+       if (__connmanctl_input_calc_level() > 1) {
+               __connmanctl_input_lookup_end();
+               return NULL;
+       }
+
        if (state == 0) {
                len = strlen(text);
                end = false;
@@ -1900,15 +1925,16 @@ static const struct {
                    "            wifi [on|off] <ssid> <passphrase> ",
                                          NULL,            cmd_tether,
          "Enable, disable tethering, set SSID and passphrase for wifi",
-         lookup_technology },
+         NULL },
        { "services",     "[<service>]",  service_options, cmd_services,
-         "Display services", lookup_service },
+         "Display services", lookup_service_arg },
        { "scan",         "<technology>", NULL,            cmd_scan,
-         "Scans for new services for given technology", lookup_technology },
+         "Scans for new services for given technology",
+         lookup_technology_arg },
        { "connect",      "<service>",    NULL,            cmd_connect,
-         "Connect a given service", lookup_service },
+         "Connect a given service", lookup_service_arg },
        { "disconnect",   "<service>",    NULL,            cmd_disconnect,
-         "Disconnect a given service", lookup_service },
+         "Disconnect a given service", lookup_service_arg },
        { "config",       "<service>",    config_options,  cmd_config,
          "Set service configuration options", lookup_service },
        { "monitor",      "[off]",        monitor_options, cmd_monitor,
-- 
1.8.5.2

_______________________________________________
connman mailing list
connman@connman.net
https://lists.connman.net/mailman/listinfo/connman