/* BFD back-end for archive files (libraries).
- Copyright 1990, 1991, 1992 Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ 2000, 2001, 2002, 2003
+ Free Software Foundation, Inc.
Written by Cygnus Support. Mostly Gumby Henkel-Wallace's fault.
This file is part of BFD, the Binary File Descriptor library.
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., 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/*
@setfilename archive-info
Archives
DESCRIPTION
- Archives are supported in BFD in <<archive.c>>.
-
An archive (or library) is just another BFD. It has a symbol
table, although there's not much a user program will do with it.
The big difference between an archive BFD and an ordinary BFD
is that the archive doesn't have sections. Instead it has a
- chain of BFDs considered its contents. These BFDs can be
- manipulated just like any other. The BFDs contained in an
- archive opened for reading will all be opened for reading; you
+ chain of BFDs that are considered its contents. These BFDs can
+ be manipulated like any other. The BFDs contained in an
+ archive opened for reading will all be opened for reading. You
may put either input or output BFDs into an archive opened for
- output; it will be handled correctly when the archive is closed.
+ output; they will be handled correctly when the archive is closed.
- Use <<bfd_openr_next_archived_file>> to step through all
- the contents of an archive opened for input. It's not
- required that you read the entire archive if you don't want
+ Use <<bfd_openr_next_archived_file>> to step through
+ the contents of an archive opened for input. You don't
+ have to read the entire archive if you don't want
to! Read it until you find what you want.
Archive contents of output BFDs are chained through the
<<next>> pointer in a BFD. The first one is findable through
the <<archive_head>> slot of the archive. Set it with
- <<set_archive_head>> (q.v.). A given BFD may be in only one
+ <<bfd_set_archive_head>> (q.v.). A given BFD may be in only one
open output archive at a time.
As expected, the BFD archive code is more general than the
This can cause unexpected confusion, since some archive
formats are more expressive than others. For instance, Intel
- COFF archives can preserve long filenames; Sun a.out archives
+ COFF archives can preserve long filenames; SunOS a.out archives
cannot. If you move a file from the first to the second
format and back again, the filename may be truncated.
Likewise, different a.out environments have different
Beware: most of these formats do not react well to the
presence of spaces in filenames. We do the best we can, but
- can't always handle this due to restrctions in the format of
- archives. Many unix utilities are braindead in regards to
+ can't always handle this case due to restrictions in the format of
+ archives. Many Unix utilities are braindead in regards to
spaces and such in filenames anyway, so this shouldn't be much
of a restriction.
+
+ Archives are supported in BFD in <<archive.c>>.
+
*/
/* Assumes:
*/
/* Some formats provide a way to cram a long filename into the short
- (16 chars) space provided by a bsd archive. The trick is: make a
+ (16 chars) space provided by a BSD archive. The trick is: make a
special "file" in the front of the archive, sort of like the SYMDEF
entry. If the filename is too long to fit, put it in the extended
name table, and use its index as the filename. To prevent
confusion prepend the index with a space. This means you can't
- have filenames that start with a space, but then again, many unix
+ have filenames that start with a space, but then again, many Unix
utilities can't handle that anyway.
This scheme unfortunately requires that you stand on your head in
order to write an archive since you need to put a magic file at the
front, and need to touch every entry to do so. C'est la vie.
+
+ We support two variants of this idea:
+ The SVR4 format (extended name table is named "//"),
+ and an extended pseudo-BSD variant (extended name table is named
+ "ARFILENAMES/"). The origin of the latter format is uncertain.
+
+ BSD 4.4 uses a third scheme: It writes a long filename
+ directly after the header. This allows 'ar q' to work.
+ We currently can read BSD 4.4 archives, but not write them.
*/
+/* Summary of archive member names:
+
+ Symbol table (must be first):
+ "__.SYMDEF " - Symbol table, Berkeley style, produced by ranlib.
+ "/ " - Symbol table, system 5 style.
+
+ Long name table (must be before regular file members):
+ "// " - Long name table, System 5 R4 style.
+ "ARFILENAMES/ " - Long name table, non-standard extended BSD (not BSD 4.4).
+
+ Regular file members with short names:
+ "filename.o/ " - Regular file, System 5 style (embedded spaces ok).
+ "filename.o " - Regular file, Berkeley style (no embedded spaces).
+
+ Regular files with long names (or embedded spaces, for BSD variants):
+ "/18 " - SVR4 style, name at offset 18 in name table.
+ "#1/23 " - Long name (or embedded paces) 23 characters long,
+ BSD 4.4 style, full name follows header.
+ Implemented for reading, not writing.
+ " 18 " - Long name 18 characters long, extended pseudo-BSD.
+ */
+
#include "bfd.h"
#include "sysdep.h"
#include "libbfd.h"
#include "aout/ar.h"
#include "aout/ranlib.h"
-#include <errno.h>
+#include "safe-ctype.h"
#ifndef errno
extern int errno;
the cache when we actually read one. We also don't sort the cache;
it's generally short enough to search linearly.
Note that the pointers here point to the front of the ar_hdr, not
- to the front of the contents!
-*/
+ to the front of the contents! */
struct ar_cache {
file_ptr ptr;
- bfd* arelt;
+ bfd *arelt;
struct ar_cache *next;
};
#define ar_padchar(abfd) ((abfd)->xvec->ar_pad_char)
#define ar_maxnamelen(abfd) ((abfd)->xvec->ar_max_namelen)
-#define arch_hdr(bfd) ((struct ar_hdr *) \
- (((struct areltdata *)((bfd)->arelt_data))->arch_header))
+#define arch_eltdata(bfd) ((struct areltdata *) ((bfd)->arelt_data))
+#define arch_hdr(bfd) ((struct ar_hdr *) arch_eltdata(bfd)->arch_header)
+
\f
-boolean
-_bfd_generic_mkarchive (abfd)
- bfd *abfd;
+bfd_boolean
+_bfd_generic_mkarchive (bfd *abfd)
{
- abfd->tdata.aout_ar_data = (struct artdata *)bfd_zalloc(abfd, sizeof (struct artdata));
+ bfd_size_type amt = sizeof (struct artdata);
- if (bfd_ardata (abfd) == NULL) {
- bfd_error = no_memory;
- return false;
- }
- bfd_ardata(abfd)->cache = 0;
- return true;
+ abfd->tdata.aout_ar_data = bfd_zalloc (abfd, amt);
+ if (bfd_ardata (abfd) == NULL)
+ return FALSE;
+
+ bfd_ardata (abfd)->cache = NULL;
+ bfd_ardata (abfd)->archive_head = NULL;
+ bfd_ardata (abfd)->symdefs = NULL;
+ bfd_ardata (abfd)->extended_names = NULL;
+ bfd_ardata (abfd)->tdata = NULL;
+
+ return TRUE;
}
/*
bfd_get_next_mapent
SYNOPSIS
- symindex bfd_get_next_mapent(bfd *, symindex previous, carsym ** sym);
+ symindex bfd_get_next_mapent
+ (bfd *abfd, symindex previous, carsym **sym);
DESCRIPTION
- This function steps through an archive's symbol table (if it
- has one). Successively updates <<sym>> with the next symbol's
+ Step through archive @var{abfd}'s symbol table (if it
+ has one). Successively update @var{sym} with the next symbol's
information, returning that symbol's (internal) index into the
symbol table.
- Supply BFD_NO_MORE_SYMBOLS as the <<previous>> entry to get
- the first one; returns BFD_NO_MORE_SYMBOLS when you're already
+ Supply <<BFD_NO_MORE_SYMBOLS>> as the @var{previous} entry to get
+ the first one; returns <<BFD_NO_MORE_SYMBOLS>> when you've already
got the last one.
A <<carsym>> is a canonical archive symbol. The only
*/
symindex
-DEFUN(bfd_get_next_mapent,(abfd, prev, entry),
- bfd *abfd AND
- symindex prev AND
- carsym **entry)
+bfd_get_next_mapent (bfd *abfd, symindex prev, carsym **entry)
{
- if (!bfd_has_map (abfd)) {
- bfd_error = invalid_operation;
- return BFD_NO_MORE_SYMBOLS;
- }
-
- if (prev == BFD_NO_MORE_SYMBOLS) prev = 0;
- else if (++prev >= bfd_ardata (abfd)->symdef_count)
+ if (!bfd_has_map (abfd))
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return BFD_NO_MORE_SYMBOLS;
+ }
+
+ if (prev == BFD_NO_MORE_SYMBOLS)
+ prev = 0;
+ else
+ ++prev;
+ if (prev >= bfd_ardata (abfd)->symdef_count)
return BFD_NO_MORE_SYMBOLS;
*entry = (bfd_ardata (abfd)->symdefs + prev);
}
/* To be called by backends only */
+
bfd *
-_bfd_create_empty_archive_element_shell (obfd)
- bfd *obfd;
+_bfd_create_empty_archive_element_shell (bfd *obfd)
{
- bfd *nbfd;
-
- nbfd = new_bfd_contained_in(obfd);
- if (nbfd == NULL) {
- bfd_error = no_memory;
- return NULL;
- }
- return nbfd;
+ return _bfd_new_bfd_contained_in (obfd);
}
/*
bfd_set_archive_head
SYNOPSIS
- boolean bfd_set_archive_head(bfd *output, bfd *new_head);
+ bfd_boolean bfd_set_archive_head (bfd *output, bfd *new_head);
DESCRIPTION
- Used whilst processing archives. Sets the head of the chain of
- BFDs contained in an archive to @var{new_head}.
+ Set the head of the chain of
+ BFDs contained in the archive @var{output} to @var{new_head}.
*/
-boolean
-DEFUN(bfd_set_archive_head,(output_archive, new_head),
- bfd *output_archive AND
- bfd *new_head)
+bfd_boolean
+bfd_set_archive_head (bfd *output_archive, bfd *new_head)
{
-
output_archive->archive_head = new_head;
- return true;
+ return TRUE;
}
bfd *
-look_for_bfd_in_cache (arch_bfd, filepos)
- bfd *arch_bfd;
- file_ptr filepos;
+_bfd_look_for_bfd_in_cache (bfd *arch_bfd, file_ptr filepos)
{
struct ar_cache *current;
for (current = bfd_ardata (arch_bfd)->cache; current != NULL;
current = current->next)
- if (current->ptr == filepos) return current->arelt;
+ if (current->ptr == filepos)
+ return current->arelt;
return NULL;
}
/* Kind of stupid to call cons for each one, but we don't do too many */
-boolean
-add_bfd_to_cache (arch_bfd, filepos, new_elt)
- bfd *arch_bfd, *new_elt;
- file_ptr filepos;
+bfd_boolean
+_bfd_add_bfd_to_archive_cache (bfd *arch_bfd, file_ptr filepos, bfd *new_elt)
{
- struct ar_cache *new_cache = (struct ar_cache *)
- bfd_zalloc(arch_bfd, sizeof (struct ar_cache));
+ bfd_size_type amt = sizeof (struct ar_cache);
- if (new_cache == NULL) {
- bfd_error = no_memory;
- return false;
- }
+ struct ar_cache *new_cache = bfd_zalloc (arch_bfd, amt);
+ if (new_cache == NULL)
+ return FALSE;
new_cache->ptr = filepos;
new_cache->arelt = new_elt;
- new_cache->next = (struct ar_cache *)NULL;
+ new_cache->next = NULL;
if (bfd_ardata (arch_bfd)->cache == NULL)
bfd_ardata (arch_bfd)->cache = new_cache;
- else {
- struct ar_cache *current = bfd_ardata (arch_bfd)->cache;
+ else
+ {
+ struct ar_cache *current = bfd_ardata (arch_bfd)->cache;
- for (; current->next != NULL; current = current->next);
- current->next = new_cache;
- }
-
- return true;
-}
+ while (current->next != NULL)
+ current = current->next;
+ current->next = new_cache;
+ }
+ return TRUE;
+}
\f
-
/* The name begins with space. Hence the rest of the name is an index into
- the string table. */
-char *
-get_extended_arelt_filename (arch, name)
- bfd *arch;
- char *name;
+ the string table. */
+
+static char *
+get_extended_arelt_filename (bfd *arch, const char *name)
{
unsigned long index = 0;
/* Should extract string so that I can guarantee not to overflow into
- the next region, but I'm too lazy. */
+ the next region, but I'm too lazy. */
errno = 0;
- /* Skip first char, which is '/' in SVR4 or ' ' in some other variants. */
- index = strtol (name+1, NULL, 10);
- if (errno != 0) {
- bfd_error = malformed_archive;
+ /* Skip first char, which is '/' in SVR4 or ' ' in some other variants. */
+ index = strtol (name + 1, NULL, 10);
+ if (errno != 0)
+ {
+ bfd_set_error (bfd_error_malformed_archive);
return NULL;
}
return bfd_ardata (arch)->extended_names + index;
-}
+}
/* This functions reads an arch header and returns an areltdata pointer, or
NULL on error.
could have been moved arbitrarily.
*/
-struct areltdata *
-snarf_ar_hdr (abfd)
- bfd *abfd;
+void *
+_bfd_generic_read_ar_hdr (bfd *abfd)
{
-#ifndef errno
- extern int errno;
-#endif
+ return _bfd_generic_read_ar_hdr_mag (abfd, NULL);
+}
- struct ar_hdr hdr;
- char *hdrp = (char *) &hdr;
- unsigned int parsed_size;
- struct areltdata *ared;
- char *filename = NULL;
- unsigned int namelen = 0;
- unsigned int allocsize = sizeof (struct areltdata) + sizeof (struct ar_hdr);
- char *allocptr;
-
- if (bfd_read ((PTR)hdrp, 1, sizeof (struct ar_hdr), abfd)
- != sizeof (struct ar_hdr)) {
- bfd_error = no_more_archived_files;
- return NULL;
+/* Alpha ECOFF uses an optional different ARFMAG value, so we have a
+ variant of _bfd_generic_read_ar_hdr which accepts a magic string. */
+
+void *
+_bfd_generic_read_ar_hdr_mag (bfd *abfd, const char *mag)
+{
+ struct ar_hdr hdr;
+ char *hdrp = (char *) &hdr;
+ size_t parsed_size;
+ struct areltdata *ared;
+ char *filename = NULL;
+ bfd_size_type namelen = 0;
+ bfd_size_type allocsize = sizeof (struct areltdata) + sizeof (struct ar_hdr);
+ char *allocptr = 0;
+
+ if (bfd_bread (hdrp, sizeof (struct ar_hdr), abfd) != sizeof (struct ar_hdr))
+ {
+ if (bfd_get_error () != bfd_error_system_call)
+ bfd_set_error (bfd_error_no_more_archived_files);
+ return NULL;
}
- if (strncmp ((hdr.ar_fmag), ARFMAG, 2)) {
- bfd_error = malformed_archive;
- return NULL;
+ if (strncmp (hdr.ar_fmag, ARFMAG, 2) != 0
+ && (mag == NULL
+ || strncmp (hdr.ar_fmag, mag, 2) != 0))
+ {
+ bfd_set_error (bfd_error_malformed_archive);
+ return NULL;
}
- errno = 0;
- parsed_size = strtol (hdr.ar_size, NULL, 10);
- if (errno != 0) {
- bfd_error = malformed_archive;
- return NULL;
+ errno = 0;
+ parsed_size = strtol (hdr.ar_size, NULL, 10);
+ if (errno != 0)
+ {
+ bfd_set_error (bfd_error_malformed_archive);
+ return NULL;
+ }
+
+ /* Extract the filename from the archive - there are two ways to
+ specify an extended name table, either the first char of the
+ name is a space, or it's a slash. */
+ if ((hdr.ar_name[0] == '/'
+ || (hdr.ar_name[0] == ' '
+ && memchr (hdr.ar_name, '/', ar_maxnamelen (abfd)) == NULL))
+ && bfd_ardata (abfd)->extended_names != NULL)
+ {
+ filename = get_extended_arelt_filename (abfd, hdr.ar_name);
+ if (filename == NULL)
+ {
+ bfd_set_error (bfd_error_malformed_archive);
+ return NULL;
+ }
}
+ /* BSD4.4-style long filename.
+ Only implemented for reading, so far! */
+ else if (hdr.ar_name[0] == '#'
+ && hdr.ar_name[1] == '1'
+ && hdr.ar_name[2] == '/'
+ && ISDIGIT (hdr.ar_name[3]))
+ {
+ /* BSD-4.4 extended name */
+ namelen = atoi (&hdr.ar_name[3]);
+ allocsize += namelen + 1;
+ parsed_size -= namelen;
- /* extract the filename from the archive - there are two ways to
- specify an extendend name table, either the first char of the
- name is a space, or it's a slash. */
- if ((hdr.ar_name[0] == '/'
- || (hdr.ar_name[0] == ' '
- && memchr (hdr.ar_name, '/', ar_maxnamelen(abfd)) == NULL))
- && bfd_ardata (abfd)->extended_names != NULL) {
- filename = get_extended_arelt_filename (abfd, hdr.ar_name);
- if (filename == NULL) {
- bfd_error = malformed_archive;
- return NULL;
+ allocptr = bfd_zalloc (abfd, allocsize);
+ if (allocptr == NULL)
+ return NULL;
+ filename = (allocptr
+ + sizeof (struct areltdata)
+ + sizeof (struct ar_hdr));
+ if (bfd_bread (filename, namelen, abfd) != namelen)
+ {
+ if (bfd_get_error () != bfd_error_system_call)
+ bfd_set_error (bfd_error_no_more_archived_files);
+ return NULL;
}
- }
- else
+ filename[namelen] = '\0';
+ }
+ else
+ {
+ /* We judge the end of the name by looking for '/' or ' '.
+ Note: The SYSV format (terminated by '/') allows embedded
+ spaces, so only look for ' ' if we don't find '/'. */
+
+ char *e;
+ e = memchr (hdr.ar_name, '\0', ar_maxnamelen (abfd));
+ if (e == NULL)
{
- /* We judge the end of the name by looking for '/' or ' '.
- Note: The SYSV format (terminated by '/') allows embedded
- spaces, so only look for ' ' if we don't find '/'. */
-
- namelen = 0;
- while (hdr.ar_name[namelen] != '\0' &&
- hdr.ar_name[namelen] != '/') {
- namelen++;
- if (namelen == (unsigned)ar_maxnamelen(abfd)) {
- namelen = 0;
- while (hdr.ar_name[namelen] != ' '
- && namelen < (unsigned)ar_maxnamelen(abfd)) {
- namelen++;
- }
- break;
- }
- }
+ e = memchr (hdr.ar_name, '/', ar_maxnamelen (abfd));
+ if (e == NULL)
+ e = memchr (hdr.ar_name, ' ', ar_maxnamelen (abfd));
+ }
- allocsize += namelen + 1;
+ if (e != NULL)
+ namelen = e - hdr.ar_name;
+ else
+ {
+ /* If we didn't find a termination character, then the name
+ must be the entire field. */
+ namelen = ar_maxnamelen (abfd);
}
- allocptr = bfd_zalloc(abfd, allocsize);
- if (allocptr == NULL) {
- bfd_error = no_memory;
+ allocsize += namelen + 1;
+ }
+
+ if (!allocptr)
+ {
+ allocptr = bfd_zalloc (abfd, allocsize);
+ if (allocptr == NULL)
return NULL;
}
- ared = (struct areltdata *) allocptr;
+ ared = (struct areltdata *) allocptr;
- ared->arch_header = allocptr + sizeof (struct areltdata);
- memcpy ((char *) ared->arch_header, (char *) &hdr, sizeof (struct ar_hdr));
- ared->parsed_size = parsed_size;
+ ared->arch_header = allocptr + sizeof (struct areltdata);
+ memcpy (ared->arch_header, &hdr, sizeof (struct ar_hdr));
+ ared->parsed_size = parsed_size;
- if (filename != NULL) ared->filename = filename;
- else {
- ared->filename = allocptr + (sizeof (struct areltdata) +
- sizeof (struct ar_hdr));
- if (namelen)
- memcpy (ared->filename, hdr.ar_name, namelen);
- ared->filename[namelen] = '\0';
+ if (filename != NULL)
+ ared->filename = filename;
+ else
+ {
+ ared->filename = allocptr + (sizeof (struct areltdata) +
+ sizeof (struct ar_hdr));
+ if (namelen)
+ memcpy (ared->filename, hdr.ar_name, namelen);
+ ared->filename[namelen] = '\0';
}
-
- return ared;
+
+ return ared;
}
\f
/* This is an internal function; it's mainly used when indexing
through the archive symbol table, but also used to get the next
- element, since it handles the bookkeeping so nicely for us.
-*/
+ element, since it handles the bookkeeping so nicely for us. */
bfd *
-get_elt_at_filepos (archive, filepos)
- bfd *archive;
- file_ptr filepos;
+_bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos)
{
struct areltdata *new_areldata;
bfd *n_nfd;
- n_nfd = look_for_bfd_in_cache (archive, filepos);
- if (n_nfd) return n_nfd;
+ n_nfd = _bfd_look_for_bfd_in_cache (archive, filepos);
+ if (n_nfd)
+ return n_nfd;
- if (0 > bfd_seek (archive, filepos, SEEK_SET)) {
- bfd_error = system_call_error;
+ if (0 > bfd_seek (archive, filepos, SEEK_SET))
return NULL;
- }
- if ((new_areldata = snarf_ar_hdr (archive)) == NULL) return NULL;
-
- n_nfd = _bfd_create_empty_archive_element_shell (archive);
- if (n_nfd == NULL) {
- bfd_release (archive, (PTR)new_areldata);
+ if ((new_areldata = _bfd_read_ar_hdr (archive)) == NULL)
return NULL;
- }
+
+ n_nfd = _bfd_create_empty_archive_element_shell (archive);
+ if (n_nfd == NULL)
+ {
+ bfd_release (archive, new_areldata);
+ return NULL;
+ }
+
n_nfd->origin = bfd_tell (archive);
- n_nfd->arelt_data = (PTR) new_areldata;
+ n_nfd->arelt_data = new_areldata;
n_nfd->filename = new_areldata->filename;
- if (add_bfd_to_cache (archive, filepos, n_nfd))
+ if (_bfd_add_bfd_to_archive_cache (archive, filepos, n_nfd))
return n_nfd;
- /* huh? */
- bfd_release (archive, (PTR)n_nfd);
- bfd_release (archive, (PTR)new_areldata);
+ /* Huh? */
+ bfd_release (archive, n_nfd);
+ bfd_release (archive, new_areldata);
return NULL;
}
-/*
-FUNCTION
- bfd_get_elt_at_index
-
-SYNOPSIS
- bfd *bfd_get_elt_at_index(bfd * archive, int index);
+/* Return the BFD which is referenced by the symbol in ABFD indexed by
+ INDEX. INDEX should have been returned by bfd_get_next_mapent. */
-DESCRIPTION
- Return the bfd which is referenced by the symbol indexed by <<index>>.
- <<index>> should have been returned by <<bfd_get_next_mapent>> (q.v.).
-
-*/
bfd *
-DEFUN(bfd_get_elt_at_index,(abfd, index),
- bfd *abfd AND
- int index)
+_bfd_generic_get_elt_at_index (bfd *abfd, symindex index)
{
- bfd *result =
- get_elt_at_filepos
- (abfd, (bfd_ardata (abfd)->symdefs + index)->file_offset);
- return result;
+ carsym *entry;
+
+ entry = bfd_ardata (abfd)->symdefs + index;
+ return _bfd_get_elt_at_filepos (abfd, entry->file_offset);
}
/*
bfd_openr_next_archived_file
SYNOPSIS
- bfd* bfd_openr_next_archived_file(bfd *archive, bfd *previous);
+ bfd *bfd_openr_next_archived_file (bfd *archive, bfd *previous);
DESCRIPTION
- Initially provided a BFD containing an archive and NULL, opens
- an inpout BFD on the first contained element and returns that.
- Subsequent calls to bfd_openr_next_archived_file should pass
+ Provided a BFD, @var{archive}, containing an archive and NULL, open
+ an input BFD on the first contained element and returns that.
+ Subsequent calls should pass
the archive and the previous return value to return a created
BFD to the next contained element. NULL is returned when there
are no more.
-
*/
bfd *
-DEFUN(bfd_openr_next_archived_file,(archive, last_file),
- bfd *archive AND
- bfd*last_file)
+bfd_openr_next_archived_file (bfd *archive, bfd *last_file)
{
+ if ((bfd_get_format (archive) != bfd_archive) ||
+ (archive->direction == write_direction))
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return NULL;
+ }
- if ((bfd_get_format (archive) != bfd_archive) ||
- (archive->direction == write_direction)) {
- bfd_error = invalid_operation;
- return NULL;
- }
-
-
- return BFD_SEND (archive,
- openr_next_archived_file,
- (archive,
- last_file));
-
+ return BFD_SEND (archive,
+ openr_next_archived_file, (archive, last_file));
}
-bfd *bfd_generic_openr_next_archived_file(archive, last_file)
- bfd *archive;
- bfd *last_file;
+bfd *
+bfd_generic_openr_next_archived_file (bfd *archive, bfd *last_file)
{
file_ptr filestart;
if (!last_file)
filestart = bfd_ardata (archive)->first_file_filepos;
- else {
- unsigned int size = arelt_size(last_file);
- /* Pad to an even boundary... */
- filestart = last_file->origin + size + size%2;
- }
+ else
+ {
+ unsigned int size = arelt_size (last_file);
+ /* Pad to an even boundary...
+ Note that last_file->origin can be odd in the case of
+ BSD-4.4-style element with a long odd size. */
+ filestart = last_file->origin + size;
+ filestart += filestart % 2;
+ }
- return get_elt_at_filepos (archive, filestart);
+ return _bfd_get_elt_at_filepos (archive, filestart);
}
-
-bfd_target *
-bfd_generic_archive_p (abfd)
- bfd *abfd;
+const bfd_target *
+bfd_generic_archive_p (bfd *abfd)
{
- char armag[SARMAG+1];
+ struct artdata *tdata_hold;
+ char armag[SARMAG + 1];
+ bfd_size_type amt;
- if (bfd_read ((PTR)armag, 1, SARMAG, abfd) != SARMAG) {
- bfd_error = wrong_format;
- return 0;
- }
+ if (bfd_bread (armag, SARMAG, abfd) != SARMAG)
+ {
+ if (bfd_get_error () != bfd_error_system_call)
+ bfd_set_error (bfd_error_wrong_format);
+ return NULL;
+ }
#ifdef GNU960
- if (strncmp (armag, BFD_GNU960_ARMAG(abfd), SARMAG)) return 0;
+ if (strncmp (armag, BFD_GNU960_ARMAG (abfd), SARMAG) != 0)
+ return 0;
#else
- if (strncmp (armag, ARMAG, SARMAG) &&
- strncmp (armag, ARMAGB, SARMAG)) return 0;
+ if (strncmp (armag, ARMAG, SARMAG) != 0 &&
+ strncmp (armag, ARMAGB, SARMAG) != 0)
+ return 0;
#endif
+ tdata_hold = bfd_ardata (abfd);
+ amt = sizeof (struct artdata);
+ bfd_ardata (abfd) = bfd_zalloc (abfd, amt);
+ if (bfd_ardata (abfd) == NULL)
+ {
+ bfd_ardata (abfd) = tdata_hold;
+ return NULL;
+ }
- /* We are setting bfd_ardata(abfd) here, but since bfd_ardata
- involves a cast, we can't do it as the left operand of assignment. */
- abfd->tdata.aout_ar_data = (struct artdata *) bfd_zalloc(abfd,sizeof (struct artdata));
+ bfd_ardata (abfd)->first_file_filepos = SARMAG;
+ bfd_ardata (abfd)->cache = NULL;
+ bfd_ardata (abfd)->archive_head = NULL;
+ bfd_ardata (abfd)->symdefs = NULL;
+ bfd_ardata (abfd)->extended_names = NULL;
+ bfd_ardata (abfd)->tdata = NULL;
+
+ if (!BFD_SEND (abfd, _bfd_slurp_armap, (abfd))
+ || !BFD_SEND (abfd, _bfd_slurp_extended_name_table, (abfd)))
+ {
+ if (bfd_get_error () != bfd_error_system_call)
+ bfd_set_error (bfd_error_wrong_format);
+ bfd_release (abfd, bfd_ardata (abfd));
+ bfd_ardata (abfd) = tdata_hold;
+ return NULL;
+ }
- if (bfd_ardata (abfd) == NULL) {
- bfd_error = no_memory;
- return 0;
- }
+ if (bfd_has_map (abfd))
+ {
+ bfd *first;
- bfd_ardata (abfd)->first_file_filepos = SARMAG;
-
- if (!bfd_slurp_armap (abfd)) {
- bfd_release(abfd, bfd_ardata (abfd));
- abfd->tdata.aout_ar_data = NULL;
- return 0;
- }
+ /* This archive has a map, so we may presume that the contents
+ are object files. Make sure that if the first file in the
+ archive can be recognized as an object file, it is for this
+ target. If not, assume that this is the wrong format. If
+ the first file is not an object file, somebody is doing
+ something weird, and we permit it so that ar -t will work.
+
+ This is done because any normal format will recognize any
+ normal archive, regardless of the format of the object files.
+ We do accept an empty archive. */
+
+ first = bfd_openr_next_archived_file (abfd, NULL);
+ if (first != NULL)
+ {
+ bfd_boolean fail;
+
+ first->target_defaulted = FALSE;
+ fail = FALSE;
+ if (bfd_check_format (first, bfd_object)
+ && first->xvec != abfd->xvec)
+ {
+#if 0
+ /* We ought to close `first' here, but we can't, because
+ we have no way to remove it from the archive cache.
+ It's close to impossible to figure out when we can
+ release bfd_ardata. FIXME. */
+ bfd_close (first);
+ bfd_release (abfd, bfd_ardata (abfd));
+#endif
+ bfd_set_error (bfd_error_wrong_object_format);
+ bfd_ardata (abfd) = tdata_hold;
+ return NULL;
+ }
+ /* And we ought to close `first' here too. */
+ }
+ }
- if (!BFD_SEND (abfd, _bfd_slurp_extended_name_table, (abfd))) {
- bfd_release(abfd, bfd_ardata (abfd));
- abfd->tdata.aout_ar_data = NULL;
- return 0;
- }
-
return abfd->xvec;
}
-/* Returns false on error, true otherwise */
-static boolean
-do_slurp_bsd_armap (abfd)
- bfd *abfd;
-{
+/* Some constants for a 32 bit BSD archive structure. We do not
+ support 64 bit archives presently; so far as I know, none actually
+ exist. Supporting them would require changing these constants, and
+ changing some H_GET_32 to H_GET_64. */
+
+/* The size of an external symdef structure. */
+#define BSD_SYMDEF_SIZE 8
+
+/* The offset from the start of a symdef structure to the file offset. */
+#define BSD_SYMDEF_OFFSET_SIZE 4
+
+/* The size of the symdef count. */
+#define BSD_SYMDEF_COUNT_SIZE 4
+/* The size of the string count. */
+#define BSD_STRING_COUNT_SIZE 4
+
+/* Returns FALSE on error, TRUE otherwise */
+
+static bfd_boolean
+do_slurp_bsd_armap (bfd *abfd)
+{
struct areltdata *mapdata;
- char nextname[17];
- unsigned int counter = 0;
- int *raw_armap, *rbase;
+ unsigned int counter;
+ bfd_byte *raw_armap, *rbase;
struct artdata *ardata = bfd_ardata (abfd);
char *stringbase;
- unsigned int parsed_size;
+ bfd_size_type parsed_size, amt;
+ carsym *set;
- mapdata = snarf_ar_hdr (abfd);
- if (mapdata == NULL) return false;
+ mapdata = _bfd_read_ar_hdr (abfd);
+ if (mapdata == NULL)
+ return FALSE;
parsed_size = mapdata->parsed_size;
- bfd_release (abfd, (PTR)mapdata); /* Don't need it any more. */
-
- raw_armap = (int *) bfd_zalloc(abfd, parsed_size);
- if (raw_armap == NULL) {
- bfd_error = no_memory;
- return false;
- }
-
- if (bfd_read ((PTR)raw_armap, 1, parsed_size, abfd) != parsed_size) {
- bfd_error = malformed_archive;
+ bfd_release (abfd, mapdata); /* Don't need it any more. */
+
+ raw_armap = bfd_zalloc (abfd, parsed_size);
+ if (raw_armap == NULL)
+ return FALSE;
+
+ if (bfd_bread (raw_armap, parsed_size, abfd) != parsed_size)
+ {
+ if (bfd_get_error () != bfd_error_system_call)
+ bfd_set_error (bfd_error_malformed_archive);
byebye:
- bfd_release (abfd, (PTR)raw_armap);
- return false;
- }
-
- ardata->symdef_count =
- bfd_h_get_32(abfd, (PTR)raw_armap) / sizeof (struct symdef);
-
- if (ardata->symdef_count * sizeof (struct symdef)
- > parsed_size - sizeof (*raw_armap)) {
+ bfd_release (abfd, raw_armap);
+ return FALSE;
+ }
+
+ ardata->symdef_count = H_GET_32 (abfd, raw_armap) / BSD_SYMDEF_SIZE;
+
+ if (ardata->symdef_count * BSD_SYMDEF_SIZE >
+ parsed_size - BSD_SYMDEF_COUNT_SIZE)
+ {
/* Probably we're using the wrong byte ordering. */
- bfd_error = wrong_format;
+ bfd_set_error (bfd_error_wrong_format);
goto byebye;
- }
-
+ }
+
ardata->cache = 0;
- rbase = raw_armap+1;
- ardata->symdefs = (carsym *) rbase;
- stringbase = ((char *) (ardata->symdefs + ardata->symdef_count)) + 4;
-
- for (;counter < ardata->symdef_count; counter++) {
- struct symdef *sym = ((struct symdef *) rbase) + counter;
- sym->s.name = bfd_h_get_32(abfd, (PTR)(&(sym->s.string_offset))) + stringbase;
- sym->file_offset = bfd_h_get_32(abfd, (PTR)( &(sym->file_offset)));
- }
-
+ rbase = raw_armap + BSD_SYMDEF_COUNT_SIZE;
+ stringbase = ((char *) rbase
+ + ardata->symdef_count * BSD_SYMDEF_SIZE
+ + BSD_STRING_COUNT_SIZE);
+ amt = ardata->symdef_count * sizeof (carsym);
+ ardata->symdefs = bfd_alloc (abfd, amt);
+ if (!ardata->symdefs)
+ return FALSE;
+
+ for (counter = 0, set = ardata->symdefs;
+ counter < ardata->symdef_count;
+ counter++, set++, rbase += BSD_SYMDEF_SIZE)
+ {
+ set->name = H_GET_32 (abfd, rbase) + stringbase;
+ set->file_offset = H_GET_32 (abfd, rbase + BSD_SYMDEF_OFFSET_SIZE);
+ }
+
ardata->first_file_filepos = bfd_tell (abfd);
- /* Pad to an even boundary if you have to */
- ardata->first_file_filepos += (ardata-> first_file_filepos) %2;
+ /* Pad to an even boundary if you have to. */
+ ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
/* FIXME, we should provide some way to free raw_ardata when
we are done using the strings from it. For now, it seems
- to be allocated on an obstack anyway... */
- bfd_has_map (abfd) = true;
- return true;
+ to be allocated on an objalloc anyway... */
+ bfd_has_map (abfd) = TRUE;
+ return TRUE;
}
-/* Returns false on error, true otherwise */
-static boolean
-do_slurp_coff_armap (abfd)
- bfd *abfd;
+/* Returns FALSE on error, TRUE otherwise. */
+
+static bfd_boolean
+do_slurp_coff_armap (bfd *abfd)
{
struct areltdata *mapdata;
- char nextname;
int *raw_armap, *rawptr;
struct artdata *ardata = bfd_ardata (abfd);
char *stringbase;
- unsigned int stringsize;
+ bfd_size_type stringsize;
unsigned int parsed_size;
carsym *carsyms;
- int result;
- unsigned int nsymz; /* Number of symbols in armap. */
-
- bfd_vma (*swap)();
- char int_buf[sizeof(long)];
- unsigned int carsym_size, ptrsize, i;
-
- mapdata = snarf_ar_hdr (abfd);
- if (mapdata == NULL) return false;
+ bfd_size_type nsymz; /* Number of symbols in armap. */
+ bfd_vma (*swap) (const bfd_byte *);
+ char int_buf[sizeof (long)];
+ bfd_size_type carsym_size, ptrsize;
+ unsigned int i;
+
+ mapdata = _bfd_read_ar_hdr (abfd);
+ if (mapdata == NULL)
+ return FALSE;
parsed_size = mapdata->parsed_size;
- bfd_release (abfd, (PTR)mapdata); /* Don't need it any more. */
+ bfd_release (abfd, mapdata); /* Don't need it any more. */
- if (bfd_read ((PTR)int_buf, 1, 4, abfd) != 4) {
- bfd_error = malformed_archive;
- return false;
- }
+ if (bfd_bread (int_buf, 4, abfd) != 4)
+ {
+ if (bfd_get_error () != bfd_error_system_call)
+ bfd_set_error (bfd_error_malformed_archive);
+ return FALSE;
+ }
/* It seems that all numeric information in a coff archive is always
- in big endian format, nomatter the host or target. */
- swap = _do_getb32;
- nsymz = _do_getb32((PTR)int_buf);
+ in big endian format, nomatter the host or target. */
+ swap = bfd_getb32;
+ nsymz = bfd_getb32 (int_buf);
stringsize = parsed_size - (4 * nsymz) - 4;
#if 1
fault - the i960 little endian coff sometimes has big and sometimes
little, because our tools changed. Here's a horrible hack to clean
up the crap. */
-
- if (stringsize > 0xfffff) {
- /* This looks dangerous, let's do it the other way around */
- nsymz = _do_getl32((PTR)int_buf);
+
+ if (stringsize > 0xfffff
+ && bfd_get_arch (abfd) == bfd_arch_i960
+ && bfd_get_flavour (abfd) == bfd_target_coff_flavour)
+ {
+ /* This looks dangerous, let's do it the other way around. */
+ nsymz = bfd_getl32 (int_buf);
stringsize = parsed_size - (4 * nsymz) - 4;
- swap = _do_getl32;
- }
+ swap = bfd_getl32;
+ }
#endif
- /* The coff armap must be read sequentially. So we construct a bsd-style
- one in core all at once, for simplicity. */
-
+ /* The coff armap must be read sequentially. So we construct a
+ bsd-style one in core all at once, for simplicity. */
+
carsym_size = (nsymz * sizeof (carsym));
ptrsize = (4 * nsymz);
- ardata->symdefs = (carsym *) bfd_zalloc(abfd, carsym_size + stringsize + 1);
- if (ardata->symdefs == NULL) {
- bfd_error = no_memory;
- return false;
- }
+ ardata->symdefs = bfd_zalloc (abfd, carsym_size + stringsize + 1);
+ if (ardata->symdefs == NULL)
+ return FALSE;
carsyms = ardata->symdefs;
stringbase = ((char *) ardata->symdefs) + carsym_size;
- /* Allocate and read in the raw offsets. */
- raw_armap = (int *) bfd_alloc(abfd, ptrsize);
- if (raw_armap == NULL) {
- bfd_error = no_memory;
- goto release_symdefs;
- }
- if (bfd_read ((PTR)raw_armap, 1, ptrsize, abfd) != ptrsize
- || bfd_read ((PTR)stringbase, 1, stringsize, abfd) != stringsize) {
- bfd_error = malformed_archive;
- goto release_raw_armap;
- }
+ /* Allocate and read in the raw offsets. */
+ raw_armap = bfd_alloc (abfd, ptrsize);
+ if (raw_armap == NULL)
+ goto release_symdefs;
+ if (bfd_bread (raw_armap, ptrsize, abfd) != ptrsize
+ || (bfd_bread (stringbase, stringsize, abfd) != stringsize))
+ {
+ if (bfd_get_error () != bfd_error_system_call)
+ bfd_set_error (bfd_error_malformed_archive);
+ goto release_raw_armap;
+ }
- /* OK, build the carsyms */
- for (i = 0; i < nsymz; i++) {
+ /* OK, build the carsyms. */
+ for (i = 0; i < nsymz; i++)
+ {
rawptr = raw_armap + i;
- carsyms->file_offset = swap((PTR)rawptr);
+ carsyms->file_offset = swap ((bfd_byte *) rawptr);
carsyms->name = stringbase;
- while (*stringbase++) ;
+ stringbase += strlen (stringbase) + 1;
carsyms++;
- }
+ }
*stringbase = 0;
ardata->symdef_count = nsymz;
ardata->first_file_filepos = bfd_tell (abfd);
- /* Pad to an even boundary if you have to */
- ardata->first_file_filepos += (ardata->first_file_filepos) %2;
-
- bfd_has_map (abfd) = true;
- bfd_release (abfd, (PTR)raw_armap);
- return true;
-
- release_raw_armap:
- bfd_release (abfd, (PTR)raw_armap);
- release_symdefs:
- bfd_release (abfd, (PTR)(ardata)->symdefs);
- return false;
+ /* Pad to an even boundary if you have to. */
+ ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
+
+ bfd_has_map (abfd) = TRUE;
+ bfd_release (abfd, raw_armap);
+
+ /* Check for a second archive header (as used by PE). */
+ {
+ struct areltdata *tmp;
+
+ bfd_seek (abfd, ardata->first_file_filepos, SEEK_SET);
+ tmp = _bfd_read_ar_hdr (abfd);
+ if (tmp != NULL)
+ {
+ if (tmp->arch_header[0] == '/'
+ && tmp->arch_header[1] == ' ')
+ {
+ ardata->first_file_filepos +=
+ (tmp->parsed_size + sizeof (struct ar_hdr) + 1) & ~(unsigned) 1;
+ }
+ bfd_release (abfd, tmp);
+ }
+ }
+
+ return TRUE;
+
+release_raw_armap:
+ bfd_release (abfd, raw_armap);
+release_symdefs:
+ bfd_release (abfd, (ardata)->symdefs);
+ return FALSE;
}
/* This routine can handle either coff-style or bsd-style armaps.
- Returns false on error, true otherwise */
+ Returns FALSE on error, TRUE otherwise */
-boolean
-bfd_slurp_armap (abfd)
- bfd *abfd;
+bfd_boolean
+bfd_slurp_armap (bfd *abfd)
{
char nextname[17];
- int i = bfd_read ((PTR)nextname, 1, 16, abfd);
-
+ int i = bfd_bread (nextname, 16, abfd);
+
if (i == 0)
- return true;
+ return TRUE;
if (i != 16)
- return false;
+ return FALSE;
- bfd_seek (abfd, (file_ptr) -16, SEEK_CUR);
+ if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
+ return FALSE;
- if (!strncmp (nextname, "__.SYMDEF ", 16))
+ if (!strncmp (nextname, "__.SYMDEF ", 16)
+ || !strncmp (nextname, "__.SYMDEF/ ", 16)) /* old Linux archives */
return do_slurp_bsd_armap (abfd);
else if (!strncmp (nextname, "/ ", 16))
return do_slurp_coff_armap (abfd);
+ else if (!strncmp (nextname, "/SYM64/ ", 16))
+ {
+ /* 64bit ELF (Irix 6) archive. */
+#ifdef BFD64
+ extern bfd_boolean bfd_elf64_archive_slurp_armap (bfd *);
+ return bfd_elf64_archive_slurp_armap (abfd);
+#else
+ bfd_set_error (bfd_error_wrong_format);
+ return FALSE;
+#endif
+ }
- bfd_has_map (abfd) = false;
- return true;
+ bfd_has_map (abfd) = FALSE;
+ return TRUE;
+}
+\f
+/* Returns FALSE on error, TRUE otherwise */
+/* flavor 2 of a bsd armap, similar to bfd_slurp_bsd_armap except the
+ header is in a slightly different order and the map name is '/'.
+ This flavour is used by hp300hpux. */
+
+#define HPUX_SYMDEF_COUNT_SIZE 2
+
+bfd_boolean
+bfd_slurp_bsd_armap_f2 (bfd *abfd)
+{
+ struct areltdata *mapdata;
+ char nextname[17];
+ unsigned int counter;
+ bfd_byte *raw_armap, *rbase;
+ struct artdata *ardata = bfd_ardata (abfd);
+ char *stringbase;
+ unsigned int stringsize;
+ bfd_size_type amt;
+ carsym *set;
+ int i = bfd_bread (nextname, 16, abfd);
+
+ if (i == 0)
+ return TRUE;
+ if (i != 16)
+ return FALSE;
+
+ /* The archive has at least 16 bytes in it. */
+ if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
+ return FALSE;
+
+ if (!strncmp (nextname, "__.SYMDEF ", 16)
+ || !strncmp (nextname, "__.SYMDEF/ ", 16)) /* old Linux archives */
+ return do_slurp_bsd_armap (abfd);
+
+ if (strncmp (nextname, "/ ", 16))
+ {
+ bfd_has_map (abfd) = FALSE;
+ return TRUE;
+ }
+
+ mapdata = _bfd_read_ar_hdr (abfd);
+ if (mapdata == NULL)
+ return FALSE;
+
+ amt = mapdata->parsed_size;
+ raw_armap = bfd_zalloc (abfd, amt);
+ if (raw_armap == NULL)
+ {
+ byebye:
+ bfd_release (abfd, mapdata);
+ return FALSE;
+ }
+
+ if (bfd_bread (raw_armap, amt, abfd) != amt)
+ {
+ if (bfd_get_error () != bfd_error_system_call)
+ bfd_set_error (bfd_error_malformed_archive);
+ byebyebye:
+ bfd_release (abfd, raw_armap);
+ goto byebye;
+ }
+
+ ardata->symdef_count = H_GET_16 (abfd, raw_armap);
+
+ if (ardata->symdef_count * BSD_SYMDEF_SIZE
+ > mapdata->parsed_size - HPUX_SYMDEF_COUNT_SIZE)
+ {
+ /* Probably we're using the wrong byte ordering. */
+ bfd_set_error (bfd_error_wrong_format);
+ goto byebyebye;
+ }
+
+ ardata->cache = 0;
+
+ stringsize = H_GET_32 (abfd, raw_armap + HPUX_SYMDEF_COUNT_SIZE);
+ /* Skip sym count and string sz. */
+ stringbase = ((char *) raw_armap
+ + HPUX_SYMDEF_COUNT_SIZE
+ + BSD_STRING_COUNT_SIZE);
+ rbase = (bfd_byte *) stringbase + stringsize;
+ amt = ardata->symdef_count * BSD_SYMDEF_SIZE;
+ ardata->symdefs = bfd_alloc (abfd, amt);
+ if (!ardata->symdefs)
+ return FALSE;
+
+ for (counter = 0, set = ardata->symdefs;
+ counter < ardata->symdef_count;
+ counter++, set++, rbase += BSD_SYMDEF_SIZE)
+ {
+ set->name = H_GET_32 (abfd, rbase) + stringbase;
+ set->file_offset = H_GET_32 (abfd, rbase + BSD_SYMDEF_OFFSET_SIZE);
+ }
+
+ ardata->first_file_filepos = bfd_tell (abfd);
+ /* Pad to an even boundary if you have to. */
+ ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
+ /* FIXME, we should provide some way to free raw_ardata when
+ we are done using the strings from it. For now, it seems
+ to be allocated on an objalloc anyway... */
+ bfd_has_map (abfd) = TRUE;
+ return TRUE;
}
\f
/** Extended name table.
element (the first in the archive, or second if there is an armap);
the name in the ar_hdr is replaced by <space><index into filename
element>. Index is the P.R. of an int (decimal). Data General have
- extended the format by using the prefix // for the special element */
+ extended the format by using the prefix // for the special element. */
+
+/* Returns FALSE on error, TRUE otherwise. */
-/* Returns false on error, true otherwise */
-boolean
-_bfd_slurp_extended_name_table (abfd)
- bfd *abfd;
+bfd_boolean
+_bfd_slurp_extended_name_table (bfd *abfd)
{
char nextname[17];
struct areltdata *namedata;
+ bfd_size_type amt;
/* FIXME: Formatting sucks here, and in case of failure of BFD_READ,
- we probably don't want to return true. */
- if (bfd_read ((PTR)nextname, 1, 16, abfd) == 16) {
-
- bfd_seek (abfd, (file_ptr) -16, SEEK_CUR);
+ we probably don't want to return TRUE. */
+ bfd_seek (abfd, bfd_ardata (abfd)->first_file_filepos, SEEK_SET);
+ if (bfd_bread (nextname, 16, abfd) == 16)
+ {
+ if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
+ return FALSE;
- if (strncmp (nextname, "ARFILENAMES/ ", 16) != 0 &&
- strncmp (nextname, "// ", 16) != 0)
+ if (strncmp (nextname, "ARFILENAMES/ ", 16) != 0 &&
+ strncmp (nextname, "// ", 16) != 0)
{
- bfd_ardata (abfd)->extended_names = NULL;
- return true;
- }
+ bfd_ardata (abfd)->extended_names = NULL;
+ return TRUE;
+ }
- namedata = snarf_ar_hdr (abfd);
- if (namedata == NULL) return false;
-
- bfd_ardata (abfd)->extended_names = bfd_zalloc(abfd,namedata->parsed_size);
- if (bfd_ardata (abfd)->extended_names == NULL) {
- bfd_error = no_memory;
- byebye:
- bfd_release (abfd, (PTR)namedata);
- return false;
- }
+ namedata = _bfd_read_ar_hdr (abfd);
+ if (namedata == NULL)
+ return FALSE;
- if (bfd_read ((PTR)bfd_ardata (abfd)->extended_names, 1,
- namedata->parsed_size, abfd) != namedata->parsed_size) {
- bfd_error = malformed_archive;
- bfd_release (abfd, (PTR)(bfd_ardata (abfd)->extended_names));
- bfd_ardata (abfd)->extended_names = NULL;
- goto byebye;
- }
+ amt = namedata->parsed_size;
+ bfd_ardata (abfd)->extended_names = bfd_zalloc (abfd, amt);
+ if (bfd_ardata (abfd)->extended_names == NULL)
+ {
+ byebye:
+ bfd_release (abfd, namedata);
+ return FALSE;
+ }
+
+ if (bfd_bread (bfd_ardata (abfd)->extended_names, amt, abfd) != amt)
+ {
+ if (bfd_get_error () != bfd_error_system_call)
+ bfd_set_error (bfd_error_malformed_archive);
+ bfd_release (abfd, (bfd_ardata (abfd)->extended_names));
+ bfd_ardata (abfd)->extended_names = NULL;
+ goto byebye;
+ }
- /* Since the archive is supposed to be printable if it contains
- text, the entries in the list are newline-padded, not null
- padded. In SVR4-style archives, the names also have a
- trailing '/'. We'll fix both problems here.. */
+ /* Since the archive is supposed to be printable if it contains
+ text, the entries in the list are newline-padded, not null
+ padded. In SVR4-style archives, the names also have a
+ trailing '/'. DOS/NT created archive often have \ in them
+ We'll fix all problems here.. */
{
char *temp = bfd_ardata (abfd)->extended_names;
char *limit = temp + namedata->parsed_size;
for (; temp < limit; ++temp)
- if (*temp == '\n')
- temp[temp[-1] == '/' ? -1 : 0] = '\0';
+ {
+ if (*temp == '\012')
+ temp[temp[-1] == '/' ? -1 : 0] = '\0';
+ if (*temp == '\\')
+ *temp = '/';
+ }
}
-
- /* Pad to an even boundary if you have to */
- bfd_ardata (abfd)->first_file_filepos = bfd_tell (abfd);
- bfd_ardata (abfd)->first_file_filepos +=
- (bfd_ardata (abfd)->first_file_filepos) %2;
-
- /* FIXME, we can't release namedata here because it was allocated
- below extended_names on the obstack... */
- /* bfd_release (abfd, namedata); */
- }
- return true;
+
+ /* Pad to an even boundary if you have to. */
+ bfd_ardata (abfd)->first_file_filepos = bfd_tell (abfd);
+ bfd_ardata (abfd)->first_file_filepos +=
+ (bfd_ardata (abfd)->first_file_filepos) % 2;
+
+ /* FIXME, we can't release namedata here because it was allocated
+ below extended_names on the objalloc... */
+#if 0
+ bfd_release (abfd, namedata);
+#endif
+ }
+ return TRUE;
}
#ifdef VMS
/* Return a copy of the stuff in the filename between any :]> and a
- semicolon */
-static CONST char *
-DEFUN(normalize,(file),
- CONST char *file)
+ semicolon. */
+
+static const char *
+normalize (bfd *abfd, const char *file)
{
- CONST char *first;
- CONST char *last;
+ const char *first;
+ const char *last;
char *copy;
- first = file + strlen(file)-1;
- last = first+1;
+ first = file + strlen (file) - 1;
+ last = first + 1;
- while (first != file)
- {
- if (*first == ';')
- last = first;
- if (*first == ':' || *first == ']' ||*first == '>')
- {
- first++;
- break;
+ while (first != file)
+ {
+ if (*first == ';')
+ last = first;
+ if (*first == ':' || *first == ']' || *first == '>')
+ {
+ first++;
+ break;
+ }
+ first--;
}
- first --;
- }
-
- copy = malloc(last - first + 1);
- memcpy(copy, first, last-first);
- copy[last-first] = 0;
+ copy = bfd_alloc (abfd, last - first + 1);
+ if (copy == NULL)
+ return NULL;
+
+ memcpy (copy, first, last - first);
+ copy[last - first] = 0;
return copy;
}
#else
-static
-CONST char *normalize(file)
-CONST char *file;
+static const char *
+normalize (bfd *abfd ATTRIBUTE_UNUSED, const char *file)
{
- CONST char * filename = strrchr(file, '/');
+ const char *filename = strrchr (file, '/');
- if (filename != (char *)NULL) {
- filename ++;
- }
- else {
- filename = file;
- }
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
+ {
+ /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */
+ char *bslash = strrchr (file, '\\');
+ if (filename == NULL || (bslash != NULL && bslash > filename))
+ filename = bslash;
+ if (filename == NULL && file[0] != '\0' && file[1] == ':')
+ filename = file + 1;
+ }
+#endif
+ if (filename != NULL)
+ filename++;
+ else
+ filename = file;
return filename;
}
#endif
-/* Follows archive_head and produces an extended name table if necessary.
- Returns (in tabloc) a pointer to an extended name table, and in tablen
- the length of the table. If it makes an entry it clobbers the filename
- so that the element may be written without further massage.
- Returns true if it ran successfully, false if something went wrong.
- A successful return may still involve a zero-length tablen!
- */
-boolean
-bfd_construct_extended_name_table (abfd, tabloc, tablen)
- bfd *abfd;
- char **tabloc;
- unsigned int *tablen;
+
+/* Build a BFD style extended name table. */
+
+bfd_boolean
+_bfd_archive_bsd_construct_extended_name_table (bfd *abfd,
+ char **tabloc,
+ bfd_size_type *tablen,
+ const char **name)
+{
+ *name = "ARFILENAMES/";
+ return _bfd_construct_extended_name_table (abfd, FALSE, tabloc, tablen);
+}
+
+/* Build an SVR4 style extended name table. */
+
+bfd_boolean
+_bfd_archive_coff_construct_extended_name_table (bfd *abfd,
+ char **tabloc,
+ bfd_size_type *tablen,
+ const char **name)
+{
+ *name = "//";
+ return _bfd_construct_extended_name_table (abfd, TRUE, tabloc, tablen);
+}
+
+/* Follows archive_head and produces an extended name table if
+ necessary. Returns (in tabloc) a pointer to an extended name
+ table, and in tablen the length of the table. If it makes an entry
+ it clobbers the filename so that the element may be written without
+ further massage. Returns TRUE if it ran successfully, FALSE if
+ something went wrong. A successful return may still involve a
+ zero-length tablen! */
+
+bfd_boolean
+_bfd_construct_extended_name_table (bfd *abfd,
+ bfd_boolean trailing_slash,
+ char **tabloc,
+ bfd_size_type *tablen)
{
unsigned int maxname = abfd->xvec->ar_max_namelen;
- unsigned int total_namelen = 0;
+ bfd_size_type total_namelen = 0;
bfd *current;
char *strptr;
*tablen = 0;
-
- /* Figure out how long the table should be */
- for (current = abfd->archive_head; current != NULL; current = current->next){
- unsigned int thislen = strlen (normalize(current->filename));
- if (thislen > maxname) total_namelen += thislen + 1; /* leave room for \n */
- }
- if (total_namelen == 0) return true;
+ /* Figure out how long the table should be. */
+ for (current = abfd->archive_head; current != NULL; current = current->next)
+ {
+ const char *normal;
+ unsigned int thislen;
- *tabloc = bfd_zalloc (abfd,total_namelen);
- if (*tabloc == NULL) {
- bfd_error = no_memory;
- return false;
- }
+ normal = normalize (current, current->filename);
+ if (normal == NULL)
+ return FALSE;
+
+ thislen = strlen (normal);
+
+ if (thislen > maxname
+ && (bfd_get_file_flags (abfd) & BFD_TRADITIONAL_FORMAT) != 0)
+ thislen = maxname;
+
+ if (thislen > maxname)
+ {
+ /* Add one to leave room for \n. */
+ total_namelen += thislen + 1;
+ if (trailing_slash)
+ {
+ /* Leave room for trailing slash. */
+ ++total_namelen;
+ }
+ }
+ else
+ {
+ struct ar_hdr *hdr = arch_hdr (current);
+ if (strncmp (normal, hdr->ar_name, thislen) != 0
+ || (thislen < sizeof hdr->ar_name
+ && hdr->ar_name[thislen] != ar_padchar (current)))
+ {
+ /* Must have been using extended format even though it
+ didn't need to. Fix it to use normal format. */
+ memcpy (hdr->ar_name, normal, thislen);
+ if (thislen < maxname
+ || (thislen == maxname && thislen < sizeof hdr->ar_name))
+ hdr->ar_name[thislen] = ar_padchar (current);
+ }
+ }
+ }
+
+ if (total_namelen == 0)
+ return TRUE;
+
+ *tabloc = bfd_zalloc (abfd, total_namelen);
+ if (*tabloc == NULL)
+ return FALSE;
*tablen = total_namelen;
strptr = *tabloc;
for (current = abfd->archive_head; current != NULL; current =
- current->next) {
- CONST char *normal =normalize( current->filename);
- unsigned int thislen = strlen (normal);
- if (thislen > maxname) {
- /* Works for now; may need to be re-engineered if we encounter an oddball
- archive format and want to generalise this hack. */
- struct ar_hdr *hdr = arch_hdr(current);
- strcpy (strptr, normal);
- strptr[thislen] = '\n';
- hdr->ar_name[0] = ' ';
- /* We know there will always be enough room (one of the few cases
- where you may safely use sprintf). */
- sprintf ((hdr->ar_name) + 1, "%-d", (unsigned) (strptr - *tabloc));
- /* Kinda Kludgy. We should just use the returned value of sprintf
- but not all implementations get this right */
+ current->next)
+ {
+ const char *normal;
+ unsigned int thislen;
+
+ normal = normalize (current, current->filename);
+ if (normal == NULL)
+ return FALSE;
+
+ thislen = strlen (normal);
+ if (thislen > maxname)
{
- char *temp = hdr->ar_name +2;
- for (; temp < hdr->ar_name + maxname; temp++)
- if (*temp == '\0') *temp = ' ';
+ /* Works for now; may need to be re-engineered if we
+ encounter an oddball archive format and want to
+ generalise this hack. */
+ struct ar_hdr *hdr = arch_hdr (current);
+ strcpy (strptr, normal);
+ if (! trailing_slash)
+ strptr[thislen] = '\012';
+ else
+ {
+ strptr[thislen] = '/';
+ strptr[thislen + 1] = '\012';
+ }
+ hdr->ar_name[0] = ar_padchar (current);
+ /* We know there will always be enough room (one of the few
+ cases where you may safely use sprintf). */
+ sprintf ((hdr->ar_name) + 1, "%-d", (unsigned) (strptr - *tabloc));
+ /* Kinda Kludgy. We should just use the returned value of
+ sprintf but not all implementations get this right. */
+ {
+ char *temp = hdr->ar_name + 2;
+ for (; temp < hdr->ar_name + maxname; temp++)
+ if (*temp == '\0')
+ *temp = ' ';
+ }
+ strptr += thislen + 1;
+ if (trailing_slash)
+ ++strptr;
}
- strptr += thislen + 1;
}
- }
- return true;
+ return TRUE;
}
\f
/** A couple of functions for creating ar_hdrs */
-/* Takes a filename, returns an arelt_data for it, or NULL if it can't make one.
- The filename must refer to a filename in the filesystem.
- The filename field of the ar_hdr will NOT be initialized
-*/
+#ifdef HPUX_LARGE_AR_IDS
+/* Function to encode large UID/GID values according to HP. */
+
+static void
+hpux_uid_gid_encode (char str[6], long int id)
+{
+ int cnt;
+
+ str[5] = '@' + (id & 3);
+ id >>= 2;
+
+ for (cnt = 4; cnt >= 0; ++cnt, id >>= 6)
+ str[cnt] = ' ' + (id & 0x3f);
+}
+#endif /* HPUX_LARGE_AR_IDS */
+
+#ifndef HAVE_GETUID
+#define getuid() 0
+#endif
+
+#ifndef HAVE_GETGID
+#define getgid() 0
+#endif
+
+/* Takes a filename, returns an arelt_data for it, or NULL if it can't
+ make one. The filename must refer to a filename in the filesystem.
+ The filename field of the ar_hdr will NOT be initialized. If member
+ is set, and it's an in-memory bfd, we fake it. */
-struct areltdata *
-DEFUN(bfd_ar_hdr_from_filesystem, (abfd,filename),
- bfd* abfd AND
- CONST char *filename)
+static struct areltdata *
+bfd_ar_hdr_from_filesystem (bfd *abfd, const char *filename, bfd *member)
{
struct stat status;
struct areltdata *ared;
struct ar_hdr *hdr;
char *temp, *temp1;
+ bfd_size_type amt;
+ if (member && (member->flags & BFD_IN_MEMORY) != 0)
+ {
+ /* Assume we just "made" the member, and fake it. */
+ struct bfd_in_memory *bim = member->iostream;
+ time (&status.st_mtime);
+ status.st_uid = getuid ();
+ status.st_gid = getgid ();
+ status.st_mode = 0644;
+ status.st_size = bim->size;
+ }
+ else if (stat (filename, &status) != 0)
+ {
+ bfd_set_error (bfd_error_system_call);
+ return NULL;
+ }
- if (stat (filename, &status) != 0) {
- bfd_error = system_call_error;
- return NULL;
- }
-
- ared = (struct areltdata *) bfd_zalloc(abfd, sizeof (struct ar_hdr) +
- sizeof (struct areltdata));
- if (ared == NULL) {
- bfd_error = no_memory;
+ amt = sizeof (struct ar_hdr) + sizeof (struct areltdata);
+ ared = bfd_zalloc (abfd, amt);
+ if (ared == NULL)
return NULL;
- }
hdr = (struct ar_hdr *) (((char *) ared) + sizeof (struct areltdata));
- /* ar headers are space padded, not null padded! */
- temp = (char *) hdr;
- temp1 = temp + sizeof (struct ar_hdr) - 2;
- for (; temp < temp1; *(temp++) = ' ');
+ /* ar headers are space padded, not null padded! */
+ memset (hdr, ' ', sizeof (struct ar_hdr));
+
strncpy (hdr->ar_fmag, ARFMAG, 2);
-
- /* Goddamned sprintf doesn't permit MAXIMUM field lengths */
- sprintf ((hdr->ar_date), "%-12ld", status.st_mtime);
- sprintf ((hdr->ar_uid), "%d", status.st_uid);
- sprintf ((hdr->ar_gid), "%d", status.st_gid);
- sprintf ((hdr->ar_mode), "%-8o", (unsigned) status.st_mode);
- sprintf ((hdr->ar_size), "%-10ld", status.st_size);
+
+ /* Goddamned sprintf doesn't permit MAXIMUM field lengths. */
+ sprintf ((hdr->ar_date), "%-12ld", (long) status.st_mtime);
+#ifdef HPUX_LARGE_AR_IDS
+ /* HP has a very "special" way to handle UID/GID's with numeric values
+ > 99999. */
+ if (status.st_uid > 99999)
+ hpux_uid_gid_encode (hdr->ar_gid, (long) status.st_uid);
+ else
+#endif
+ sprintf ((hdr->ar_uid), "%ld", (long) status.st_uid);
+#ifdef HPUX_LARGE_AR_IDS
+ /* HP has a very "special" way to handle UID/GID's with numeric values
+ > 99999. */
+ if (status.st_gid > 99999)
+ hpux_uid_gid_encode (hdr->ar_uid, (long) status.st_gid);
+ else
+#endif
+ sprintf ((hdr->ar_gid), "%ld", (long) status.st_gid);
+ sprintf ((hdr->ar_mode), "%-8o", (unsigned int) status.st_mode);
+ sprintf ((hdr->ar_size), "%-10ld", (long) status.st_size);
/* Correct for a lossage in sprintf whereby it null-terminates. I cannot
understand how these C losers could design such a ramshackle bunch of
- IO operations */
+ IO operations. */
temp = (char *) hdr;
temp1 = temp + sizeof (struct ar_hdr) - 2;
- for (; temp < temp1; temp++) {
- if (*temp == '\0') *temp = ' ';
- }
+ for (; temp < temp1; temp++)
+ {
+ if (*temp == '\0')
+ *temp = ' ';
+ }
strncpy (hdr->ar_fmag, ARFMAG, 2);
ared->parsed_size = status.st_size;
ared->arch_header = (char *) hdr;
}
/* This is magic required by the "ar" program. Since it's
- undocumented, it's undocumented. You may think that it would
- take a strong stomach to write this, and it does, but it takes
- even a stronger stomach to try to code around such a thing!
-*/
+ undocumented, it's undocumented. You may think that it would take
+ a strong stomach to write this, and it does, but it takes even a
+ stronger stomach to try to code around such a thing! */
+
+struct ar_hdr *bfd_special_undocumented_glue (bfd *, const char *);
struct ar_hdr *
-DEFUN(bfd_special_undocumented_glue, (abfd, filename),
- bfd *abfd AND
- char *filename)
+bfd_special_undocumented_glue (bfd *abfd, const char *filename)
{
- struct areltdata *ar_elt = bfd_ar_hdr_from_filesystem (abfd, filename);
+ struct areltdata *ar_elt = bfd_ar_hdr_from_filesystem (abfd, filename, 0);
if (ar_elt == NULL)
- return NULL;
+ return NULL;
return (struct ar_hdr *) ar_elt->arch_header;
}
+/* Analogous to stat call. */
-/* Analogous to stat call */
int
-bfd_generic_stat_arch_elt (abfd, buf)
- bfd *abfd;
- struct stat *buf;
+bfd_generic_stat_arch_elt (bfd *abfd, struct stat *buf)
{
struct ar_hdr *hdr;
char *aloser;
-
- if (abfd->arelt_data == NULL) {
- bfd_error = invalid_operation;
- return -1;
- }
-
+
+ if (abfd->arelt_data == NULL)
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return -1;
+ }
+
hdr = arch_hdr (abfd);
-#define foo(arelt, stelt, size) \
- buf->stelt = strtol (hdr->arelt, &aloser, size); \
- if (aloser == hdr->arelt) return -1;
-
+#define foo(arelt, stelt, size) \
+ buf->stelt = strtol (hdr->arelt, &aloser, size); \
+ if (aloser == hdr->arelt) \
+ return -1;
+
+ /* Some platforms support special notations for large IDs. */
+#ifdef HPUX_LARGE_AR_IDS
+# define foo2(arelt, stelt, size) \
+ if (hdr->arelt[5] == ' ') \
+ { \
+ foo (arelt, stelt, size); \
+ } \
+ else \
+ { \
+ int cnt; \
+ for (buf->stelt = cnt = 0; cnt < 5; ++cnt) \
+ { \
+ if (hdr->arelt[cnt] < ' ' || hdr->arelt[cnt] > ' ' + 0x3f) \
+ return -1; \
+ buf->stelt <<= 6; \
+ buf->stelt += hdr->arelt[cnt] - ' '; \
+ } \
+ if (hdr->arelt[5] < '@' || hdr->arelt[5] > '@' + 3) \
+ return -1; \
+ buf->stelt <<= 2; \
+ buf->stelt += hdr->arelt[5] - '@'; \
+ }
+#else
+# define foo2(arelt, stelt, size) foo (arelt, stelt, size)
+#endif
+
foo (ar_date, st_mtime, 10);
- foo (ar_uid, st_uid, 10);
- foo (ar_gid, st_gid, 10);
+ foo2 (ar_uid, st_uid, 10);
+ foo2 (ar_gid, st_gid, 10);
foo (ar_mode, st_mode, 8);
- foo (ar_size, st_size, 10);
+
+ buf->st_size = arch_eltdata (abfd)->parsed_size;
return 0;
}
void
-bfd_dont_truncate_arname (abfd, pathname, arhdr)
- bfd *abfd;
- CONST char *pathname;
- char *arhdr;
+bfd_dont_truncate_arname (bfd *abfd, const char *pathname, char *arhdr)
{
/* FIXME: This interacts unpleasantly with ar's quick-append option.
Fortunately ic960 users will never use that option. Fixing this
is very hard; fortunately I know how to do it and will do so once
- intel's release is out the door. */
-
+ intel's release is out the door. */
+
struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
- int length;
- CONST char *filename = normalize(pathname);
- int maxlen = ar_maxnamelen (abfd);
+ size_t length;
+ const char *filename;
+ size_t maxlen = ar_maxnamelen (abfd);
+
+ if ((bfd_get_file_flags (abfd) & BFD_TRADITIONAL_FORMAT) != 0)
+ {
+ bfd_bsd_truncate_arname (abfd, pathname, arhdr);
+ return;
+ }
+
+ filename = normalize (abfd, pathname);
+ if (filename == NULL)
+ {
+ /* FIXME */
+ abort ();
+ }
length = strlen (filename);
if (length <= maxlen)
memcpy (hdr->ar_name, filename, length);
- if (length < maxlen) (hdr->ar_name)[length] = ar_padchar (abfd);
- return;
-
+ /* Add the padding character if there is room for it. */
+ if (length < maxlen
+ || (length == maxlen && length < sizeof hdr->ar_name))
+ (hdr->ar_name)[length] = ar_padchar (abfd);
}
void
-bfd_bsd_truncate_arname (abfd, pathname, arhdr)
- bfd *abfd;
- CONST char *pathname;
- char *arhdr;
+bfd_bsd_truncate_arname (bfd *abfd, const char *pathname, char *arhdr)
{
struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
- int length;
- CONST char *filename = strrchr (pathname, '/');
- int maxlen = ar_maxnamelen (abfd);
+ size_t length;
+ const char *filename = strrchr (pathname, '/');
+ size_t maxlen = ar_maxnamelen (abfd);
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
+ {
+ /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */
+ char *bslash = strrchr (pathname, '\\');
+ if (filename == NULL || (bslash != NULL && bslash > filename))
+ filename = bslash;
+ if (filename == NULL && pathname[0] != '\0' && pathname[1] == ':')
+ filename = pathname + 1;
+ }
+#endif
if (filename == NULL)
filename = pathname;
if (length <= maxlen)
memcpy (hdr->ar_name, filename, length);
- else {
- /* pathname: meet procrustes */
- memcpy (hdr->ar_name, filename, maxlen);
- length = maxlen;
- }
+ else
+ {
+ /* pathname: meet procrustes */
+ memcpy (hdr->ar_name, filename, maxlen);
+ length = maxlen;
+ }
- if (length < maxlen) (hdr->ar_name)[length] = ar_padchar (abfd);
+ if (length < maxlen)
+ (hdr->ar_name)[length] = ar_padchar (abfd);
}
/* Store name into ar header. Truncates the name to fit.
1> strip pathname to be just the basename.
2> if it's short enuf to fit, stuff it in.
3> If it doesn't end with .o, truncate it to fit
- 4> truncate it before the .o, append .o, stuff THAT in.
-*/
+ 4> truncate it before the .o, append .o, stuff THAT in. */
+
+/* This is what gnu ar does. It's better but incompatible with the
+ bsd ar. */
-/* This is what gnu ar does. It's better but incompatible with the bsd ar. */
void
-bfd_gnu_truncate_arname (abfd, pathname, arhdr)
- bfd *abfd;
- CONST char *pathname;
- char *arhdr;
+bfd_gnu_truncate_arname (bfd *abfd, const char *pathname, char *arhdr)
{
struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
- int length;
- CONST char *filename = strrchr (pathname, '/');
- int maxlen = ar_maxnamelen (abfd);
-
+ size_t length;
+ const char *filename = strrchr (pathname, '/');
+ size_t maxlen = ar_maxnamelen (abfd);
+
+#ifdef HAVE_DOS_BASED_FILE_SYSTEM
+ {
+ /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */
+ char *bslash = strrchr (pathname, '\\');
+ if (filename == NULL || (bslash != NULL && bslash > filename))
+ filename = bslash;
+ if (filename == NULL && pathname[0] != '\0' && pathname[1] == ':')
+ filename = pathname + 1;
+ }
+#endif
+
if (filename == NULL)
filename = pathname;
else
if (length <= maxlen)
memcpy (hdr->ar_name, filename, length);
- else { /* pathname: meet procrustes */
- memcpy (hdr->ar_name, filename, maxlen);
- if ((filename[length - 2] == '.') && (filename[length - 1] == 'o')) {
- hdr->ar_name[maxlen - 2] = '.';
- hdr->ar_name[maxlen - 1] = 'o';
+ else
+ { /* pathname: meet procrustes */
+ memcpy (hdr->ar_name, filename, maxlen);
+ if ((filename[length - 2] == '.') && (filename[length - 1] == 'o'))
+ {
+ hdr->ar_name[maxlen - 2] = '.';
+ hdr->ar_name[maxlen - 1] = 'o';
+ }
+ length = maxlen;
}
- length = maxlen;
- }
- if (length < 16) (hdr->ar_name)[length] = ar_padchar (abfd);
+ if (length < 16)
+ (hdr->ar_name)[length] = ar_padchar (abfd);
}
\f
+/* The BFD is open for write and has its format set to bfd_archive. */
-PROTO (boolean, compute_and_write_armap, (bfd *arch, unsigned int elength));
-
-/* The BFD is open for write and has its format set to bfd_archive */
-boolean
-_bfd_write_archive_contents (arch)
- bfd *arch;
+bfd_boolean
+_bfd_write_archive_contents (bfd *arch)
{
bfd *current;
char *etable = NULL;
- unsigned int elength = 0;
-
- boolean makemap = bfd_has_map (arch);
- boolean hasobjects = false; /* if no .o's, don't bother to make a map */
+ bfd_size_type elength = 0;
+ const char *ename = NULL;
+ bfd_boolean makemap = bfd_has_map (arch);
+ /* If no .o's, don't bother to make a map. */
+ bfd_boolean hasobjects = FALSE;
+ bfd_size_type wrote;
unsigned int i;
+ int tries;
/* Verify the viability of all entries; if any of them live in the
filesystem (as opposed to living in an archive open for input)
- then construct a fresh ar_hdr for them.
- */
- for (current = arch->archive_head; current; current = current->next) {
- if (bfd_write_p (current)) {
- bfd_error = invalid_operation;
- return false;
- }
- if (!current->arelt_data) {
- current->arelt_data =
- (PTR) bfd_ar_hdr_from_filesystem (arch, current->filename);
- if (!current->arelt_data) return false;
-
- /* Put in the file name */
-
- BFD_SEND (arch, _bfd_truncate_arname,(arch,
- current->filename,
- (char *) arch_hdr(current)));
-
-
- }
+ then construct a fresh ar_hdr for them. */
+ for (current = arch->archive_head; current; current = current->next)
+ {
+ /* This check is checking the bfds for the objects we're reading
+ from (which are usually either an object file or archive on
+ disk), not the archive entries we're writing to. We don't
+ actually create bfds for the archive members, we just copy
+ them byte-wise when we write out the archive. */
+ if (bfd_write_p (current))
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return FALSE;
+ }
+ if (!current->arelt_data)
+ {
+ current->arelt_data =
+ bfd_ar_hdr_from_filesystem (arch, current->filename, current);
+ if (!current->arelt_data)
+ return FALSE;
+
+ /* Put in the file name. */
+ BFD_SEND (arch, _bfd_truncate_arname,
+ (arch, current->filename, (char *) arch_hdr (current)));
+ }
- if (makemap) { /* don't bother if we won't make a map! */
- if ((bfd_check_format (current, bfd_object))
+ if (makemap && ! hasobjects)
+ { /* Don't bother if we won't make a map! */
+ if ((bfd_check_format (current, bfd_object))
#if 0 /* FIXME -- these are not set correctly */
- && ((bfd_get_file_flags (current) & HAS_SYMS))
+ && ((bfd_get_file_flags (current) & HAS_SYMS))
#endif
- )
- hasobjects = true;
+ )
+ hasobjects = TRUE;
+ }
}
- }
- if (!bfd_construct_extended_name_table (arch, &etable, &elength))
- return false;
+ if (!BFD_SEND (arch, _bfd_construct_extended_name_table,
+ (arch, &etable, &elength, &ename)))
+ return FALSE;
- bfd_seek (arch, (file_ptr) 0, SEEK_SET);
+ if (bfd_seek (arch, (file_ptr) 0, SEEK_SET) != 0)
+ return FALSE;
#ifdef GNU960
- bfd_write (BFD_GNU960_ARMAG(arch), 1, SARMAG, arch);
+ wrote = bfd_bwrite (BFD_GNU960_ARMAG (arch), SARMAG, arch);
#else
- bfd_write (ARMAG, 1, SARMAG, arch);
+ wrote = bfd_bwrite (ARMAG, SARMAG, arch);
#endif
+ if (wrote != SARMAG)
+ return FALSE;
- if (makemap && hasobjects) {
-
- if (compute_and_write_armap (arch, elength) != true) {
- return false;
+ if (makemap && hasobjects)
+ {
+ if (! _bfd_compute_and_write_armap (arch, (unsigned int) elength))
+ return FALSE;
}
- }
-
- if (elength != 0) {
- struct ar_hdr hdr;
-
- memset ((char *)(&hdr), 0, sizeof (struct ar_hdr));
- sprintf (&(hdr.ar_name[0]), "ARFILENAMES/");
- sprintf (&(hdr.ar_size[0]), "%-10d", (int) elength);
- hdr.ar_fmag[0] = '`'; hdr.ar_fmag[1] = '\n';
- for (i = 0; i < sizeof (struct ar_hdr); i++)
- if (((char *)(&hdr))[i] == '\0') (((char *)(&hdr))[i]) = ' ';
- bfd_write ((char *)&hdr, 1, sizeof (struct ar_hdr), arch);
- bfd_write (etable, 1, elength, arch);
- if ((elength % 2) == 1) bfd_write ("\n", 1, 1, arch);
-
- }
- for (current = arch->archive_head; current; current = current->next) {
- char buffer[DEFAULT_BUFFERSIZE];
- unsigned int remaining = arelt_size (current);
- struct ar_hdr *hdr = arch_hdr(current);
- /* write ar header */
+ if (elength != 0)
+ {
+ struct ar_hdr hdr;
+
+ memset (&hdr, 0, sizeof (struct ar_hdr));
+ strcpy (hdr.ar_name, ename);
+ /* Round size up to even number in archive header. */
+ sprintf (&(hdr.ar_size[0]), "%-10d",
+ (int) ((elength + 1) & ~(bfd_size_type) 1));
+ strncpy (hdr.ar_fmag, ARFMAG, 2);
+ for (i = 0; i < sizeof (struct ar_hdr); i++)
+ if (((char *) (&hdr))[i] == '\0')
+ (((char *) (&hdr))[i]) = ' ';
+ if ((bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch)
+ != sizeof (struct ar_hdr))
+ || bfd_bwrite (etable, elength, arch) != elength)
+ return FALSE;
+ if ((elength % 2) == 1)
+ {
+ if (bfd_bwrite ("\012", 1, arch) != 1)
+ return FALSE;
+ }
+ }
- if (bfd_write ((char *)hdr, 1, sizeof(*hdr), arch) != sizeof(*hdr)) {
- syserr:
- bfd_error = system_call_error;
- return false;
- }
- if (bfd_seek (current, (file_ptr) 0, SEEK_SET) != 0) goto syserr;
- while (remaining)
+ for (current = arch->archive_head; current; current = current->next)
+ {
+ char buffer[DEFAULT_BUFFERSIZE];
+ unsigned int remaining = arelt_size (current);
+ struct ar_hdr *hdr = arch_hdr (current);
+
+ /* Write ar header. */
+ if (bfd_bwrite (hdr, sizeof (*hdr), arch)
+ != sizeof (*hdr))
+ return FALSE;
+ if (bfd_seek (current, (file_ptr) 0, SEEK_SET) != 0)
+ return FALSE;
+ while (remaining)
{
unsigned int amt = DEFAULT_BUFFERSIZE;
- if (amt > remaining) {
+ 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;
- }
- if (bfd_write (buffer, amt, 1, arch) != amt) goto syserr;
+ if (bfd_bread (buffer, amt, current) != amt)
+ {
+ if (bfd_get_error () != bfd_error_system_call)
+ bfd_set_error (bfd_error_malformed_archive);
+ return FALSE;
+ }
+ if (bfd_bwrite (buffer, amt, arch) != amt)
+ return FALSE;
remaining -= amt;
}
- if ((arelt_size (current) % 2) == 1) bfd_write ("\n", 1, 1, arch);
- }
-return true;
-}
-\f
-/* Note that the namidx for the first symbol is 0 */
-
-boolean
-compute_and_write_armap (arch, elength)
- bfd *arch;
- unsigned int elength;
-{
- bfd *current;
- file_ptr elt_no = 0;
- struct orl *map;
- int orl_max = 15000; /* fine initial default */
- int orl_count = 0;
- int stridx = 0; /* string index */
-
- /* Dunno if this is the best place for this info... */
- if (elength != 0) elength += sizeof (struct ar_hdr);
- elength += elength %2 ;
-
- map = (struct orl *) bfd_zalloc (arch,orl_max * sizeof (struct orl));
- if (map == NULL) {
- bfd_error = no_memory;
- return false;
+ if ((arelt_size (current) % 2) == 1)
+ {
+ if (bfd_bwrite ("\012", 1, arch) != 1)
+ return FALSE;
}
+ }
- /* Drop all the files called __.SYMDEF, we're going to make our
- own */
- while (arch->archive_head &&
- strcmp(arch->archive_head->filename,"__.SYMDEF") == 0)
+ if (makemap && hasobjects)
{
- arch->archive_head = arch->archive_head->next;
+ /* Verify the timestamp in the archive file. If it would not be
+ accepted by the linker, rewrite it until it would be. If
+ anything odd happens, break out and just return. (The
+ Berkeley linker checks the timestamp and refuses to read the
+ table-of-contents if it is >60 seconds less than the file's
+ modified-time. That painful hack requires this painful hack. */
+ tries = 1;
+ do
+ {
+ if (bfd_update_armap_timestamp (arch))
+ break;
+ (*_bfd_error_handler)
+ (_("Warning: writing archive was slow: rewriting timestamp\n"));
+ }
+ while (++tries < 6);
}
- /* Map over each element */
- for (current = arch->archive_head;
- current != (bfd *)NULL;
- current = current->next, elt_no++)
+
+ return TRUE;
+}
+\f
+/* Note that the namidx for the first symbol is 0. */
+
+bfd_boolean
+_bfd_compute_and_write_armap (bfd *arch, unsigned int elength)
+{
+ char *first_name = NULL;
+ bfd *current;
+ file_ptr elt_no = 0;
+ struct orl *map = NULL;
+ unsigned int orl_max = 1024; /* fine initial default */
+ unsigned int orl_count = 0;
+ int stridx = 0; /* string index */
+ asymbol **syms = NULL;
+ long syms_max = 0;
+ bfd_boolean ret;
+ bfd_size_type amt;
+
+ /* Dunno if this is the best place for this info... */
+ if (elength != 0)
+ elength += sizeof (struct ar_hdr);
+ elength += elength % 2;
+
+ amt = orl_max * sizeof (struct orl);
+ map = bfd_malloc (amt);
+ if (map == NULL)
+ goto error_return;
+
+ /* We put the symbol names on the arch objalloc, and then discard
+ them when done. */
+ first_name = bfd_alloc (arch, 1);
+ if (first_name == NULL)
+ goto error_return;
+
+ /* Drop all the files called __.SYMDEF, we're going to make our own. */
+ while (arch->archive_head &&
+ strcmp (arch->archive_head->filename, "__.SYMDEF") == 0)
+ arch->archive_head = arch->archive_head->next;
+
+ /* Map over each element. */
+ for (current = arch->archive_head;
+ current != NULL;
+ current = current->next, elt_no++)
{
- if ((bfd_check_format (current, bfd_object) == true)
- && ((bfd_get_file_flags (current) & HAS_SYMS))) {
- asymbol **syms;
- unsigned int storage;
- unsigned int symcount;
- unsigned int src_count;
-
- storage = get_symtab_upper_bound (current);
- if (storage != 0) {
-
- syms = (asymbol **) bfd_zalloc (arch,storage);
- if (syms == NULL) {
- bfd_error = no_memory; /* FIXME -- memory leak */
- return false;
- }
- symcount = bfd_canonicalize_symtab (current, syms);
-
-
- /* Now map over all the symbols, picking out the ones we want */
- for (src_count = 0; src_count <symcount; src_count++) {
- flagword flags =
- (syms[src_count])->flags;
- asection *sec =
- syms[src_count]->section;
-
- if ((flags & BSF_GLOBAL ||
- flags & BSF_INDIRECT ||
- sec == &bfd_com_section)
- && (sec != &bfd_und_section)) {
-
- /* This symbol will go into the archive header */
- if (orl_count == orl_max)
- {
- orl_max *= 2;
- map = (struct orl *) bfd_realloc (arch, (char *) map,
- orl_max * sizeof (struct orl));
- }
-
- (map[orl_count]).name = (char **) &((syms[src_count])->name);
- (map[orl_count]).pos = (file_ptr) current;
- (map[orl_count]).namidx = stridx;
-
- stridx += strlen ((syms[src_count])->name) + 1;
- ++orl_count;
- }
- }
+ if (bfd_check_format (current, bfd_object)
+ && (bfd_get_file_flags (current) & HAS_SYMS) != 0)
+ {
+ long storage;
+ long symcount;
+ long src_count;
+
+ storage = bfd_get_symtab_upper_bound (current);
+ if (storage < 0)
+ goto error_return;
+
+ if (storage != 0)
+ {
+ if (storage > syms_max)
+ {
+ if (syms_max > 0)
+ free (syms);
+ syms_max = storage;
+ syms = bfd_malloc (syms_max);
+ if (syms == NULL)
+ goto error_return;
+ }
+ symcount = bfd_canonicalize_symtab (current, syms);
+ if (symcount < 0)
+ goto error_return;
+
+ /* Now map over all the symbols, picking out the ones we
+ want. */
+ for (src_count = 0; src_count < symcount; src_count++)
+ {
+ flagword flags = (syms[src_count])->flags;
+ asection *sec = syms[src_count]->section;
+
+ if ((flags & BSF_GLOBAL ||
+ flags & BSF_WEAK ||
+ flags & BSF_INDIRECT ||
+ bfd_is_com_section (sec))
+ && ! bfd_is_und_section (sec))
+ {
+ bfd_size_type namelen;
+ struct orl *new_map;
+
+ /* This symbol will go into the archive header. */
+ if (orl_count == orl_max)
+ {
+ orl_max *= 2;
+ amt = orl_max * sizeof (struct orl);
+ new_map = bfd_realloc (map, amt);
+ if (new_map == NULL)
+ goto error_return;
+
+ map = new_map;
+ }
+
+ namelen = strlen (syms[src_count]->name);
+ amt = sizeof (char *);
+ map[orl_count].name = bfd_alloc (arch, amt);
+ if (map[orl_count].name == NULL)
+ goto error_return;
+ *(map[orl_count].name) = bfd_alloc (arch, namelen + 1);
+ if (*(map[orl_count].name) == NULL)
+ goto error_return;
+ strcpy (*(map[orl_count].name), syms[src_count]->name);
+ map[orl_count].u.abfd = current;
+ map[orl_count].namidx = stridx;
+
+ stridx += namelen + 1;
+ ++orl_count;
}
+ }
}
- }
- /* OK, now we have collected all the data, let's write them out */
- if (!BFD_SEND (arch, write_armap,
- (arch, elength, map, orl_count, stridx))) {
- return false;
+ /* Now ask the BFD to free up any cached information, so we
+ don't fill all of memory with symbol tables. */
+ if (! bfd_free_cached_info (current))
+ goto error_return;
}
+ }
+
+ /* OK, now we have collected all the data, let's write them out. */
+ ret = BFD_SEND (arch, write_armap,
+ (arch, elength, map, orl_count, stridx));
+ if (syms_max > 0)
+ free (syms);
+ if (map != NULL)
+ free (map);
+ if (first_name != NULL)
+ bfd_release (arch, first_name);
- return true;
+ return ret;
+
+ error_return:
+ if (syms_max > 0)
+ free (syms);
+ if (map != NULL)
+ free (map);
+ if (first_name != NULL)
+ bfd_release (arch, first_name);
+
+ return FALSE;
}
-boolean
-bsd_write_armap (arch, elength, map, orl_count, stridx)
- bfd *arch;
- unsigned int elength;
- struct orl *map;
- unsigned int orl_count;
- int stridx;
+bfd_boolean
+bsd_write_armap (bfd *arch,
+ unsigned int elength,
+ struct orl *map,
+ unsigned int orl_count,
+ int stridx)
{
int padit = stridx & 1;
- unsigned int ranlibsize = orl_count * sizeof (struct ranlib);
+ unsigned int ranlibsize = orl_count * BSD_SYMDEF_SIZE;
unsigned int stringsize = stridx + padit;
- /* Include 8 bytes to store ranlibsize and stringsize in output. */
+ /* Include 8 bytes to store ranlibsize and stringsize in output. */
unsigned int mapsize = ranlibsize + stringsize + 8;
file_ptr firstreal;
bfd *current = arch->archive_head;
bfd *last_elt = current; /* last element arch seen */
- int temp;
- int count;
+ bfd_byte temp[4];
+ unsigned int count;
struct ar_hdr hdr;
struct stat statbuf;
unsigned int i;
firstreal = mapsize + elength + sizeof (struct ar_hdr) + SARMAG;
stat (arch->filename, &statbuf);
- memset ((char *)(&hdr), 0, sizeof (struct ar_hdr));
+ memset (&hdr, 0, sizeof (struct ar_hdr));
sprintf (hdr.ar_name, RANLIBMAG);
-
- /* write the timestamp of the archive header to be just a little bit
- later than the timestamp of the file, otherwise the linker will
- complain that the index is out of date.
- */
-
- sprintf (hdr.ar_date, "%ld", statbuf.st_mtime + 60);
- sprintf (hdr.ar_uid, "%d", getuid());
- sprintf (hdr.ar_gid, "%d", getgid());
+ /* Remember the timestamp, to keep it holy. But fudge it a little. */
+ bfd_ardata (arch)->armap_timestamp = statbuf.st_mtime + ARMAP_TIME_OFFSET;
+ bfd_ardata (arch)->armap_datepos = (SARMAG
+ + offsetof (struct ar_hdr, ar_date[0]));
+ sprintf (hdr.ar_date, "%ld", bfd_ardata (arch)->armap_timestamp);
+ sprintf (hdr.ar_uid, "%ld", (long) getuid ());
+ sprintf (hdr.ar_gid, "%ld", (long) getgid ());
sprintf (hdr.ar_size, "%-10d", (int) mapsize);
- hdr.ar_fmag[0] = '`'; hdr.ar_fmag[1] = '\n';
+ strncpy (hdr.ar_fmag, ARFMAG, 2);
for (i = 0; i < sizeof (struct ar_hdr); i++)
- if (((char *)(&hdr))[i] == '\0') (((char *)(&hdr))[i]) = ' ';
- bfd_write ((char *)&hdr, 1, sizeof (struct ar_hdr), arch);
- bfd_h_put_32(arch, ranlibsize, (PTR)&temp);
- bfd_write (&temp, 1, sizeof (temp), arch);
-
- for (count = 0; count < orl_count; count++) {
- struct symdef outs;
- struct symdef *outp = &outs;
-
- if (((bfd *)(map[count]).pos) != last_elt) {
- do {
- firstreal += arelt_size (current) + sizeof (struct ar_hdr);
- firstreal += firstreal % 2;
- current = current->next;
- } while (current != (bfd *)(map[count]).pos);
- } /* if new archive element */
+ if (((char *) (&hdr))[i] == '\0')
+ (((char *) (&hdr))[i]) = ' ';
+ if (bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch)
+ != sizeof (struct ar_hdr))
+ return FALSE;
+ H_PUT_32 (arch, ranlibsize, temp);
+ if (bfd_bwrite (temp, sizeof (temp), arch) != sizeof (temp))
+ return FALSE;
- last_elt = current;
- bfd_h_put_32(arch, ((map[count]).namidx),(PTR) &outs.s.string_offset);
- bfd_h_put_32(arch, firstreal,(PTR) &outs.file_offset);
- bfd_write ((char *)outp, 1, sizeof (outs), arch);
- }
+ for (count = 0; count < orl_count; count++)
+ {
+ bfd_byte buf[BSD_SYMDEF_SIZE];
- /* now write the strings themselves */
- bfd_h_put_32(arch, stringsize, (PTR)&temp);
- bfd_write ((PTR)&temp, 1, sizeof (temp), arch);
+ if (map[count].u.abfd != last_elt)
+ {
+ do
+ {
+ firstreal += arelt_size (current) + sizeof (struct ar_hdr);
+ firstreal += firstreal % 2;
+ current = current->next;
+ }
+ while (current != map[count].u.abfd);
+ } /* if new archive element */
+
+ last_elt = current;
+ H_PUT_32 (arch, map[count].namidx, buf);
+ H_PUT_32 (arch, firstreal, buf + BSD_SYMDEF_OFFSET_SIZE);
+ if (bfd_bwrite (buf, BSD_SYMDEF_SIZE, arch)
+ != BSD_SYMDEF_SIZE)
+ return FALSE;
+ }
+
+ /* Now write the strings themselves. */
+ H_PUT_32 (arch, stringsize, temp);
+ if (bfd_bwrite (temp, sizeof (temp), arch) != sizeof (temp))
+ return FALSE;
for (count = 0; count < orl_count; count++)
- bfd_write (*((map[count]).name), 1, strlen (*((map[count]).name))+1, arch);
+ {
+ size_t len = strlen (*map[count].name) + 1;
+
+ if (bfd_bwrite (*map[count].name, len, arch) != len)
+ return FALSE;
+ }
/* The spec sez this should be a newline. But in order to be
- bug-compatible for sun's ar we use a null. */
+ bug-compatible for sun's ar we use a null. */
if (padit)
- bfd_write("\0",1,1,arch);
+ {
+ if (bfd_bwrite ("", 1, arch) != 1)
+ return FALSE;
+ }
- return true;
+ return TRUE;
}
-\f
+/* At the end of archive file handling, update the timestamp in the
+ file, so the linker will accept it.
+
+ Return TRUE if the timestamp was OK, or an unusual problem happened.
+ Return FALSE if we updated the timestamp. */
+
+bfd_boolean
+_bfd_archive_bsd_update_armap_timestamp (bfd *arch)
+{
+ struct stat archstat;
+ struct ar_hdr hdr;
+ unsigned int i;
+
+ /* Flush writes, get last-write timestamp from file, and compare it
+ to the timestamp IN the file. */
+ bfd_flush (arch);
+ if (bfd_stat (arch, &archstat) == -1)
+ {
+ bfd_perror (_("Reading archive file mod timestamp"));
+
+ /* Can't read mod time for some reason. */
+ return TRUE;
+ }
+ if (archstat.st_mtime <= bfd_ardata (arch)->armap_timestamp)
+ /* OK by the linker's rules. */
+ return TRUE;
+
+ /* Update the timestamp. */
+ bfd_ardata (arch)->armap_timestamp = archstat.st_mtime + ARMAP_TIME_OFFSET;
+
+ /* Prepare an ASCII version suitable for writing. */
+ memset (hdr.ar_date, 0, sizeof (hdr.ar_date));
+ sprintf (hdr.ar_date, "%ld", bfd_ardata (arch)->armap_timestamp);
+ for (i = 0; i < sizeof (hdr.ar_date); i++)
+ if (hdr.ar_date[i] == '\0')
+ (hdr.ar_date)[i] = ' ';
+
+ /* Write it into the file. */
+ bfd_ardata (arch)->armap_datepos = (SARMAG
+ + offsetof (struct ar_hdr, ar_date[0]));
+ if (bfd_seek (arch, bfd_ardata (arch)->armap_datepos, SEEK_SET) != 0
+ || (bfd_bwrite (hdr.ar_date, sizeof (hdr.ar_date), arch)
+ != sizeof (hdr.ar_date)))
+ {
+ bfd_perror (_("Writing updated armap timestamp"));
+
+ /* Some error while writing. */
+ return TRUE;
+ }
+
+ /* We updated the timestamp successfully. */
+ return FALSE;
+}
+\f
/* A coff armap looks like :
- lARMAG
- struct ar_hdr with name = '/'
- number of symbols
- offset of file for symbol 0
- offset of file for symbol 1
-
- offset of file for symbol n-1
- symbol name 0
- symbol name 1
-
- symbol name n-1
+ lARMAG
+ struct ar_hdr with name = '/'
+ number of symbols
+ offset of file for symbol 0
+ offset of file for symbol 1
+ offset of file for symbol n-1
+ symbol name 0
+ symbol name 1
+
+ symbol name n-1
*/
-boolean
-coff_write_armap (arch, elength, map, symbol_count, stridx)
- bfd *arch;
- unsigned int elength;
- struct orl *map;
- unsigned int symbol_count;
- int stridx;
+bfd_boolean
+coff_write_armap (bfd *arch,
+ unsigned int elength,
+ struct orl *map,
+ unsigned int symbol_count,
+ int stridx)
{
- /* The size of the ranlib is the number of exported symbols in the
- archive * the number of bytes in a int, + an int for the count */
-
- unsigned int ranlibsize = (symbol_count * 4) + 4;
- unsigned int stringsize = stridx;
- unsigned int mapsize = stringsize + ranlibsize;
- file_ptr archive_member_file_ptr;
- bfd *current = arch->archive_head;
- int count;
- struct ar_hdr hdr;
- unsigned int i;
- int padit = mapsize & 1;
-
- if (padit) mapsize ++;
-
- /* work out where the first object file will go in the archive */
- archive_member_file_ptr = mapsize + elength + sizeof (struct ar_hdr) + SARMAG;
-
- memset ((char *)(&hdr), 0, sizeof (struct ar_hdr));
- hdr.ar_name[0] = '/';
- sprintf (hdr.ar_size, "%-10d", (int) mapsize);
- sprintf (hdr.ar_date, "%ld", (long)time (NULL));
- /* This, at least, is what Intel coff sets the values to.: */
- sprintf ((hdr.ar_uid), "%d", 0);
- sprintf ((hdr.ar_gid), "%d", 0);
- sprintf ((hdr.ar_mode), "%-7o",(unsigned ) 0);
- hdr.ar_fmag[0] = '`'; hdr.ar_fmag[1] = '\n';
-
- for (i = 0; i < sizeof (struct ar_hdr); i++)
- if (((char *)(&hdr))[i] == '\0') (((char *)(&hdr))[i]) = ' ';
-
- /* Write the ar header for this item and the number of symbols */
-
-
- bfd_write ((PTR)&hdr, 1, sizeof (struct ar_hdr), arch);
-
- bfd_write_bigendian_4byte_int(arch, symbol_count);
-
- /* Two passes, first write the file offsets for each symbol -
- remembering that each offset is on a two byte boundary. */
-
- /* Write out the file offset for the file associated with each
- symbol, and remember to keep the offsets padded out. */
-
- current = arch->archive_head;
- count = 0;
- while (current != (bfd *)NULL && count < symbol_count) {
- /* For each symbol which is used defined in this object, write out
- the object file's address in the archive */
-
- while (((bfd *)(map[count]).pos) == current) {
- bfd_write_bigendian_4byte_int(arch, archive_member_file_ptr);
- count++;
- }
- /* Add size of this archive entry */
- archive_member_file_ptr += arelt_size (current) + sizeof (struct
- ar_hdr);
- /* remember aboout the even alignment */
- archive_member_file_ptr += archive_member_file_ptr % 2;
- current = current->next;
- }
+ /* The size of the ranlib is the number of exported symbols in the
+ archive * the number of bytes in an int, + an int for the count. */
+ unsigned int ranlibsize = (symbol_count * 4) + 4;
+ unsigned int stringsize = stridx;
+ unsigned int mapsize = stringsize + ranlibsize;
+ unsigned int archive_member_file_ptr;
+ bfd *current = arch->archive_head;
+ unsigned int count;
+ struct ar_hdr hdr;
+ unsigned int i;
+ int padit = mapsize & 1;
+
+ if (padit)
+ mapsize++;
+
+ /* Work out where the first object file will go in the archive. */
+ archive_member_file_ptr = (mapsize
+ + elength
+ + sizeof (struct ar_hdr)
+ + SARMAG);
+
+ memset (&hdr, 0, sizeof (struct ar_hdr));
+ hdr.ar_name[0] = '/';
+ sprintf (hdr.ar_size, "%-10d", (int) mapsize);
+ sprintf (hdr.ar_date, "%ld", (long) time (NULL));
+ /* This, at least, is what Intel coff sets the values to. */
+ sprintf ((hdr.ar_uid), "%d", 0);
+ sprintf ((hdr.ar_gid), "%d", 0);
+ sprintf ((hdr.ar_mode), "%-7o", (unsigned) 0);
+ strncpy (hdr.ar_fmag, ARFMAG, 2);
+
+ for (i = 0; i < sizeof (struct ar_hdr); i++)
+ if (((char *) (&hdr))[i] == '\0')
+ (((char *) (&hdr))[i]) = ' ';
+ /* Write the ar header for this item and the number of symbols. */
+ if (bfd_bwrite (&hdr, sizeof (struct ar_hdr), arch)
+ != sizeof (struct ar_hdr))
+ return FALSE;
- /* now write the strings themselves */
- for (count = 0; count < symbol_count; count++) {
- bfd_write ((PTR)*((map[count]).name),
- 1,
- strlen (*((map[count]).name))+1, arch);
+ if (!bfd_write_bigendian_4byte_int (arch, symbol_count))
+ return FALSE;
+ /* Two passes, first write the file offsets for each symbol -
+ remembering that each offset is on a two byte boundary. */
+
+ /* Write out the file offset for the file associated with each
+ symbol, and remember to keep the offsets padded out. */
+
+ current = arch->archive_head;
+ count = 0;
+ while (current != NULL && count < symbol_count)
+ {
+ /* For each symbol which is used defined in this object, write
+ out the object file's address in the archive. */
+
+ while (count < symbol_count && map[count].u.abfd == current)
+ {
+ if (!bfd_write_bigendian_4byte_int (arch, archive_member_file_ptr))
+ return FALSE;
+ count++;
+ }
+ /* Add size of this archive entry. */
+ archive_member_file_ptr += arelt_size (current) + sizeof (struct ar_hdr);
+ /* Remember aboout the even alignment. */
+ archive_member_file_ptr += archive_member_file_ptr % 2;
+ current = current->next;
+ }
+
+ /* Now write the strings themselves. */
+ for (count = 0; count < symbol_count; count++)
+ {
+ size_t len = strlen (*map[count].name) + 1;
+
+ if (bfd_bwrite (*map[count].name, len, arch) != len)
+ return FALSE;
+ }
+
+ /* The spec sez this should be a newline. But in order to be
+ bug-compatible for arc960 we use a null. */
+ if (padit)
+ {
+ if (bfd_bwrite ("", 1, arch) != 1)
+ return FALSE;
}
- /* The spec sez this should be a newline. But in order to be
- bug-compatible for arc960 we use a null. */
- if (padit)
- bfd_write("\0",1,1,arch);
- return true;
+ return TRUE;
}
projects / deliverable / binutils-gdb.git / blobdiff