fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 18:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: add completion for "nmcli c edit"

Browse source
This commit is contained in:
Lubomir Rintel 2017-02-14 15:57:08 +01:00
parent 29bb6ae4fe
commit 8bd7bbba02
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
clients/cli/connections.c
View file

@ -7876,6 +7876,18 @@ editor_init_existing_connection (NMConnection *connection)
nmc_setting_connection_connect_handlers (s_con, connection); nmc_setting_connection_connect_handlers (s_con, connection);
} }
static void
nmc_complete_connection_type (const char *prefix, const NameItem *types)
{
while (types->name) {
if (!*prefix || matches (prefix, types->name) == 0)
g_print ("%s\n", types->name);
if (types->alias && (!*prefix || matches (prefix, types->alias) == 0))
g_print ("%s\n", types->alias);
types++;
}
}
static NMCResultCode static NMCResultCode
do_connection_edit (NmCli *nmc, int argc, char **argv) do_connection_edit (NmCli *nmc, int argc, char **argv)
{ {
@ -7903,9 +7915,8 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
{"path", TRUE, &con_path, FALSE}, {"path", TRUE, &con_path, FALSE},
{NULL} }; {NULL} };
/* TODO: complete uuid, path or id */ if (argc == 1 && nmc->complete)
if (nmc->complete) nmc_complete_strings (*argv, "type", "con-name", "id", "uuid", "path", NULL);
return nmc->return_value;
nmc->return_value = NMC_RESULT_SUCCESS; nmc->return_value = NMC_RESULT_SUCCESS;
@ -7952,7 +7963,10 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
/* Existing connection */ /* Existing connection */
NMConnection *found_con; NMConnection *found_con;
found_con = nmc_find_connection (connections, selector, con, NULL, FALSE); found_con = nmc_find_connection (connections, selector, con, NULL, nmc->complete);
if (nmc->complete)
goto error;
if (!found_con) { if (!found_con) {
g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), con); g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), con);
nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND;
@ -7984,6 +7998,12 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
editor_init_existing_connection (connection); editor_init_existing_connection (connection);
} else { } else {
/* New connection */ /* New connection */
if (nmc->complete) {
if (type && argc == 0)
nmc_complete_connection_type (type, nmc_valid_connection_types);
goto error;
}
connection_type = check_valid_name (type, nmc_valid_connection_types, NULL, &err1); connection_type = check_valid_name (type, nmc_valid_connection_types, NULL, &err1);
tmp_str = get_valid_options_string (nmc_valid_connection_types, NULL); tmp_str = get_valid_options_string (nmc_valid_connection_types, NULL);