diff options
Diffstat (limited to 'mailmap.c')
| -rw-r--r-- | mailmap.c | 41 |
1 files changed, 22 insertions, 19 deletions
@@ -69,9 +69,8 @@ static void add_mapping(struct string_list *map, index = -1 - index; } else { /* create mailmap entry */ - struct string_list_item *item = string_list_insert_at_index(index, old_email, map); - item->util = xmalloc(sizeof(struct mailmap_entry)); - memset(item->util, 0, sizeof(struct mailmap_entry)); + struct string_list_item *item = string_list_insert_at_index(map, index, old_email); + item->util = xcalloc(1, sizeof(struct mailmap_entry)); ((struct mailmap_entry *)item->util)->namemap.strdup_strings = 1; } me = (struct mailmap_entry *)map->items[index].util; @@ -79,20 +78,22 @@ static void add_mapping(struct string_list *map, if (old_name == NULL) { debug_mm("mailmap: adding (simple) entry for %s at index %d\n", old_email, index); /* Replace current name and new email for simple entry */ - free(me->name); - free(me->email); - if (new_name) + if (new_name) { + free(me->name); me->name = xstrdup(new_name); - if (new_email) + } + if (new_email) { + free(me->email); me->email = xstrdup(new_email); + } } else { - struct mailmap_info *mi = xmalloc(sizeof(struct mailmap_info)); + struct mailmap_info *mi = xcalloc(1, sizeof(struct mailmap_info)); debug_mm("mailmap: adding (complex) entry for %s at index %d\n", old_email, index); if (new_name) mi->name = xstrdup(new_name); if (new_email) mi->email = xstrdup(new_email); - string_list_insert(old_name, &me->namemap)->util = mi; + string_list_insert(&me->namemap, old_name)->util = mi; } debug_mm("mailmap: '%s' <%s> -> '%s' <%s>\n", @@ -189,38 +190,38 @@ void clear_mailmap(struct string_list *map) int map_user(struct string_list *map, char *email, int maxlen_email, char *name, int maxlen_name) { - char *p; + char *end_of_email; struct string_list_item *item; struct mailmap_entry *me; char buf[1024], *mailbuf; int i; /* figure out space requirement for email */ - p = strchr(email, '>'); - if (!p) { + end_of_email = strchr(email, '>'); + if (!end_of_email) { /* email passed in might not be wrapped in <>, but end with a \0 */ - p = memchr(email, '\0', maxlen_email); - if (!p) + end_of_email = memchr(email, '\0', maxlen_email); + if (!end_of_email) return 0; } - if (p - email + 1 < sizeof(buf)) + if (end_of_email - email + 1 < sizeof(buf)) mailbuf = buf; else - mailbuf = xmalloc(p - email + 1); + mailbuf = xmalloc(end_of_email - email + 1); /* downcase the email address */ - for (i = 0; i < p - email; i++) + for (i = 0; i < end_of_email - email; i++) mailbuf[i] = tolower(email[i]); mailbuf[i] = 0; debug_mm("map_user: map '%s' <%s>\n", name, mailbuf); - item = string_list_lookup(mailbuf, map); + item = string_list_lookup(map, mailbuf); if (item != NULL) { me = (struct mailmap_entry *)item->util; if (me->namemap.nr) { /* The item has multiple items, so we'll look up on name too */ /* If the name is not found, we choose the simple entry */ - struct string_list_item *subitem = string_list_lookup(name, &me->namemap); + struct string_list_item *subitem = string_list_lookup(&me->namemap, name); if (subitem) item = subitem; } @@ -235,6 +236,8 @@ int map_user(struct string_list *map, } if (maxlen_email && mi->email) strlcpy(email, mi->email, maxlen_email); + else + *end_of_email = '\0'; if (maxlen_name && mi->name) strlcpy(name, mi->name, maxlen_name); debug_mm("map_user: to '%s' <%s>\n", name, mi->email ? mi->email : ""); |