Account for trailing bytes read from bfd_bread

	* cache.c (cache_bread_1): Don't return -1 when fread returns
	a positive value.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8c922aa7a878c11d7de479a3eadcc94e782a4cf8..96f85f7013ca1073d9d8e5c4e13b14545097dcba 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-15  Alan Modra  <amodra@gmail.com>
+
+       * cache.c (cache_bread_1): Don't return -1 when fread returns
+       a positive value.
+
 2014-07-15  Alan Modra  <amodra@gmail.com>
 
        * elflink.c (elf_merge_st_other): Update comments.  Simplify

diff --git a/bfd/cache.c b/bfd/cache.c
index 27fe70a84c6de6ed89d6d7b930f08b085e6b10a1..ffda00452de84694f2f9ba6a64cf1e2e398a3eeb 100644 (file)
--- a/bfd/cache.c
+++ b/bfd/cache.c
@@ -310,7 +310,7 @@ cache_bread_1 (struct bfd *abfd, void *buf, file_ptr nbytes)
   if (nread == (file_ptr)-1)
     {
       bfd_set_error (bfd_error_system_call);
-      return -1;
+      return nread;
     }
 #else
   nread = fread (buf, 1, nbytes, f);
@@ -320,7 +320,7 @@ cache_bread_1 (struct bfd *abfd, void *buf, file_ptr nbytes)
   if (nread < nbytes && ferror (f))
     {
       bfd_set_error (bfd_error_system_call);
-      return -1;
+      return nread;
     }
 #endif
   if (nread < nbytes)