From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 26 May 2020 05:56:13 +0000 (+0200)
Subject: read-file: make use of fopen-gnu
X-Git-Tag: v1.0~4066
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83355a6ade56506bebb01ddf415b9ddbc4439eac;p=thirdparty%2Fgnulib.git

read-file: make use of fopen-gnu

* lib/read-file.c (read_file): Pass an 'e' flag to fopen.
(read_binary_file): Likewise.
* modules/read-file (Depends-on): Add fopen-gnu.
---

diff --git a/ChangeLog b/ChangeLog
index b1acb99ca4..07d4d51249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-05-26  Daiki Ueno  <ueno@gnu.org>
+
+	read-file: make use of fopen-gnu
+	* lib/read-file.c (read_file): Pass an 'e' flag to fopen.
+	(read_binary_file): Likewise.
+	* modules/read-file (Depends-on): Add fopen-gnu.
+
 2020-05-25  Paul Eggert  <eggert@cs.ucla.edu>
 
 	getentropy, getrandom: new modules
diff --git a/lib/read-file.c b/lib/read-file.c
index c6f230178c..293bc3e8a5 100644
--- a/lib/read-file.c
+++ b/lib/read-file.c
@@ -171,7 +171,7 @@ internal_read_file (const char *filename, size_t *length, const char *mode)
 char *
 read_file (const char *filename, size_t *length)
 {
-  return internal_read_file (filename, length, "r");
+  return internal_read_file (filename, length, "re");
 }
 
 /* Open (on non-POSIX systems, in binary mode) and read the contents
@@ -184,5 +184,5 @@ read_file (const char *filename, size_t *length)
 char *
 read_binary_file (const char *filename, size_t *length)
 {
-  return internal_read_file (filename, length, "rb");
+  return internal_read_file (filename, length, "rbe");
 }
diff --git a/modules/read-file b/modules/read-file
index 506e88f0ab..a6e7faf0a8 100644
--- a/modules/read-file
+++ b/modules/read-file
@@ -7,6 +7,7 @@ lib/read-file.c
 m4/read-file.m4
 
 Depends-on:
+fopen-gnu
 fstat
 ftello
 malloc-posix