git/daemon.c, branch v2.1.4

Merge branch 'rs/daemon-fixes' into maint

2014-10-29T17:35:09Z

* rs/daemon-fixes: daemon: remove write-only variable maxfd daemon: fix error message after bind() daemon: handle gethostbyname() error

daemon: remove write-only variable maxfd

2014-10-01T20:34:56Z

It became unused when 6573faff (NO_IPV6 support for git daemon) replaced select() with poll(). Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

daemon: fix error message after bind()

2014-10-01T20:34:54Z

Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

daemon: handle gethostbyname() error

2014-10-01T20:34:53Z

If the user-supplied hostname can't be found then we should not use it. We already avoid doing that in the non-NO_IPV6 case by checking if the return value of getaddrinfo() is zero (success). Do the same in the NO_IPV6 case and make sure the return value of gethostbyname() isn't NULL before dereferencing this pointer. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'cc/replace-edit'

2014-07-16T18:25:47Z

Teach "git replace" an "--edit" mode. * cc/replace-edit: replace: use argv_array in export_object avoid double close of descriptors handed to run_command replace: replace spaces with tabs in indentation

avoid double close of descriptors handed to run_command

2014-06-25T22:27:24Z

When a file descriptor is given to run_command via the "in", "out", or "err" parameters, run_command takes ownership. The descriptor will be closed in the parent process whether the process is spawned successfully or not, and closing it again is wrong. In practice this has not caused problems, because we usually close() right after start_command returns, meaning no other code has opened a descriptor in the meantime. So we just get EBADF and ignore it (rather than accidentally closing somebody else's descriptor!). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

daemon: use skip_prefix to avoid magic numbers

2014-06-20T17:45:18Z

Like earlier cases, we can use skip_prefix to avoid magic numbers that must match the length of starts_with prefixes. However, the numbers are a little more complicated here, as we keep parsing past the prefix. We can solve it by keeping a running pointer as we parse; its final value is the location we want. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

use skip_prefix to avoid magic numbers

2014-06-20T17:44:45Z

It's a common idiom to match a prefix and then skip past it with a magic number, like: if (starts_with(foo, "bar")) foo += 3; This is easy to get wrong, since you have to count the prefix string yourself, and there's no compiler check if the string changes. We can use skip_prefix to avoid the magic numbers here. Note that some of these conversions could be much shorter. For example: if (starts_with(arg, "--foo=")) { bar = arg + 6; continue; } could become: if (skip_prefix(arg, "--foo=", &bar)) continue; However, I have left it as: if (skip_prefix(arg, "--foo=", &v)) { bar = v; continue; } to visually match nearby cases which need to actually process the string. Like: if (skip_prefix(arg, "--foo=", &v)) { bar = atoi(v); continue; } Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

daemon: mark some strings as const

2014-06-18T21:56:24Z

None of these strings is modified; marking them as const will help later refactoring. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jk/daemon-tolower'

2014-06-16T17:07:15Z

* jk/daemon-tolower: daemon/config: factor out duplicate xstrdup_tolower