diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-10-28 13:24:41 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-01-14 15:10:53 -0800 |
commit | 2eb2c31d24cdbda40a7920df031bfaccb690e4f6 (patch) | |
tree | 26c4cf6e45415be0391867083b72ad2e043ca976 | |
parent | a2be71b18ff17db01e5d2a4d737cfe3d0f09c185 (diff) | |
download | git-2eb2c31d24cdbda40a7920df031bfaccb690e4f6.tar.gz |
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>
-rw-r--r-- | ident.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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)); |