[PATCHv2 06/15] ident: trim trailing newline from /etc/mailname
- From
Jeff King <peff@peff.net>
- Date
- May 21, 2012, 23:10 UTC
- Message-ID
- <20120521231002.GF10981@sigill.intra.peff.net>
- In-Reply-To
- <20120521230917.GA474@sigill.intra.peff.net>
We use fgets to read the /etc/mailname file, which means we will typically end up with an extra newline in our git_default_email. Most of the time this doesn't matter, as fmt_ident will skip it as cruft, but there is one code path that accesses it directly (in http-push.c:lock_remote).
Signed-off-by: Jeff King <peff@peff.net> --- ident.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/ident.c b/ident.c index af92b2c..acb3a08 100644 --- a/ident.c +++ b/ident.c @@ -74,6 +74,10 @@ static int add_mailname_host(char *buf, size_t len) } /* success! */ fclose(mailname); + + len = strlen(buf); + if (len && buf[len-1] == '\n') + buf[len-1] = '\0'; return 0; }
-- 1.7.10.1.19.g711d603