a8da640382
* bfd/archive.c (_bfd_find_nested_archive): New function.
(get_extended_arelt_filename): Add origin parameter.
(_bfd_generic_read_ar_hdr_mag): Deal with extended name
combined with a file offset.
(append_relative_path): New function.
(_bfd_get_elt_at_filepos): Deal with external members and
nested archives.
(bfd_generic_openr_next_archived_file): Thin archives.
(bfd_generic_archive_p): Recognize new magic string.
(adjust_relative_path): New function.
(_bfd_construct_extended_name_table): Construct extended
names for thin archive members.
(_bfd_write_archive_contents): Emit new magic string, skip
copying files for thin archives.
* bfd/bfd-in.h (bfd_is_thin_archive): New macro.
* bfd/bfd.c (struct bfd): New fields for thin archives.
* bfd/libbfd-in.h (struct areltdata): New field for thin archives.
* bfd/opncls.c (bfd_close): Delete BFDs for nested archives.
* binutils/ar.c (make_thin_archive): New global flag.
(map_over_members): Deal with full pathnames in thin archives.
(usage, main): Add 'T' option for building thin archives.
(replace_members): Pass thin archive flag to ar_emul_append.
* binutils/arsup.c (ar_open): Initialize new flag.
* binutils/binemul.c (ar_emul_append): Add new parameter for
flattening nested archives.
(do_ar_emul_default_append): New function.
(ar_emul_default_append): Factored out recursive code.
* binutils/binemul.h (ar_emul_default_append): Add new parameter.
(struct bin_emulation_xfer_struct): New parameter for ar_append.
* binutils/dlltool.c (gen_lib_file): Initialize thin archive flag.
* binutils/emul_aix.c (ar_emul_aix_internal): Add new flatten
parameter, currently unimplemented.
All callers changed.
* binutils/objcopy.c (copy_archive): Preserve thin archive flag.
* binutils/doc/binutils.texi: Update ar documentation.
* binutils/testsuite/binutils-all/ar.exp: Add thin archive tests.
* include/aout/ar.h (ARMAGT): New magic string for thin archives.
136 lines
3.4 KiB
C
136 lines
3.4 KiB
C
/* Binutils emulation layer.
|
|
Copyright 2002, 2003, 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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
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., 51 Franklin Street - Fifth Floor, Boston,
|
|
MA 02110-1301, USA. */
|
|
|
|
#include "binemul.h"
|
|
|
|
extern bin_emulation_xfer_type bin_dummy_emulation;
|
|
|
|
void
|
|
ar_emul_usage (FILE *fp)
|
|
{
|
|
if (bin_dummy_emulation.ar_usage)
|
|
bin_dummy_emulation.ar_usage (fp);
|
|
}
|
|
|
|
void
|
|
ar_emul_default_usage (FILE *fp)
|
|
{
|
|
AR_EMUL_USAGE_PRINT_OPTION_HEADER (fp);
|
|
/* xgettext:c-format */
|
|
fprintf (fp, _(" No emulation specific options\n"));
|
|
}
|
|
|
|
bfd_boolean
|
|
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,
|
|
flatten);
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
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_APPEND_PRINT_VERBOSE (verbose, new_bfd->filename);
|
|
|
|
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)
|
|
{
|
|
if (bin_dummy_emulation.ar_replace)
|
|
return bin_dummy_emulation.ar_replace (after_bfd, file_name, verbose);
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
bfd_boolean
|
|
ar_emul_default_replace (bfd **after_bfd, char *file_name,
|
|
bfd_boolean verbose)
|
|
{
|
|
bfd *temp;
|
|
|
|
temp = *after_bfd;
|
|
*after_bfd = bfd_openr (file_name, NULL);
|
|
|
|
AR_EMUL_ELEMENT_CHECK (*after_bfd, file_name);
|
|
AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name);
|
|
|
|
(*after_bfd)->archive_next = temp;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
bfd_boolean
|
|
ar_emul_parse_arg (char *arg)
|
|
{
|
|
if (bin_dummy_emulation.ar_parse_arg)
|
|
return bin_dummy_emulation.ar_parse_arg (arg);
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
bfd_boolean
|
|
ar_emul_default_parse_arg (char *arg ATTRIBUTE_UNUSED)
|
|
{
|
|
return FALSE;
|
|
}
|