/* Binutils emulation layer.
- Copyright 2002, 2003 Free Software Foundation, Inc.
- Written by Tom Rix, Redhat.
+ Copyright 2002, 2003, 2005, 2007, 2008 Free Software Foundation, Inc.
+ Written by Tom Rix, Red Hat Inc.
This file is part of GNU Binutils.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
#include "binemul.h"
}
bfd_boolean
-ar_emul_append (bfd **after_bfd, char *file_name, bfd_boolean verbose)
+ar_emul_append (bfd **after_bfd, char *file_name, bfd_boolean verbose,
+ bfd_boolean flatten)
{
if (bin_dummy_emulation.ar_append)
- return bin_dummy_emulation.ar_append (after_bfd, file_name, verbose);
+ return bin_dummy_emulation.ar_append (after_bfd, file_name, verbose,
+ flatten);
return FALSE;
}
-bfd_boolean
-ar_emul_default_append (bfd **after_bfd, char *file_name,
- bfd_boolean verbose)
-{
- bfd *temp;
-
- temp = *after_bfd;
- *after_bfd = bfd_openr (file_name, NULL);
+static bfd_boolean
+do_ar_emul_default_append (bfd **after_bfd, bfd *new_bfd,
+ bfd_boolean verbose, bfd_boolean flatten)
+ {
+ /* When flattening, add the members of an archive instead of the
+ archive itself. */
+ if (flatten && bfd_check_format (new_bfd, bfd_archive))
+ {
+ bfd *elt;
+ bfd_boolean added = FALSE;
+
+ for (elt = bfd_openr_next_archived_file (new_bfd, NULL);
+ elt;
+ elt = bfd_openr_next_archived_file (new_bfd, elt))
+ {
+ if (do_ar_emul_default_append (after_bfd, elt, verbose, TRUE))
+ {
+ added = TRUE;
+ after_bfd = &((*after_bfd)->archive_next);
+ }
+ }
+
+ return added;
+ }
- AR_EMUL_ELEMENT_CHECK (*after_bfd, file_name);
- AR_EMUL_APPEND_PRINT_VERBOSE (verbose, file_name);
+ AR_EMUL_APPEND_PRINT_VERBOSE (verbose, new_bfd->filename);
- (*after_bfd)->next = temp;
+ new_bfd->archive_next = *after_bfd;
+ *after_bfd = new_bfd;
return TRUE;
}
+bfd_boolean
+ar_emul_default_append (bfd **after_bfd, char *file_name,
+ bfd_boolean verbose, bfd_boolean flatten)
+{
+ bfd *new_bfd;
+
+ new_bfd = bfd_openr (file_name, NULL);
+ AR_EMUL_ELEMENT_CHECK (new_bfd, file_name);
+ return do_ar_emul_default_append (after_bfd, new_bfd, verbose, flatten);
+}
+
bfd_boolean
ar_emul_replace (bfd **after_bfd, char *file_name, bfd_boolean verbose)
{
AR_EMUL_ELEMENT_CHECK (*after_bfd, file_name);
AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);
- (*after_bfd)->next = temp;
-
- return TRUE;
-}
-
-bfd_boolean
-ar_emul_create (bfd **abfd_out, char *archive_file_name, char *file_name)
-{
- if (bin_dummy_emulation.ar_create)
- return bin_dummy_emulation.ar_create (abfd_out, archive_file_name,
- file_name);
-
- return FALSE;
-}
-
-bfd_boolean
-ar_emul_default_create (bfd **abfd_out, char *archive_file_name,
- char *file_name)
-{
- char *target = NULL;
-
- /* Try to figure out the target to use for the archive from the
- first object on the list. */
- if (file_name != NULL)
- {
- bfd *obj;
-
- obj = bfd_openr (file_name, NULL);
- if (obj != NULL)
- {
- if (bfd_check_format (obj, bfd_object))
- target = bfd_get_target (obj);
- (void) bfd_close (obj);
- }
- }
-
- /* Create an empty archive. */
- *abfd_out = bfd_openw (archive_file_name, target);
- if (*abfd_out == NULL
- || ! bfd_set_format (*abfd_out, bfd_archive)
- || ! bfd_close (*abfd_out))
- bfd_fatal (archive_file_name);
+ (*after_bfd)->archive_next = temp;
return TRUE;
}