X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fread-file.c;h=1045b494ccb28c4158304124c0e52099c7319e68;hb=cb9819cbb9261bd50c3466cf0a4cd873f0d7ebd7;hp=ac53dd4c9073a3a0b9120ea9853075cef786b5dd;hpb=08c03e591ea25f38405e5e06f1565e01feabb591;p=gnulib.git

diff --git a/lib/read-file.c b/lib/read-file.c
index ac53dd4c9..1045b494c 100644
--- a/lib/read-file.c
+++ b/lib/read-file.c
@@ -16,9 +16,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "read-file.h"
 
@@ -36,16 +34,15 @@
 char *
 fread_file (FILE * stream, size_t * length)
 {
-  char *buf = malloc (1);
-  size_t alloc = 1;
+  char *buf = NULL;
+  size_t alloc = 0;
   size_t size = 0;
+  int save_errno;
 
-  if (!buf)
-    return NULL;
-
-  while (!feof (stream))
+  for (;;)
     {
       size_t count;
+      size_t requested;
 
       if (size + BUFSIZ + 1 > alloc)
 	{
@@ -58,32 +55,31 @@ fread_file (FILE * stream, size_t * length)
 	  new_buf = realloc (buf, alloc);
 	  if (!new_buf)
 	    {
-	      int save_errno = errno;
-	      free (buf);
-	      errno = save_errno;
-	      return NULL;
+	      save_errno = errno;
+	      break;
 	    }
 
 	  buf = new_buf;
 	}
 
-      count = fread (buf + size, 1, alloc - size - 1, stream);
+      requested = alloc - size - 1;
+      count = fread (buf + size, 1, requested, stream);
       size += count;
 
-      if (ferror (stream))
+      if (count != requested)
 	{
-	  int save_errno = errno;
-	  free (buf);
-	  errno = save_errno;
-	  return NULL;
+	  save_errno = errno;
+	  if (ferror (stream))
+	    break;
+	  buf[size] = '\0';
+	  *length = size;
+	  return buf;
 	}
     }
 
-  buf[size] = '\0';
-
-  *length = size;
-
-  return buf;
+  free (buf);
+  errno = save_errno;
+  return NULL;
 }
 
 static char *
@@ -92,7 +88,6 @@ internal_read_file (const char *filename, size_t * length, const char *mode)
   FILE *stream = fopen (filename, mode);
   char *out;
   int save_errno;
-  int rc;
 
   if (!stream)
     return NULL;