undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ident.c: read /etc/mailname with strbuf_getline()

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2015-10-28 13:24:41 -07:00
parent 72e37b6ac8
commit 1f3b1efd18
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ident.c
View File

@ -76,7 +76,7 @@ static int add_mailname_host(struct strbuf *buf)
strerror(errno)); strerror(errno));
return -1; return -1;
} }
if (strbuf_getline_lf(&mailnamebuf, mailname) == EOF) { if (strbuf_getline(&mailnamebuf, mailname) == EOF) {
if (ferror(mailname)) if (ferror(mailname))
warning("cannot read /etc/mailname: %s", warning("cannot read /etc/mailname: %s",
strerror(errno)); strerror(errno));