read-file: Don't occupy too much unused memory.

diff --git a/ChangeLog b/ChangeLog
index 8a3233903596ab03d576669877de152abfd7c050..d4eaed748acac3a4dd84bf01340e8857409e2002 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-28  Bruno Haible  <bruno@clisp.org>
+
+       read-file: Don't occupy too much unused memory.
+       * lib/read-file.c (fread_file): Shrink the buffer at the end.
+
 2010-08-28  Giuseppe Scrivano  <gscrivano@gnu.org>
             Eric Blake  <eblake@redhat.com>
             Bruno Haible  <bruno@clisp.org>

diff --git a/lib/read-file.c b/lib/read-file.c
index 27241b450483bffb08ae9e69eaaf37903b439e49..0a15c5a4574fc2ca8039880689c5f3fa42d92ebd 100644 (file)
--- a/lib/read-file.c
+++ b/lib/read-file.c
@@ -119,6 +119,15 @@ fread_file (FILE * stream, size_t * length)
             save_errno = errno;
             if (ferror (stream))
               break;
+
+            /* Shrink the allocated memory if possible.  */
+            if (size + 1 < alloc)
+              {
+                char *smaller_buf = realloc (buf, size + 1);
+                if (smaller_buf != NULL)
+                  buf = smaller_buf;
+              }
+
             buf[size] = '\0';
             *length = size;
             return buf;