projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gas: run the hwcaps-bump tests with 64-bit sparc objects only.
[deliverable/binutils-gdb.git]
/
binutils
/
ar.c
diff --git
a/binutils/ar.c
b/binutils/ar.c
index 48a052c2a8cde930edb55f92d2c25747fafd9c8c..ba0d5810fa1889feebc04b17c9a6ee4936719147 100644
(file)
--- a/
binutils/ar.c
+++ b/
binutils/ar.c
@@
-1,5
+1,5
@@
/* ar.c - Archive modify and extract.
/* ar.c - Archive modify and extract.
- Copyright (C) 1991-201
5
Free Software Foundation, Inc.
+ Copyright (C) 1991-201
6
Free Software Foundation, Inc.
This file is part of GNU Binutils.
This file is part of GNU Binutils.
@@
-29,11
+29,11
@@
#include "progress.h"
#include "getopt.h"
#include "aout/ar.h"
#include "progress.h"
#include "getopt.h"
#include "aout/ar.h"
-#include "libbfd.h"
#include "bucomm.h"
#include "arsup.h"
#include "filenames.h"
#include "binemul.h"
#include "bucomm.h"
#include "arsup.h"
#include "filenames.h"
#include "binemul.h"
+#include "plugin-api.h"
#include "plugin.h"
#ifdef __GO32___
#include "plugin.h"
#ifdef __GO32___
@@
-691,6
+691,7
@@
main (int argc, char **argv)
program_name = argv[0];
xmalloc_set_program_name (program_name);
program_name = argv[0];
xmalloc_set_program_name (program_name);
+ bfd_set_error_program_name (program_name);
#if BFD_SUPPORTS_PLUGINS
bfd_plugin_set_program_name (program_name);
#endif
#if BFD_SUPPORTS_PLUGINS
bfd_plugin_set_program_name (program_name);
#endif
@@
-954,7
+955,7
@@
open_inarch (const char *archive_filename, const char *file)
bfd_get_filename (arch));
goto bloser;
}
bfd_get_filename (arch));
goto bloser;
}
- }
+ }
last_one = &(arch->archive_next);
/* Read all the contents right away, regardless. */
last_one = &(arch->archive_next);
/* Read all the contents right away, regardless. */
@@
-1002,7
+1003,7
@@
print_contents (bfd *abfd)
if (nread != tocopy)
/* xgettext:c-format */
fatal (_("%s is not a valid archive"),
if (nread != tocopy)
/* xgettext:c-format */
fatal (_("%s is not a valid archive"),
- bfd_get_filename (
bfd_my_archive (abfd)
));
+ bfd_get_filename (
abfd->my_archive
));
/* fwrite in mingw32 may return int instead of bfd_size_type. Cast the
return value to bfd_size_type to avoid comparison between signed and
/* fwrite in mingw32 may return int instead of bfd_size_type. Cast the
return value to bfd_size_type to avoid comparison between signed and
@@
-1040,6
+1041,7
@@
extract_file (bfd *abfd)
{
non_fatal (_("illegal pathname found in archive member: %s"),
bfd_get_filename (abfd));
{
non_fatal (_("illegal pathname found in archive member: %s"),
bfd_get_filename (abfd));
+ free (cbuf);
return;
}
return;
}
@@
-1079,7
+1081,7
@@
extract_file (bfd *abfd)
if (nread != tocopy)
/* xgettext:c-format */
fatal (_("%s is not a valid archive"),
if (nread != tocopy)
/* xgettext:c-format */
fatal (_("%s is not a valid archive"),
- bfd_get_filename (
bfd_my_archive (abfd)
));
+ bfd_get_filename (
abfd->my_archive
));
/* See comment above; this saves disk arm motion */
if (ostream == NULL)
/* See comment above; this saves disk arm motion */
if (ostream == NULL)
This page took
0.024931 seconds
and
4
git commands to generate.