From: Nguyễn Thái Ngọc Duy Date: Wed, 03 May 2017 10:16:52 GMT Subject: [PATCH v2 07/21] ident.c: use fopen_or_warn() Message-ID: <20170503101706.9223-8-pclouds@gmail.com> In-Reply-To: <20170503101706.9223-1-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- ident.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ident.c b/ident.c index bea871c8e0..91c7609055 100644 --- a/ident.c +++ b/ident.c @@ -72,12 +72,10 @@ static int add_mailname_host(struct strbuf *buf) FILE *mailname; struct strbuf mailnamebuf = STRBUF_INIT; - mailname = fopen("/etc/mailname", "r"); - if (!mailname) { - if (errno != ENOENT) - warning_errno("cannot open /etc/mailname"); + mailname = fopen_or_warn("/etc/mailname", "r"); + if (!mailname) return -1; - } + if (strbuf_getline(&mailnamebuf, mailname) == EOF) { if (ferror(mailname)) warning_errno("cannot read /etc/mailname"); -- 2.11.0.157.gd943d85