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

ifcfg-rh: handle multiple definitions of the same key

Browse source 
When

  - reading a key that is defined multiple times, accept
    the last occurrence.
  - when deleting such a key, delete all occurrences.
  - when overwriting such a key, overwrite the last occurrence
    and delete any previous definitions.
This commit is contained in:
Thomas Haller 2016-10-31 16:22:54 +01:00
parent 9719988674
commit f3c7d009b5
1 changed files with 48 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/settings/plugins/ifcfg-rh/shvar.c
View file

@ -369,6 +369,27 @@ shlist_delete (GList **head, GList *current)
*head = g_list_delete_link (*head, current);
}
static gboolean
shlist_delete_all (GList **head, const char *key, gboolean including_last)
{
GList *current, *last;
gboolean changed = FALSE;
last = (GList *) shlist_find (*head, key, NULL);
if (last) {
while ((current = (GList *) shlist_find (last->next, key, NULL))) {
shlist_delete (head, last);
changed = TRUE;
last = current;
}
if (including_last) {
shlist_delete (head, last);
changed = TRUE;
}
}
return changed;
}
static char *
line_construct (const char *key, const char *value)
{
@ -389,16 +410,24 @@ line_construct (const char *key, const char *value)
char *
svGetValue (shvarFile *s, const char *key)
{
const GList *current;
const char *line_val;
const char *last_val = NULL;
char *to_free;
g_return_val_if_fail (s != NULL, NULL);
g_return_val_if_fail (key != NULL, NULL);
if (!shlist_find (s->lineList, key, &line_val))
current = s->lineList;
while ((current = shlist_find (current, key, &line_val))) {
last_val = line_val;
current = current->next;
}
if (!last_val)
return NULL;
line_val = svUnescape (line_val, &to_free);
line_val = svUnescape (last_val, &to_free);
return to_free ?: g_strdup (line_val);
}
@ -477,8 +506,9 @@ void
svSetValue (shvarFile *s, const char *key, const char *value)
{
gs_free char *oldval_free = NULL;
const char *oldval;
GList *current;
const char *oldval, *oldval_tmp;
GList *current, *last;
gboolean has_multiple = FALSE;
g_return_if_fail (s != NULL);
g_return_if_fail (key != NULL);
@ -486,10 +516,8 @@ svSetValue (shvarFile *s, const char *key, const char *value)
nm_assert (_shell_is_name (key));
if (!value) {
if ((current = (GList *) shlist_find (s->lineList, key, NULL))) {
if (shlist_delete_all (&s->lineList, key, TRUE))
s->modified = TRUE;
shlist_delete (&s->lineList, current);
}
return;
}
@ -502,12 +530,25 @@ svSetValue (shvarFile *s, const char *key, const char *value)
return;
}
last = current;
while ((current = (GList *) shlist_find (current->next, key, &oldval_tmp))) {
last = current;
oldval = oldval_tmp;
has_multiple = TRUE;
}
current = last;
oldval = svUnescape (oldval, &oldval_free);
if (!nm_streq (oldval, value)) {
g_free (current->data);
current->data = line_construct (key, value);
s->modified = TRUE;
}
if (has_multiple) {
if (shlist_delete_all (&s->lineList, key, FALSE))
s->modified = TRUE;
}
}
/* Set the variable <key> equal to the value <value>.