From c561fa34d2d97efdff579b3031237f7bd8a79b20 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 7 Jul 2016 14:56:22 +0200 Subject: [PATCH] cli/connections: add completion to export subcommand --- clients/cli/connections.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 9be47aa328..ceb68e2ed2 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -8525,12 +8525,13 @@ do_connection_export (NmCli *nmc, int argc, char **argv) char ***argv_ptr = &argv; int *argc_ptr = &argc; - /* Not (yet?) supported */ - if (nmc->complete) - return nmc->return_value; - if (argc == 0 && nmc->ask) { - char *line = nmc_readline ("%s: ", PROMPT_VPN_CONNECTION); + char *line; + + /* nmc_do_cmd() should not call this with argc=0. */ + g_assert (!nmc->complete); + + line = nmc_readline ("%s: ", PROMPT_VPN_CONNECTION); nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num); g_free (line); argv_ptr = &arg_arr; @@ -8544,6 +8545,9 @@ do_connection_export (NmCli *nmc, int argc, char **argv) goto finish; } + if (nmc->complete) + return nmc->return_value; + if (next_arg (&argc, &argv) == 0) out_name = *argv; else if (nmc->ask)