2002-01-29 Chris Demetriou <cgd@broadcom.com>

[deliverable/binutils-gdb.git] / bfd / rs6000-core.c

diff --git a/bfd/rs6000-core.c b/bfd/rs6000-core.c
index 08b17ee947bf48d1c6d0adf6f4bdcea2e29d7aa8..19ff4a4a77f1cf5638da4e59ebbfc29ed24ac112 100644 (file)
--- a/bfd/rs6000-core.c
+++ b/bfd/rs6000-core.c
@@ -1,6 +1,6 @@
 /* IBM RS/6000 "XCOFF" back-end for BFD.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-   2001
+   2001, 2002
    Free Software Foundation, Inc.
    FIXME: Can someone provide a transliteration of this name into ASCII?
    Using the following chars caused a compiler warning on HIUX (so I replaced
@@ -258,24 +258,28 @@ read_hdr (bfd *abfd, CoreHdr *core)
 {
   bfd_size_type size;
 
-  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     return false;
 
   /* Read the leading portion that old and new core dump structures have in
      common.  */
-  if (bfd_read (core, CORE_COMMONSZ, 1, abfd) != CORE_COMMONSZ)
+  size = CORE_COMMONSZ;
+  if (bfd_bread (core, size, abfd) != size)
     return false;
 
   /* Read the trailing portion of the structure.  */
-  size = CORE_NEW (*core) ? sizeof (core->new) : sizeof (core->old)
-    - CORE_COMMONSZ;
-  return bfd_read ((char *) core + CORE_COMMONSZ, size, 1, abfd) == size;
+  if (CORE_NEW (*core))
+    size = sizeof (core->new);
+  else
+    size = sizeof (core->old);
+  size -= CORE_COMMONSZ;
+  return bfd_bread ((char *) core + CORE_COMMONSZ, size, abfd) == size;
 }
 
 static asection *
 make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
      bfd *abfd;
-     CONST char *name;
+     const char *name;
      flagword flags;
      bfd_size_type _raw_size;
      bfd_vma vma;
@@ -424,7 +428,7 @@ rs6000coff_core_p (abfd)
 
   /* Allocate core file header.  */
   size = CORE_NEW (core) ? sizeof (core.new) : sizeof (core.old);
-  tmpptr = (char *) bfd_zalloc (abfd, size);
+  tmpptr = (char *) bfd_zalloc (abfd, (bfd_size_type) size);
   if (!tmpptr)
     return NULL;
 
@@ -458,13 +462,13 @@ rs6000coff_core_p (abfd)
   if (!make_bfd_asection (abfd, ".stack",
                          SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                          c_size, c_stackend - c_size, c_stack))
-    return NULL;
+    goto fail;
 
   /* .reg section for all registers.  */
   if (!make_bfd_asection (abfd, ".reg",
                          SEC_HAS_CONTENTS,
                          c_regsize, (bfd_vma) 0, c_regoff))
-    return NULL;
+    goto fail;
 
   /* .ldinfo section.
      To actually find out how long this section is in this particular
@@ -473,7 +477,7 @@ rs6000coff_core_p (abfd)
   if (!make_bfd_asection (abfd, ".ldinfo",
                          SEC_HAS_CONTENTS,
                          c_lsize, (bfd_vma) 0, c_loader))
-    return NULL;
+    goto fail;
 
 #ifndef CORE_VERSION_1
   /* .data section if present.
@@ -490,7 +494,7 @@ rs6000coff_core_p (abfd)
                              (bfd_vma)
                                CDATA_ADDR (core.old.c_u.u_dsize),
                              c_stack + c_size))
-       return NULL;
+       goto fail;
     }
 #endif
 
@@ -532,7 +536,7 @@ rs6000coff_core_p (abfd)
                                c_datasize,
                                (bfd_vma) CDATA_ADDR (c_datasize),
                                c_data))
-         return NULL;
+         goto fail;
       }
 
     /* .data sections from loaded objects.  */
@@ -544,9 +548,9 @@ rs6000coff_core_p (abfd)
     while (1)
       {
        if (bfd_seek (abfd, c_loader, SEEK_SET) != 0)
-         return NULL;
-       if (bfd_read (&ldinfo, size, 1, abfd) != size)
-         return NULL;
+         goto fail;
+       if (bfd_bread (&ldinfo, size, abfd) != size)
+         goto fail;
 
        if (proc64)
          {
@@ -567,7 +571,7 @@ rs6000coff_core_p (abfd)
          if (!make_bfd_asection (abfd, ".data",
                                  SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                                  ldi_datasize, ldi_dataorg, ldi_core))
-           return NULL;
+           goto fail;
 
        if (ldi_next == 0)
          break;
@@ -580,7 +584,7 @@ rs6000coff_core_p (abfd)
        bfd_size_type i;
 
        if (bfd_seek (abfd, c_vmm, SEEK_SET) != 0)
-         return NULL;
+         goto fail;
 
        for (i = 0; i < c_vmregions; i++)
          {
@@ -590,8 +594,8 @@ rs6000coff_core_p (abfd)
            bfd_vma vminfo_addr;
 
            size = CORE_NEW (core) ? sizeof (vminfo.new) : sizeof (vminfo.old);
-           if (bfd_read (&vminfo, size, 1, abfd) != size)
-             return NULL;
+           if (bfd_bread (&vminfo, size, abfd) != size)
+             goto fail;
 
            if (CORE_NEW (core))
              {
@@ -611,13 +615,19 @@ rs6000coff_core_p (abfd)
                                      SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
                                      vminfo_size, vminfo_addr,
                                      vminfo_offset))
-               return NULL;
+               goto fail;
          }
       }
   }
 #endif
 
   return abfd->xvec;           /* This is garbage for now.  */
+
+ fail:
+  bfd_release (abfd, abfd->tdata.any);
+  abfd->tdata.any = NULL;
+  bfd_section_list_clear (abfd);
+  return NULL;
 }
 
 /* Return `true' if given core is from the given executable.  */
@@ -652,14 +662,14 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
     return false;
 
   alloc = 100;
-  path = bfd_malloc (alloc);
+  path = bfd_malloc ((bfd_size_type) alloc);
   if (path == NULL)
     return false;
   s = path;
 
   while (1)
     {
-      if (bfd_read (s, 1, 1, core_bfd) != 1)
+      if (bfd_bread (s, (bfd_size_type) 1, core_bfd) != 1)
        {
          free (path);
          return false;
@@ -672,7 +682,7 @@ rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
          char *n;
 
          alloc *= 2;
-         n = bfd_realloc (path, alloc);
+         n = bfd_realloc (path, (bfd_size_type) alloc);
          if (n == NULL)
            {
              free (path);