From: Junio C Hamano Date: Thu, 14 Jan 2016 23:58:28 GMT Subject: [PATCH v4 13/21] ident.c: read /etc/mailname with strbuf_getline() Message-ID: <1452815916-6447-14-git-send-email-gitster@pobox.com> In-Reply-To: <1452815916-6447-1-git-send-email-gitster@pobox.com> 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 --- ident.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)); -- 2.7.0-250-ge1b5ba3