/* ar.c - Archive modify and extract.
- Copyright (C) 1991-2014 Free Software Foundation, Inc.
+ Copyright (C) 1991-2018 Free Software Foundation, Inc.
This file is part of GNU Binutils.
#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 "plugin-api.h"
#include "plugin.h"
#ifdef __GO32___
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
{
bfd *arch;
+ /* Fail if no files are specified on the command line.
+ (But not for MRI mode which allows for reading arguments
+ and filenames from stdin). */
+ if (argv[arg_index] == NULL)
+ usage (0);
+
/* We don't use do_quick_append any more. Too many systems
expect ar to always rebuild the symbol table even when q is
used. */
default_deterministic ();
if (postype != pos_default)
- posname = argv[arg_index++];
+ {
+ posname = argv[arg_index++];
+ if (posname == NULL)
+ fatal (_("missing position arg."));
+ }
if (counted_name_mode)
{
if (operation != extract && operation != del)
fatal (_("`N' is only meaningful with the `x' and `d' options."));
+ if (argv[arg_index] == NULL)
+ fatal (_("`N' missing value."));
counted_name_counter = atoi (argv[arg_index++]);
if (counted_name_counter <= 0)
fatal (_("Value for `N' must be positive."));
}
inarch_filename = argv[arg_index++];
+ if (inarch_filename == NULL)
+ usage (0);
for (file_count = 0; argv[arg_index + file_count] != NULL; file_count++)
continue;
bfd_get_filename (arch));
goto bloser;
}
- }
+ }
last_one = &(arch->archive_next);
/* Read all the contents right away, regardless. */
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
{
non_fatal (_("illegal pathname found in archive member: %s"),
bfd_get_filename (abfd));
+ free (cbuf);
return;
}
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)
if (smart_rename (new_name, old_name, 0) != 0)
xexit (1);
free (old_name);
+ free (new_name);
}
/* Return a pointer to the pointer to the entry which should be rplacd'd