Re: [patch] Fix some plugin API issues in BFD

[Rafael Ávila de Espíndola <respindola at mozilla dot com>]

On 2011-02-20 14:54, Rafael Ávila de Espíndola wrote:
> An updated patch is attached that also avoids calling onload multiple times.

Sorry, the correct one is now attached.

Cheers,
Rafael

diff --git a/bfd/plugin.c b/bfd/plugin.c
index 30a4923..bba9548 100644
--- a/bfd/plugin.c
+++ b/bfd/plugin.c
@@ -232,11 +232,16 @@ static const bfd_target *
 bfd_plugin_object_p (bfd *abfd)
 {
   int claimed = 0;
-  int t = load_plugin ();
   struct ld_plugin_input_file file;
   bfd *iobfd;
-
-  if (!t)
+  static int have_loaded = 0;
+  static int have_plugin = 0;
+  if (!have_loaded)
+    {
+      have_loaded = 1;
+      have_plugin = load_plugin ();
+    }
+  if (!have_plugin)
     return NULL;
 
   file.name = abfd->filename;
@@ -251,7 +256,7 @@ bfd_plugin_object_p (bfd *abfd)
     {
       iobfd = abfd;
       file.offset = 0;
-      file.filesize = 0; /*FIXME*/
+      file.filesize = 0;
     }
 
   if (!iobfd->iostream && !bfd_open_file (iobfd))
@@ -259,8 +264,18 @@ bfd_plugin_object_p (bfd *abfd)
 
   file.fd = fileno ((FILE *) iobfd->iostream);
 
+  if (!abfd->my_archive)
+    {
+      struct stat stat_buf;
+      if (fstat (file.fd, &stat_buf))
+        return NULL;
+      file.filesize = stat_buf.st_size;
+    }
+
   file.handle = abfd;
+  off_t cur_offset = lseek(file.fd, 0, SEEK_CUR);
   claim_file (&file, &claimed);
+  lseek(file.fd, cur_offset, SEEK_SET);
   if (!claimed)
     return NULL;