X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fread-file.c;h=ed751715bf9e7626c8ea4f9af17e86937e935693;hb=e0bf16819c83c3ef1d11bf373f5f90a1f09c534c;hp=4e2ebd560aead0ee5c8a5f0e9603b5efc9b5be43;hpb=7a8df33d7bb42eaff21c657ba88a79c5a293b0e5;p=gnulib.git

diff --git a/lib/read-file.c b/lib/read-file.c
index 4e2ebd560..ed751715b 100644
--- a/lib/read-file.c
+++ b/lib/read-file.c
@@ -1,5 +1,5 @@
 /* read-file.c -- read file contents into a string
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
    Written by Simon Josefsson and Bruno Haible.
 
    This program is free software; you can redistribute it and/or modify
@@ -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"
 
@@ -47,36 +45,36 @@ fread_file (FILE * stream, size_t * length)
       size_t requested;
 
       if (size + BUFSIZ + 1 > alloc)
-	{
-	  char *new_buf;
+        {
+          char *new_buf;
 
-	  alloc += alloc / 2;
-	  if (alloc < size + BUFSIZ + 1)
-	    alloc = size + BUFSIZ + 1;
+          alloc += alloc / 2;
+          if (alloc < size + BUFSIZ + 1)
+            alloc = size + BUFSIZ + 1;
 
-	  new_buf = realloc (buf, alloc);
-	  if (!new_buf)
-	    {
-	      save_errno = errno;
-	      break;
-	    }
+          new_buf = realloc (buf, alloc);
+          if (!new_buf)
+            {
+              save_errno = errno;
+              break;
+            }
 
-	  buf = new_buf;
-	}
+          buf = new_buf;
+        }
 
       requested = alloc - size - 1;
       count = fread (buf + size, 1, requested, stream);
       size += count;
 
       if (count != requested)
-	{
-	  save_errno = errno;
-	  if (ferror (stream))
-	    break;
-	  buf[size] = '\0';
-	  *length = size;
-	  return buf;
-	}
+        {
+          save_errno = errno;
+          if (ferror (stream))
+            break;
+          buf[size] = '\0';
+          *length = size;
+          return buf;
+        }
     }
 
   free (buf);
@@ -101,10 +99,10 @@ internal_read_file (const char *filename, size_t * length, const char *mode)
   if (fclose (stream) != 0)
     {
       if (out)
-	{
-	  save_errno = errno;
-	  free (out);
-	}
+        {
+          save_errno = errno;
+          free (out);
+        }
       errno = save_errno;
       return NULL;
     }