From d2350a1e8027e9550996464739885f5ec468bd83 Mon Sep 17 00:00:00 2001
From: Stephane Chazelas <stephane.chazelas@gmail.com>
Date: Sun, 18 Mar 2018 16:49:42 -0700
Subject: 42469: necessary repairs to 42465 found by "make check"

---
 Src/Modules/mapfile.c | 3 +--
 Src/exec.c            | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'Src')

diff --git a/Src/Modules/mapfile.c b/Src/Modules/mapfile.c
index 771e5b5fc..7a903418f 100644
--- a/Src/Modules/mapfile.c
+++ b/Src/Modules/mapfile.c
@@ -197,9 +197,8 @@ get_contents(char *fname)
     val = NULL;
     if ((fd = open(fname, O_RDONLY | O_NOCTTY)) >= 0) {
 	LinkList ll;
-	int readerror;
 
-	if ((ll = readoutput(fd, 1, &readerror)))
+	if ((ll = readoutput(fd, 1, 0)))
 	    val = peekfirst(ll);
     }
 #endif /* USE_MMAP */
diff --git a/Src/exec.c b/Src/exec.c
index ce8cf8c55..35b0bb191 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -4599,8 +4599,8 @@ readoutput(int in, int qt, int *readerror)
 	}
 	*ptr++ = c;
     }
-    if (readerror && ferror(fin))
-	*readerror = errno;
+    if (readerror)
+	*readerror = ferror(fin) ? errno : 0;
     fclose(fin);
     while (cnt && ptr[-1] == '\n')
 	ptr--, cnt--;
-- 
cgit 1.4.1