user/sven/git.git/mailmap.c, branch v2.7.0-rc2

mailmap: replace strcpy with xstrdup

2015-09-25T17:18:18Z

We want to make a copy of a string without any leading whitespace. To do so, we allocate a buffer large enough to hold the original, skip past the whitespace, then copy that. It's much simpler to just allocate after we've skipped, in which case we can just copy the remainder of the string, leaving no question of whether "len" is large enough. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

mailmap: use higher level string list functions

2014-12-04T23:10:21Z

No functional changes intended. This commit makes use of higher level and better documented functions of the string list API, so the code is more understandable. Note that also the required computational amount should not change in principal as we need to look up the item no matter if it is already part of the list or not. Once looked up, insertion comes for free. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'jc/strcasecmp-pure-inline'

2013-09-25T06:28:13Z

* jc/strcasecmp-pure-inline: mailmap: work around implementations with pure inline strcasecmp

mailmap: work around implementations with pure inline strcasecmp

2013-09-12T19:05:48Z

On some systems (e.g. MinGW 4.0), string.h has only inline definition of strcasecmp and no non-inline implementation is supplied anywhere, which is, eh, "unusual". We cannot take an address of such a function to store it in namemap.cmp. Work it around by introducing our own level of indirection. Signed-off-by: Junio C Hamano

Merge branch 'sb/mailmap-freeing-NULL-is-ok'

2013-09-11T22:00:43Z

* sb/mailmap-freeing-NULL-is-ok: mailmap: remove redundant check for freeing memory

Merge branch 'jk/mailmap-incomplete-line'

2013-09-09T21:50:41Z

* jk/mailmap-incomplete-line: mailmap: handle mailmap blobs without trailing newlines

mailmap: handle mailmap blobs without trailing newlines

2013-08-28T19:33:32Z

The read_mailmap_buf function reads each line of the mailmap using strchrnul, like: const char *end = strchrnul(buf, '\n'); unsigned long linelen = end - buf + 1; But that's off-by-one when we actually hit the NUL byte; our line does not have a terminator, and so is only "end - buf" bytes long. As a result, when we subtract the linelen from the total len, we end up with (unsigned long)-1 bytes left in the buffer, and we start reading random junk from memory. We could fix it with: unsigned long linelen = end - buf + !!*end; but let's take a step back for a moment. It's questionable in the first place for a function that takes a buffer and length to be using strchrnul. But it works because we only have one caller (and are only likely to ever have this one), which is handing us data from read_sha1_file. Which means that it's always NUL-terminated. Instead of tightening the assumptions to make the buffer/length pair work for a caller that doesn't actually exist, let's let loosen the assumptions to what the real caller has: a modifiable, NUL-terminated string. This makes the code simpler and shorter (because we don't have to correlate strchrnul with the length calculation), correct (because the code with the off-by-one just goes away), and more efficient (we can drop the extra allocation we needed to create NUL-terminated strings for each line, and just terminate in place). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

mailmap: remove redundant check for freeing memory

2013-08-20T17:10:37Z

The condition as it is written in that line has already been checked in the beginning of the function, which was introduced in 8503ee4 (2007-05-01, Fix read_mailmap to handle a caller uninterested in repo abbreviation) Helped-by: Jeff King Helped-by: Thomas Rast Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

mailmap: style fixes

2013-07-15T15:23:39Z

Wrap overlong lines and format the multi-line comments to match our coding style. Signed-off-by: Junio C Hamano Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specification

2013-07-15T15:20:32Z

POSIX does not state the behavior of '%s' conversion when passed a NULL pointer. Some implementations interpolate literal "(null)"; others may crash. Callers of debug_mm() often pass NULL as indication of either a missing name or email address. Instead, let's always supply a proper string pointer, and make it a bit more descriptive: "(none)" Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano