diff options
| author | Per Bothner <per@bothner.com> | 1992-10-05 22:03:13 +0000 |
|---|---|---|
| committer | Per Bothner <per@bothner.com> | 1992-10-05 22:03:13 +0000 |
| commit | 446c5af7c2ef1137b6026b5a6fdccdf13f7b9088 (patch) | |
| tree | dac4af79b14e2f51f4ee70ebe14265303fa0d9e8 | |
| parent | 286fd2f9e5b403feac83499586ef66c69d9a3073 (diff) | |
| download | gdb-446c5af7c2ef1137b6026b5a6fdccdf13f7b9088.zip gdb-446c5af7c2ef1137b6026b5a6fdccdf13f7b9088.tar.gz gdb-446c5af7c2ef1137b6026b5a6fdccdf13f7b9088.tar.bz2 | |
Tweak previous change (only assume malformed_archive if errno == 0).
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/archive.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index fbc5432..7788700 100644 --- 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 3fa9362..747745a 100644 --- 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; |