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 b1acb99ca4288003ac06a3ce6ebc1cf20c87dc03..07d4d5124984fb3067dfd5ee977b43e5cb541d13 100644 (file)
--- 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 c6f230178cfc9777338c4319c1d6db0637cf8bc4..293bc3e8a57f0644800817fcc3a155e6c8e6f0be 100644 (file)
--- 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 506e88f0aba43fdf61a6b8aa88560d0ac7e84997..a6e7faf0a87a1590898c8b457cd3b85119462614 100644 (file)
--- 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