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

nmcli: fix ambiguous properties check for autocompletion

Browse source 
Re-enable the check on ambiguos properties but this time manage perfect
matches (i.e., the full property name has been typed) that are prefix
of other properties.

Test case:
nmcli --complete-args connection add type wifi wifi.

Here "wifi" is a property alias that is also prefix of the property
alias "wifi-sec".
This commit is contained in:
Francesco Giudici 2016-06-23 17:17:10 +02:00
parent ea9dcd08fa
commit aed19ff12a
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
clients/cli/connections.c
View file

@ -3009,13 +3009,14 @@ get_valid_properties_string (const NameItem *array,
const char *prop_name = NULL;
GString *str;
int i, j;
gboolean full_match = FALSE;
g_return_val_if_fail (prefix, NULL);
str = g_string_sized_new (1024);
for (i = 0; i < 2; i++, iter = array_slv) {
while (iter && iter->name) {
while (!full_match && iter && iter->name) {
if ( !(g_str_has_prefix (iter->name, prefix))
&& (!(iter->alias) || !g_str_has_prefix (iter->alias, prefix))) {
iter++;
@ -3024,8 +3025,16 @@ get_valid_properties_string (const NameItem *array,
/* If postix (so prefix is terminated by a dot), check
* that prefix is not ambiguous */
if (postfix) {
if (prop_name)
return g_string_free (str, FALSE);
/* If we have a perfect match, no need to look for others
* prefix and no check on ambiguity should be performed.
* Moreover, erase previous matches from output string */
if ( nm_streq (prefix, iter->name)
|| nm_streq0 (prefix, iter->alias)) {
g_string_erase (str, 0, -1);
full_match = TRUE;
} else if (prop_name) {
return g_string_free (str, TRUE);
}
prop_name = prefix;
} else {
prop_name = iter->name;