ident.c: read /etc/mailname with strbuf_getline()
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Oct 2015 20:24:41 +0000 (13:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Jan 2016 18:34:41 +0000 (10:34 -0800)
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>
ident.c
diff --git a/ident.c b/ident.c
index 9dd3ae34525563fef5d6c6f0e40b2bc593080063..3da555634290f1812702e2d6da15e5a6806fe635 100644 (file)
--- 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));