summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
37a123a)
The search for an existing key e.g. FOO would match longer
keys e.g. FOOBAR. Reuse the correct code from name_list_remove().
{
struct name_entry *name_loop;
struct name_entry *name_new;
{
struct name_entry *name_loop;
struct name_entry *name_new;
+ size_t keylen = strlen(key);
list_for_each_entry(name_loop, name_list, node) {
list_for_each_entry(name_loop, name_list, node) {
- if (strncmp(name_loop->name, key, strlen(key)) == 0) {
- dbg(udev, "key already present '%s', replace it\n", name_loop->name);
- snprintf(name_loop->name, sizeof(name_loop->name), "%s=%s", key, value);
- name_loop->name[sizeof(name_loop->name)-1] = '\0';
- return name_loop;
- }
+ if (strncmp(name_loop->name, key, keylen) != 0)
+ continue;
+ if (name_loop->name[keylen] != '=')
+ continue;
+ dbg(udev, "key already present '%s', replace it\n", name_loop->name);
+ snprintf(name_loop->name, sizeof(name_loop->name), "%s=%s", key, value);
+ name_loop->name[sizeof(name_loop->name)-1] = '\0';
+ return name_loop;
}
name_new = malloc(sizeof(struct name_entry));
}
name_new = malloc(sizeof(struct name_entry));