Tweak previous change (only assume malformed_archive if errno == 0).

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fbc543251e089497cea457f8985d7ecc05667fda..7788700d3171a74b58861015f48fe2e2b6ebeea2 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,7 +1,8 @@
 Mon Oct  5 14:32:55 1992  Per Bothner  (bothner@cygnus.com)
 
-       * archive.c (_bfd_write_archive_contents):  If read fails,
-       set bfd_error to malformed_archive (since this probably
+       * archive.c:  Make errno global.
+       * archive.c (_bfd_write_archive_contents):  If read fails (and
+       errno!=0) set bfd_error to malformed_archive (since this probably
        indicates a truncated archive), rather than system_call_error.
 
 Mon Oct  5 03:33:39 1992  Mark Eichin  (eichin at tweedledumber.cygnus.com)

diff --git a/bfd/archive.c b/bfd/archive.c
index 3fa9362d7fbb43270d3cf8659a796033e20a4832..747745aa6ab090684451af2cec309fe5631b46c3 100644 (file)
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -98,6 +98,11 @@ DESCRIPTION
 #include "libbfd.h"
 #include "aout/ar.h"
 #include "aout/ranlib.h"
+#include <errno.h>
+
+#ifndef errno
+extern int errno;
+#endif
 
 #ifdef GNU960
 #define BFD_GNU960_ARMAG(abfd) (BFD_COFF_FILE_P((abfd)) ? ARMAG : ARMAGB)
@@ -265,9 +270,6 @@ get_extended_arelt_filename (arch, name)
      bfd *arch;
      char *name;
 {
-#ifndef errno
-  extern int errno;
-#endif
   unsigned long index = 0;
 
   /* Should extract string so that I can guarantee not to overflow into
@@ -1217,7 +1219,9 @@ _bfd_write_archive_contents (arch)
          if (amt > remaining) {
            amt = remaining;
          }
+         errno = 0;
          if (bfd_read (buffer, amt, 1, current) != amt) {
+             if (errno) goto syserr;
              /* Looks like a truncated archive. */
              bfd_error = malformed_archive;
              return false;