/* arsup.c - Archive support for MRI compatibility
- Copyright (C) 1992-2016 Free Software Foundation, Inc.
+ Copyright (C) 1992-2021 Free Software Foundation, Inc.
This file is part of GNU Binutils.
for (head = arch->archive_next; head; head = head->archive_next)
{
- if (head->filename != NULL
- && FILENAME_CMP (ptr->name, head->filename) == 0)
+ if (bfd_get_filename (head) != NULL
+ && FILENAME_CMP (ptr->name, bfd_get_filename (head)) == 0)
{
found = TRUE;
function (head, prev);
static void
ar_directory_doer (bfd *abfd, bfd *ignore ATTRIBUTE_UNUSED)
{
- print_arelt_descr(outfile, abfd, verbose);
+ print_arelt_descr(outfile, abfd, verbose, FALSE);
}
void
void
ar_open (char *name, int t)
{
- char *tname = (char *) xmalloc (strlen (name) + 10);
+ char *tname;
const char *bname = lbasename (name);
real_name = name;
/* Prepend tmp- to the beginning, to avoid file-name clashes after
truncation on filesystems with limited namespaces (DOS). */
- sprintf (tname, "%.*stmp-%s", (int) (bname - name), name, bname);
+ if (asprintf (&tname, "%.*stmp-%s", (int) (bname - name), name, bname) == -1)
+ {
+ fprintf (stderr, _("%s: Can't allocate memory for temp name (%s)\n"),
+ program_name, strerror(errno));
+ maybequit ();
+ return;
+ }
+
obfd = bfd_openw (tname, NULL);
if (!obfd)
{
while (list)
{
- bfd *abfd = bfd_openr (list->name, NULL);
+ bfd *abfd;
+#if BFD_SUPPORTS_PLUGINS
+ abfd = bfd_openr (list->name, "plugin");
+#else
+ abfd = bfd_openr (list->name, NULL);
+#endif
if (!abfd)
{
fprintf (stderr, _("%s: can't open file %s\n"),
while (member)
{
- if (FILENAME_CMP(member->filename, list->name) == 0)
+ if (FILENAME_CMP (bfd_get_filename (member), list->name) == 0)
{
*prev = member->archive_next;
found = 1;
else
{
char *ofilename = xstrdup (bfd_get_filename (obfd));
+ bfd_boolean skip_stat = FALSE;
+ struct stat target_stat;
+ int ofd = -1;
if (deterministic > 0)
obfd->flags |= BFD_DETERMINISTIC_OUTPUT;
+#if !defined (_WIN32) || defined (__CYGWIN32__)
+ /* It's OK to fail; at worst it will result in SMART_RENAME using a slow
+ copy fallback to write the output. */
+ ofd = dup (fileno ((FILE *) obfd->iostream));
+ if (lstat (real_name, &target_stat) != 0)
+ skip_stat = TRUE;
+#endif
+
bfd_close (obfd);
- smart_rename (ofilename, real_name, 0);
+ smart_rename (ofilename, real_name, ofd,
+ skip_stat ? NULL : &target_stat, 0);
obfd = 0;
free (ofilename);
}
while (member)
{
- if (FILENAME_CMP (member->filename, list->name) == 0)
+ if (FILENAME_CMP (bfd_get_filename (member), list->name) == 0)
{
/* Found the one to replace. */
- bfd *abfd = bfd_openr (list->name, 0);
+ bfd *abfd = bfd_openr (list->name, NULL);
if (!abfd)
{
if (!found)
{
- bfd *abfd = bfd_openr (list->name, 0);
+ bfd *abfd = bfd_openr (list->name, NULL);
fprintf (stderr,_("%s: can't find module file %s\n"),
program_name, list->name);
while (member && !found)
{
- if (FILENAME_CMP (member->filename, list->name) == 0)
+ if (FILENAME_CMP (bfd_get_filename (member), list->name) == 0)
{
extract_file (member);
found = 1;
if (!found)
{
- bfd_openr (list->name, 0);
+ bfd_openr (list->name, NULL);
fprintf (stderr, _("%s: can't find module file %s\n"),
program_name, list->name);
}