picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libudev: list - properly sort linked list not only the index

Browse source 
<mgorny> it seems that udev-git is b0rked while tag '173' works fine for me
<mgorny> the rule in question is:
<mgorny> also, with >173 persistent-net rules seem to get constantly recreated
         for same devices
<kay> mgorny: logic bug. we only sort the keys in an index, but we don't care
      about the index when reading the list, which doesn't work too well for
      the rules file list where we depend on the order
This commit is contained in:
Kay Sievers 2011-08-28 22:41:46 +02:00
parent 1484205c47
commit c99b72121f
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libudev/libudev-list.c
View file

@ -180,7 +180,6 @@ struct udev_list_entry *udev_list_entry_add(struct udev_list *list, const char *
return NULL;
}
}
udev_list_entry_append(entry, list);
if (list->unique) {
/* allocate or enlarge sorted array if needed */
@ -199,12 +198,22 @@ struct udev_list_entry *udev_list_entry_add(struct udev_list *list, const char *
list->entries_max += add;
}
/* insert into sorted array */
/* the negative i returned the insertion index */
i = (-i)-1;
/* insert into sorted list */
if ((unsigned int)i < list->entries_cur)
udev_list_entry_insert_before(entry, list->entries[i]);
else
udev_list_entry_append(entry, list);
/* insert into sorted array */
memmove(&list->entries[i+1], &list->entries[i],
(list->entries_cur - i) * sizeof(struct udev_list_entry *));
list->entries[i] = entry;
list->entries_cur++;
} else {
udev_list_entry_append(entry, list);
}
dbg(list->udev, "'%s=%s' added\n", entry->name, entry->value);