summaryrefslogtreecommitdiff
path: root/ident.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-28 20:24:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-15 18:34:41 (GMT)
commit1f3b1efd18a935fed41431132c67cde5a94833ae (patch)
treec058d5bc621720997f357e4bedf9a0673ea18d0f /ident.c
parent72e37b6ac851c3926956c9d11a40260f08bf1c5e (diff)
downloadgit-1f3b1efd18a935fed41431132c67cde5a94833ae.zip
git-1f3b1efd18a935fed41431132c67cde5a94833ae.tar.gz
git-1f3b1efd18a935fed41431132c67cde5a94833ae.tar.bz2
ident.c: read /etc/mailname with strbuf_getline()
Just in case /etc/mailname file was edited with a DOS editor, read it with strbuf_getline() so that a stray CR is not included as the last character of the mail hostname. We _might_ want to more aggressively discard whitespace characters around the line with strbuf_trim(), but that is a bit outside the scope of this series. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ident.c')
-rw-r--r--ident.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ident.c b/ident.c
index 9dd3ae3..3da5556 100644
--- a/ident.c
+++ b/ident.c
@@ -76,7 +76,7 @@ static int add_mailname_host(struct strbuf *buf)
strerror(errno));
return -1;
}
- if (strbuf_getline_lf(&mailnamebuf, mailname) == EOF) {
+ if (strbuf_getline(&mailnamebuf, mailname) == EOF) {
if (ferror(mailname))
warning("cannot read /etc/mailname: %s",
strerror(errno));