summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-07-07 14:56:22 +0200
committerLubomir Rintel <lkundrak@v3.sk>2016-08-01 13:52:36 +0200
commitc561fa34d2d97efdff579b3031237f7bd8a79b20 (patch)
tree63f83c4b83d7dff209909a81020377e4af33f686
parent075e705bc712988e8343569a9a9f8e8d0e55fe0f (diff)
downloadNetworkManager-c561fa34d2d97efdff579b3031237f7bd8a79b20.tar.gz
cli/connections: add completion to export subcommand
-rw-r--r--clients/cli/connections.c14
1 files 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)