/* ar.c - Archive modify and extract.
- Copyright 1991, 92, 93, 94 Free Software Foundation, Inc.
+ Copyright (C) 1991-2019 Free Software Foundation, Inc.
-This file is part of GNU Binutils.
+ This file is part of GNU Binutils.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+ MA 02110-1301, USA. */
\f
/*
- Bugs: should use getopt the way tar does (complete w/optional -) and
- should have long options too. GNU ar used to check file against filesystem
- in quick_update and replace operations (would check mtime). Doesn't warn
- when name truncated. No way to specify pos_end. Error messages should be
- more consistant.
-*/
-#include "bfd.h"
+ Bugs: GNU ar used to check file against filesystem in quick_update and
+ replace operations (would check mtime). Doesn't warn when name truncated.
+ No way to specify pos_end. Error messages should be more consistent. */
+
#include "sysdep.h"
-#include "bucomm.h"
+#include "bfd.h"
+#include "libiberty.h"
+#include "progress.h"
+#include "getopt.h"
#include "aout/ar.h"
-#include "libbfd.h"
+#include "bucomm.h"
#include "arsup.h"
-#include <stdio.h>
-#ifdef POSIX_UTIME
-#include <utime.h>
-#else /* ! POSIX_UTIME */
-#ifdef USE_UTIME
-#include <time.h>
-#else /* ! USE_UTIME */
-#include <sys/time.h>
-#endif /* ! USE_UTIME */
-#endif /* ! POSIX_UTIME */
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#define BUFSIZE 8192
+#include "filenames.h"
+#include "binemul.h"
+#include "plugin-api.h"
+#include "plugin.h"
+#include "ansidecl.h"
#ifdef __GO32___
-#define EXT_NAME_LEN 3 /* bufflen of addition to name if it's MS-DOS */
+#define EXT_NAME_LEN 3 /* Bufflen of addition to name if it's MS-DOS. */
#else
-#define EXT_NAME_LEN 6 /* ditto for *NIX */
+#define EXT_NAME_LEN 6 /* Ditto for *NIX. */
#endif
-/* Kludge declaration from BFD! This is ugly! FIXME! XXX */
-
-struct ar_hdr *
- bfd_special_undocumented_glue PARAMS ((bfd * abfd, char *filename));
-
-/* Forward declarations */
-
-static void
-print_contents PARAMS ((bfd * member));
-
-static void
-delete_members PARAMS ((char **files_to_delete));
-
-static void
-do_quick_append PARAMS ((char *archive_filename, char **files_to_append));
-
-static void
-move_members PARAMS ((char **files_to_move));
-
-static void
-replace_members PARAMS ((char **files_to_replace));
-
-static void
-print_descr PARAMS ((bfd * abfd));
-
-static void
-ranlib_only PARAMS ((char *archname));
+/* Static declarations. */
+
+static void mri_emul (void);
+static const char *normalize (const char *, bfd *);
+static void remove_output (void);
+static void map_over_members (bfd *, void (*)(bfd *), char **, int);
+static void print_contents (bfd * member);
+static void delete_members (bfd *, char **files_to_delete);
+
+static void move_members (bfd *, char **files_to_move);
+static void replace_members
+ (bfd *, char **files_to_replace, bfd_boolean quick);
+static void print_descr (bfd * abfd);
+static void write_archive (bfd *);
+static int ranlib_only (const char *archname);
+static int ranlib_touch (const char *archname);
+static void usage (int);
\f
-/** Globals and flags */
+/** Globals and flags. */
-/* The input archive we're manipulating. */
-bfd *inarch;
-
-int mri_mode;
+static int mri_mode;
/* This flag distinguishes between ar and ranlib:
1 means this is 'ranlib'; 0 means this is 'ar'.
/* Nonzero means describe each action performed. */
int verbose = 0;
+/* Nonzero means display offsets of files in the archive. */
+int display_offsets = 0;
+
/* Nonzero means preserve dates of members when extracting them. */
int preserve_dates = 0;
/* Controls the writing of an archive symbol table (in BSD: a __.SYMDEF
member). -1 means we've been explicitly asked to not write a symbol table;
- +1 means we've been explictly asked to write it;
+ +1 means we've been explicitly asked to write it;
0 is the default.
Traditionally, the default in BSD has been to not write the table.
However, for POSIX.2 compliance the default is now to write a symbol table
if any of the members are object files. */
int write_armap = 0;
+/* Operate in deterministic mode: write zero for timestamps, uids,
+ and gids for archive members and the archive symbol table, and write
+ consistent file modes. */
+int deterministic = -1; /* Determinism indeterminate. */
+
/* Nonzero means it's the name of an existing member; position new or moved
files with respect to this one. */
char *posname = NULL;
pos_default, pos_before, pos_after, pos_end
} postype = pos_default;
+enum operations
+ {
+ none = 0, del, replace, print_table,
+ print_files, extract, move, quick_append
+ } operation = none;
+
+static bfd **
+get_pos_bfd (bfd **, enum pos, const char *);
+
+/* For extract/delete only. If COUNTED_NAME_MODE is TRUE, we only
+ extract the COUNTED_NAME_COUNTER instance of that name. */
+static bfd_boolean counted_name_mode = 0;
+static int counted_name_counter = 0;
+
+/* Whether to truncate names of files stored in the archive. */
+static bfd_boolean ar_truncate = FALSE;
+
+/* Whether to use a full file name match when searching an archive.
+ This is convenient for archives created by the Microsoft lib
+ program. */
+static bfd_boolean full_pathname = FALSE;
+
+/* Whether to create a "thin" archive (symbol index only -- no files). */
+static bfd_boolean make_thin_archive = FALSE;
+
+static int show_version = 0;
+
+static int show_help = 0;
+
+#if BFD_SUPPORTS_PLUGINS
+static const char *plugin_target = "plugin";
+#else
+static const char *plugin_target = NULL;
+#endif
+
+static const char *target = NULL;
+
+enum long_option_numbers
+{
+ OPTION_PLUGIN = 201,
+ OPTION_TARGET,
+ OPTION_OUTPUT
+};
+
+static const char * output_dir = NULL;
+
+static struct option long_options[] =
+{
+ {"help", no_argument, &show_help, 1},
+ {"plugin", required_argument, NULL, OPTION_PLUGIN},
+ {"target", required_argument, NULL, OPTION_TARGET},
+ {"version", no_argument, &show_version, 1},
+ {"output", required_argument, NULL, OPTION_OUTPUT},
+ {NULL, no_argument, NULL, 0}
+};
+
int interactive = 0;
-void
-mri_emul ()
+static void
+mri_emul (void)
{
interactive = isatty (fileno (stdin));
yyparse ();
COUNT is the length of the FILES chain; FUNCTION is called on each entry
whose name matches one in FILES. */
-void
-map_over_members (function, files, count)
- void (*function) ();
- char **files;
- int count;
+static void
+map_over_members (bfd *arch, void (*function)(bfd *), char **files, int count)
{
bfd *head;
+ int match_count;
if (count == 0)
{
- for (head = inarch->next; head; head = head->next)
- function (head);
+ for (head = arch->archive_next; head; head = head->archive_next)
+ {
+ PROGRESS (1);
+ function (head);
+ }
return;
}
+
/* This may appear to be a baroque way of accomplishing what we want.
However we have to iterate over the filenames in order to notice where
a filename is requested but does not exist in the archive. Ditto
mapping over each file each time -- we want to hack multiple
references. */
+ for (head = arch->archive_next; head; head = head->archive_next)
+ head->archive_pass = 0;
+
for (; count > 0; files++, count--)
{
- boolean found = false;
- for (head = inarch->next; head; head = head->next)
+ bfd_boolean found = FALSE;
+
+ match_count = 0;
+ for (head = arch->archive_next; head; head = head->archive_next)
{
- if (head->filename == NULL)
+ const char * filename;
+
+ PROGRESS (1);
+ /* PR binutils/15796: Once an archive element has been matched
+ do not match it again. If the user provides multiple same-named
+ parameters on the command line their intent is to match multiple
+ same-named entries in the archive, not the same entry multiple
+ times. */
+ if (head->archive_pass)
+ continue;
+
+ filename = head->filename;
+ if (filename == NULL)
{
/* Some archive formats don't get the filenames filled in
until the elements are opened. */
struct stat buf;
bfd_stat_arch_elt (head, &buf);
}
- if ((head->filename != NULL) &&
- (!strcmp (*files, head->filename)))
+ else if (bfd_is_thin_archive (arch))
{
- found = true;
+ /* Thin archives store full pathnames. Need to normalize. */
+ filename = normalize (filename, arch);
+ }
+
+ if (filename != NULL
+ && !FILENAME_CMP (normalize (*files, arch), filename))
+ {
+ ++match_count;
+ if (counted_name_mode
+ && match_count != counted_name_counter)
+ {
+ /* Counting, and didn't match on count; go on to the
+ next one. */
+ continue;
+ }
+
+ found = TRUE;
function (head);
+ head->archive_pass = 1;
+ /* PR binutils/15796: Once a file has been matched, do not
+ match any more same-named files in the archive. If the
+ user does want to match multiple same-name files in an
+ archive they should provide multiple same-name parameters
+ to the ar command. */
+ break;
}
}
+
if (!found)
- fprintf (stderr, "no entry %s in archive\n", *files);
+ /* xgettext:c-format */
+ fprintf (stderr, _("no entry %s in archive\n"), *files);
}
}
\f
-boolean operation_alters_arch = false;
+bfd_boolean operation_alters_arch = FALSE;
-extern char *program_version;
-
-void
-do_show_version ()
+static void
+usage (int help)
{
- printf ("GNU %s version %s\n", program_name, program_version);
- exit (0);
+ FILE *s;
+
+#if BFD_SUPPORTS_PLUGINS
+ /* xgettext:c-format */
+ const char *command_line
+ = _("Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV]"
+ " [--plugin <name>] [member-name] [count] archive-file file...\n");
+
+#else
+ /* xgettext:c-format */
+ const char *command_line
+ = _("Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV]"
+ " [member-name] [count] archive-file file...\n");
+#endif
+ s = help ? stdout : stderr;
+
+ fprintf (s, command_line, program_name);
+
+ /* xgettext:c-format */
+ fprintf (s, _(" %s -M [<mri-script]\n"), program_name);
+ fprintf (s, _(" commands:\n"));
+ fprintf (s, _(" d - delete file(s) from the archive\n"));
+ fprintf (s, _(" m[ab] - move file(s) in the archive\n"));
+ fprintf (s, _(" p - print file(s) found in the archive\n"));
+ fprintf (s, _(" q[f] - quick append file(s) to the archive\n"));
+ fprintf (s, _(" r[ab][f][u] - replace existing or insert new file(s) into the archive\n"));
+ fprintf (s, _(" s - act as ranlib\n"));
+ fprintf (s, _(" t[O][v] - display contents of the archive\n"));
+ fprintf (s, _(" x[o] - extract file(s) from the archive\n"));
+ fprintf (s, _(" command specific modifiers:\n"));
+ fprintf (s, _(" [a] - put file(s) after [member-name]\n"));
+ fprintf (s, _(" [b] - put file(s) before [member-name] (same as [i])\n"));
+ if (DEFAULT_AR_DETERMINISTIC)
+ {
+ fprintf (s, _("\
+ [D] - use zero for timestamps and uids/gids (default)\n"));
+ fprintf (s, _("\
+ [U] - use actual timestamps and uids/gids\n"));
+ }
+ else
+ {
+ fprintf (s, _("\
+ [D] - use zero for timestamps and uids/gids\n"));
+ fprintf (s, _("\
+ [U] - use actual timestamps and uids/gids (default)\n"));
+ }
+ fprintf (s, _(" [N] - use instance [count] of name\n"));
+ fprintf (s, _(" [f] - truncate inserted file names\n"));
+ fprintf (s, _(" [P] - use full path names when matching\n"));
+ fprintf (s, _(" [o] - preserve original dates\n"));
+ fprintf (s, _(" [O] - display offsets of files in the archive\n"));
+ fprintf (s, _(" [u] - only replace files that are newer than current archive contents\n"));
+ fprintf (s, _(" generic modifiers:\n"));
+ fprintf (s, _(" [c] - do not warn if the library had to be created\n"));
+ fprintf (s, _(" [s] - create an archive index (cf. ranlib)\n"));
+ fprintf (s, _(" [S] - do not build a symbol table\n"));
+ fprintf (s, _(" [T] - make a thin archive\n"));
+ fprintf (s, _(" [v] - be verbose\n"));
+ fprintf (s, _(" [V] - display the version number\n"));
+ fprintf (s, _(" @<file> - read options from <file>\n"));
+ fprintf (s, _(" --target=BFDNAME - specify the target object format as BFDNAME\n"));
+ fprintf (s, _(" --output=DIRNAME - specify the output directory for extraction operations\n"));
+#if BFD_SUPPORTS_PLUGINS
+ fprintf (s, _(" optional:\n"));
+ fprintf (s, _(" --plugin <p> - load the specified plugin\n"));
+#endif
+
+ ar_emul_usage (s);
+
+ list_supported_targets (program_name, s);
+
+ if (REPORT_BUGS_TO[0] && help)
+ fprintf (s, _("Report bugs to %s\n"), REPORT_BUGS_TO);
+
+ xexit (help ? 0 : 1);
}
-void
-usage ()
+static void
+ranlib_usage (int help)
{
- if (is_ranlib == 0)
- fprintf (stderr, "\
-Usage: %s [-]{dmpqrtx}[abcilosuvV] [member-name] archive-file file...\n\
- %s -M [<mri-script]\n",
- program_name, program_name);
+ FILE *s;
+
+ s = help ? stdout : stderr;
+
+ /* xgettext:c-format */
+ fprintf (s, _("Usage: %s [options] archive\n"), program_name);
+ fprintf (s, _(" Generate an index to speed access to archives\n"));
+ fprintf (s, _(" The options are:\n\
+ @<file> Read options from <file>\n"));
+#if BFD_SUPPORTS_PLUGINS
+ fprintf (s, _("\
+ --plugin <name> Load the specified plugin\n"));
+#endif
+ if (DEFAULT_AR_DETERMINISTIC)
+ fprintf (s, _("\
+ -D Use zero for symbol map timestamp (default)\n\
+ -U Use an actual symbol map timestamp\n"));
else
- fprintf (stderr, "\
-Usage: %s [-vV] archive\n", program_name);
- exit (1);
+ fprintf (s, _("\
+ -D Use zero for symbol map timestamp\n\
+ -U Use actual symbol map timestamp (default)\n"));
+ fprintf (s, _("\
+ -t Update the archive's symbol map timestamp\n\
+ -h --help Print this help message\n\
+ -v --version Print version information\n"));
+
+ list_supported_targets (program_name, s);
+
+ if (REPORT_BUGS_TO[0] && help)
+ fprintf (s, _("Report bugs to %s\n"), REPORT_BUGS_TO);
+
+ xexit (help ? 0 : 1);
}
-/* The option parsing should be in its own function.
- It will be when I have getopt working. */
+/* Normalize a file name specified on the command line into a file
+ name which we will use in an archive. */
-int
-main (argc, argv)
- int argc;
- char **argv;
+static const char *
+normalize (const char *file, bfd *abfd)
{
- char *arg_ptr;
- char c;
- enum
- {
- none = 0, delete, replace, print_table,
- print_files, extract, move, quick_append
- } operation = none;
- int arg_index;
- char **files;
- char *inarch_filename;
- char *temp;
- int show_version;
+ const char *filename;
- bfd_init ();
- show_version = 0;
+ if (full_pathname)
+ return file;
- program_name = argv[0];
+ filename = lbasename (file);
- temp = strrchr (program_name, '/');
- if (temp == (char *) NULL)
- temp = program_name; /* shouldn't happen, but... */
- else
- ++temp;
- if (is_ranlib > 0 || (is_ranlib < 0 && strcmp (temp, "ranlib") == 0))
+ if (ar_truncate
+ && abfd != NULL
+ && strlen (filename) > abfd->xvec->ar_max_namelen)
{
- is_ranlib = 1;
- if (argc < 2 || argc > 3)
- usage ();
- arg_ptr = argv[1];
- if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "-v") == 0)
- do_show_version ();
- ranlib_only (arg_ptr);
+ char *s;
+
+ /* Space leak. */
+ s = (char *) xmalloc (abfd->xvec->ar_max_namelen + 1);
+ memcpy (s, filename, abfd->xvec->ar_max_namelen);
+ s[abfd->xvec->ar_max_namelen] = '\0';
+ filename = s;
}
- else
- is_ranlib = 0;
- if (argc == 2 && strcmp (argv[1], "-M") == 0)
+ return filename;
+}
+
+/* Remove any output file. This is only called via xatexit. */
+
+static const char *output_filename = NULL;
+static FILE *output_file = NULL;
+static bfd *output_bfd = NULL;
+
+static void
+remove_output (void)
+{
+ if (output_filename != NULL)
{
- mri_emul ();
- exit (0);
+ if (output_bfd != NULL)
+ bfd_cache_close (output_bfd);
+ if (output_file != NULL)
+ fclose (output_file);
+ unlink_if_ordinary (output_filename);
}
+}
- if (argc < 2)
- usage ();
+static char **
+decode_options (int argc, char **argv)
+{
+ int c;
+
+ /* Convert old-style ar call by exploding option element and rearranging
+ options accordingly. */
+
+ restart:
+ if (argc > 1 && argv[1][0] != '-')
+ {
+ int new_argc; /* argc value for rearranged arguments */
+ char **new_argv; /* argv value for rearranged arguments */
+ char *const *in; /* cursor into original argv */
+ char **out; /* cursor into rearranged argv */
+ const char *letter; /* cursor into old option letters */
+ char buffer[3]; /* constructed option buffer */
+
+ /* Initialize a constructed option. */
- arg_ptr = argv[1];
+ buffer[0] = '-';
+ buffer[2] = '\0';
+
+ /* Allocate a new argument array, and copy program name in it. */
+
+ new_argc = argc - 1 + strlen (argv[1]);
+ new_argv = xmalloc ((new_argc + 1) * sizeof (*argv));
+ in = argv;
+ out = new_argv;
+ *out++ = *in++;
+
+ /* Copy each old letter option as a separate option. */
+
+ for (letter = *in++; *letter; letter++)
+ {
+ buffer[1] = *letter;
+ *out++ = xstrdup (buffer);
+ }
- if (*arg_ptr == '-')
- ++arg_ptr; /* compatibility */
+ /* Copy all remaining options. */
- while ((c = *arg_ptr++) != '\0')
+ while (in < argv + argc)
+ *out++ = *in++;
+ *out = NULL;
+
+ /* Replace the old option list by the new one. */
+
+ argc = new_argc;
+ argv = new_argv;
+ }
+
+ while ((c = getopt_long (argc, argv, "hdmpqrtxlcoOVsSuvabiMNfPTDU",
+ long_options, NULL)) != EOF)
{
switch (c)
- {
- case 'd':
- case 'm':
- case 'p':
- case 'q':
- case 'r':
- case 't':
- case 'x':
- if (operation != none)
- fatal ("two different operation options specified");
- switch (c)
- {
- case 'd':
- operation = delete;
- operation_alters_arch = true;
- break;
- case 'm':
- operation = move;
- operation_alters_arch = true;
- break;
- case 'p':
- operation = print_files;
- break;
- case 'q':
- operation = quick_append;
- operation_alters_arch = true;
- break;
- case 'r':
- operation = replace;
- operation_alters_arch = true;
- break;
- case 't':
- operation = print_table;
- break;
- case 'x':
- operation = extract;
- break;
- }
- case 'l':
+ {
+ case 'd':
+ case 'm':
+ case 'p':
+ case 'q':
+ case 'r':
+ case 't':
+ case 'x':
+ if (operation != none)
+ fatal (_("two different operation options specified"));
break;
- case 'c':
- silent_create = 1;
+ }
+
+ switch (c)
+ {
+ case 'h':
+ show_help = 1;
break;
- case 'o':
- preserve_dates = 1;
+ case 'd':
+ operation = del;
+ operation_alters_arch = TRUE;
+ break;
+ case 'm':
+ operation = move;
+ operation_alters_arch = TRUE;
+ break;
+ case 'p':
+ operation = print_files;
+ break;
+ case 'q':
+ operation = quick_append;
+ operation_alters_arch = TRUE;
+ break;
+ case 'r':
+ operation = replace;
+ operation_alters_arch = TRUE;
+ break;
+ case 't':
+ operation = print_table;
+ break;
+ case 'x':
+ operation = extract;
+ break;
+ case 'l':
+ break;
+ case 'c':
+ silent_create = 1;
+ break;
+ case 'o':
+ preserve_dates = 1;
+ break;
+ case 'O':
+ display_offsets = 1;
+ break;
+ case 'V':
+ show_version = TRUE;
+ break;
+ case 's':
+ write_armap = 1;
+ break;
+ case 'S':
+ write_armap = -1;
+ break;
+ case 'u':
+ newer_only = 1;
+ break;
+ case 'v':
+ verbose = 1;
+ break;
+ case 'a':
+ postype = pos_after;
+ break;
+ case 'b':
+ postype = pos_before;
+ break;
+ case 'i':
+ postype = pos_before;
+ break;
+ case 'M':
+ mri_mode = 1;
+ break;
+ case 'N':
+ counted_name_mode = TRUE;
+ break;
+ case 'f':
+ ar_truncate = TRUE;
+ break;
+ case 'P':
+ full_pathname = TRUE;
+ break;
+ case 'T':
+ make_thin_archive = TRUE;
+ break;
+ case 'D':
+ deterministic = TRUE;
+ break;
+ case 'U':
+ deterministic = FALSE;
+ break;
+ case OPTION_PLUGIN:
+#if BFD_SUPPORTS_PLUGINS
+ bfd_plugin_set_plugin (optarg);
+#else
+ fprintf (stderr, _("sorry - this program has been built without plugin support\n"));
+ xexit (1);
+#endif
break;
- case 'V':
- show_version = true;
+ case OPTION_TARGET:
+ target = optarg;
break;
- case 's':
- write_armap = 1;
+ case OPTION_OUTPUT:
+ output_dir = optarg;
break;
- case 'u':
- newer_only = 1;
+ case 0: /* A long option that just sets a flag. */
break;
- case 'v':
- verbose = 1;
+ default:
+ usage (0);
+ }
+ }
+
+ /* PR 13256: Allow for the possibility that the first command line option
+ started with a dash (eg --plugin) but then the following option(s) are
+ old style, non-dash-prefixed versions. */
+ if (operation == none && write_armap != 1 && !mri_mode
+ && optind > 0 && optind < argc)
+ {
+ argv += (optind - 1);
+ argc -= (optind - 1);
+ optind = 0;
+ goto restart;
+ }
+
+ return &argv[optind];
+}
+
+/* If neither -D nor -U was specified explicitly,
+ then use the configured default. */
+static void
+default_deterministic (void)
+{
+ if (deterministic < 0)
+ deterministic = DEFAULT_AR_DETERMINISTIC;
+}
+
+static void
+ranlib_main (int argc, char **argv)
+{
+ int arg_index, status = 0;
+ bfd_boolean touch = FALSE;
+ int c;
+
+ while ((c = getopt_long (argc, argv, "DhHUvVt", long_options, NULL)) != EOF)
+ {
+ switch (c)
+ {
+ case 'D':
+ deterministic = TRUE;
break;
- case 'a':
- postype = pos_after;
+ case 'U':
+ deterministic = FALSE;
+ break;
+ case 'h':
+ case 'H':
+ show_help = 1;
break;
- case 'b':
- postype = pos_before;
+ case 't':
+ touch = TRUE;
break;
- case 'i':
- postype = pos_before;
+ case 'v':
+ case 'V':
+ show_version = 1;
break;
- case 'M':
- mri_mode = 1;
+
+ /* PR binutils/13493: Support plugins. */
+ case OPTION_PLUGIN:
+#if BFD_SUPPORTS_PLUGINS
+ bfd_plugin_set_plugin (optarg);
+#else
+ fprintf (stderr, _("sorry - this program has been built without plugin support\n"));
+ xexit (1);
+#endif
break;
- default:
- fprintf (stderr, "%s: illegal option -- %c\n", program_name, c);
- usage ();
}
}
+ if (argc < 2)
+ ranlib_usage (0);
+
+ if (show_help)
+ ranlib_usage (1);
+
if (show_version)
- do_show_version ();
+ print_version ("ranlib");
+
+ default_deterministic ();
- if (argc < 3)
- usage ();
+ arg_index = optind;
+
+ while (arg_index < argc)
+ {
+ if (! touch)
+ status |= ranlib_only (argv[arg_index]);
+ else
+ status |= ranlib_touch (argv[arg_index]);
+ ++arg_index;
+ }
+
+ xexit (status);
+}
+
+int main (int, char **);
+
+int
+main (int argc, char **argv)
+{
+ int arg_index;
+ char **files;
+ int file_count;
+ char *inarch_filename;
+ int i;
+
+#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+ setlocale (LC_MESSAGES, "");
+#endif
+#if defined (HAVE_SETLOCALE)
+ setlocale (LC_CTYPE, "");
+#endif
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
+ 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
+
+ expandargv (&argc, &argv);
+
+ if (is_ranlib < 0)
+ {
+ const char *temp = lbasename (program_name);
+
+ if (strlen (temp) >= 6
+ && FILENAME_CMP (temp + strlen (temp) - 6, "ranlib") == 0)
+ is_ranlib = 1;
+ else
+ is_ranlib = 0;
+ }
+
+ START_PROGRESS (program_name, 0);
+
+ if (bfd_init () != BFD_INIT_MAGIC)
+ fatal (_("fatal error: libbfd ABI mismatch"));
+ set_default_bfd_target ();
+
+ xatexit (remove_output);
+
+ for (i = 1; i < argc; i++)
+ if (! ar_emul_parse_arg (argv[i]))
+ break;
+ argv += (i - 1);
+ argc -= (i - 1);
+
+ if (is_ranlib)
+ ranlib_main (argc, argv);
+
+ if (argc < 2)
+ usage (0);
+
+ argv = decode_options (argc, argv);
+
+ if (show_help)
+ usage (1);
+
+ if (show_version)
+ print_version ("ar");
+
+ arg_index = 0;
if (mri_mode)
{
+ default_deterministic ();
mri_emul ();
}
else
{
+ 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. */
+
+ /* We can't write an armap when using ar q, so just do ar r
+ instead. */
+ if (operation == quick_append && write_armap)
+ operation = replace;
+
if ((operation == none || operation == print_table)
&& write_armap == 1)
- ranlib_only (argv[2]);
+ xexit (ranlib_only (argv[arg_index]));
if (operation == none)
- fatal ("no operation specified");
+ fatal (_("no operation specified"));
if (newer_only && operation != replace)
- fatal ("`u' is only meaningful with the `r' option.");
+ fatal (_("`u' is only meaningful with the `r' option."));
- arg_index = 2;
+ if (newer_only && deterministic > 0)
+ fatal (_("`u' is not meaningful with the `D' option."));
- if (postype != pos_default)
- posname = argv[arg_index++];
+ if (newer_only && deterministic < 0 && DEFAULT_AR_DETERMINISTIC)
+ non_fatal (_("\
+`u' modifier ignored since `D' is the default (see `U')"));
- inarch_filename = argv[arg_index++];
+ default_deterministic ();
- files = arg_index < argc ? argv + arg_index : NULL;
+ if (postype != pos_default)
+ {
+ posname = argv[arg_index++];
+ if (posname == NULL)
+ fatal (_("missing position arg."));
+ }
- if (operation == quick_append)
+ if (counted_name_mode)
{
- /* Note that quick appending to a non-existent archive creates it,
- even if there are no files to append. */
- do_quick_append (inarch_filename, files);
- exit (0);
+ 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."));
}
- open_inarch (inarch_filename);
+ inarch_filename = argv[arg_index++];
+ if (inarch_filename == NULL)
+ usage (0);
+
+ for (file_count = 0; argv[arg_index + file_count] != NULL; file_count++)
+ continue;
+
+ files = (file_count > 0) ? argv + arg_index : NULL;
+
+ arch = open_inarch (inarch_filename,
+ files == NULL ? (char *) NULL : files[0]);
+
+ if (operation == extract && bfd_is_thin_archive (arch))
+ fatal (_("`x' cannot be used on thin archives."));
switch (operation)
{
case print_table:
- map_over_members (print_descr, files, argc - 3);
+ map_over_members (arch, print_descr, files, file_count);
break;
case print_files:
- map_over_members (print_contents, files, argc - 3);
+ map_over_members (arch, print_contents, files, file_count);
break;
case extract:
- map_over_members (extract_file, files, argc - 3);
+ map_over_members (arch, extract_file, files, file_count);
break;
- case delete:
+ case del:
if (files != NULL)
- delete_members (files);
+ delete_members (arch, files);
+ else
+ output_filename = NULL;
break;
case move:
- if (files != NULL)
- move_members (files);
- break;
+ /* PR 12558: Creating and moving at the same time does
+ not make sense. Just create the archive instead. */
+ if (! silent_create)
+ {
+ if (files != NULL)
+ move_members (arch, files);
+ else
+ output_filename = NULL;
+ break;
+ }
+ /* Fall through. */
case replace:
+ case quick_append:
if (files != NULL || write_armap > 0)
- replace_members (files);
+ replace_members (arch, files, operation == quick_append);
+ else
+ output_filename = NULL;
break;
/* Shouldn't happen! */
default:
- fprintf (stderr, "%s: internal error -- this option not implemented\n",
- program_name);
- exit (1);
+ /* xgettext:c-format */
+ fatal (_("internal error -- this option not implemented"));
}
}
- return 0;
-}
-static char *
-normalize (file)
- char *file;
-{
- char *filename = strrchr (file, '/');
- if (filename != (char *) NULL)
- {
- filename++;
- }
- else
- {
- filename = file;
- }
- return filename;
+ END_PROGRESS (program_name);
+
+ xexit (0);
+ return 0;
}
-int
-open_inarch (archive_filename)
- char *archive_filename;
+bfd *
+open_inarch (const char *archive_filename, const char *file)
{
bfd **last_one;
bfd *next_one;
struct stat sbuf;
- bfd_error = no_error;
+ bfd *arch;
+ char **matching;
+
+ bfd_set_error (bfd_error_no_error);
+
+ if (target == NULL)
+ target = plugin_target;
if (stat (archive_filename, &sbuf) != 0)
{
+#if !defined(__GO32__) || defined(__DJGPP__)
-#ifndef __GO32__
+ /* FIXME: I don't understand why this fragment was ifndef'ed
+ away for __GO32__; perhaps it was in the days of DJGPP v1.x.
+ stat() works just fine in v2.x, so I think this should be
+ removed. For now, I enable it for DJGPP v2. -- EZ. */
-/* KLUDGE ALERT! Temporary fix until I figger why
- * stat() is wrong ... think it's buried in GO32's IDT
- * - Jax
- */
+ /* KLUDGE ALERT! Temporary fix until I figger why
+ stat() is wrong ... think it's buried in GO32's IDT - Jax */
if (errno != ENOENT)
bfd_fatal (archive_filename);
#endif
fprintf (stderr, "%s: ", program_name);
perror (archive_filename);
maybequit ();
- return 0;
+ return NULL;
}
- /* This routine is one way to forcibly create the archive. */
+ /* If the target isn't set, try to figure out the target to use
+ for the archive from the first object on the list. */
+ if (target == NULL && file != NULL)
+ {
+ bfd *obj;
+
+ obj = bfd_openr (file, target);
+ if (obj != NULL)
+ {
+ if (bfd_check_format (obj, bfd_object))
+ target = bfd_get_target (obj);
+ (void) bfd_close (obj);
+ }
+ }
- do_quick_append (archive_filename, 0);
+ /* Create an empty archive. */
+ arch = bfd_openw (archive_filename, target);
+ if (arch == NULL
+ || ! bfd_set_format (arch, bfd_archive)
+ || ! bfd_close (arch))
+ bfd_fatal (archive_filename);
+ else if (!silent_create)
+ non_fatal (_("creating %s"), archive_filename);
+
+ /* If we die creating a new archive, don't leave it around. */
+ output_filename = archive_filename;
}
- inarch = bfd_openr (archive_filename, NULL);
- if (inarch == NULL)
+ arch = bfd_openr (archive_filename, target);
+ if (arch == NULL)
{
bloser:
bfd_fatal (archive_filename);
}
- if (bfd_check_format (inarch, bfd_archive) != true)
- fatal ("%s is not an archive", archive_filename);
- last_one = &(inarch->next);
+ if (! bfd_check_format_matches (arch, bfd_archive, &matching))
+ {
+ bfd_nonfatal (archive_filename);
+ if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
+ {
+ list_matching_formats (matching);
+ free (matching);
+ }
+ xexit (1);
+ }
+
+ if ((operation == replace || operation == quick_append)
+ && bfd_openr_next_archived_file (arch, NULL) != NULL)
+ {
+ /* PR 15140: Catch attempts to convert a normal
+ archive into a thin archive or vice versa. */
+ if (make_thin_archive && ! bfd_is_thin_archive (arch))
+ {
+ fatal (_("Cannot convert existing library %s to thin format"),
+ bfd_get_filename (arch));
+ goto bloser;
+ }
+ else if (! make_thin_archive && bfd_is_thin_archive (arch))
+ {
+ fatal (_("Cannot convert existing thin library %s to normal format"),
+ bfd_get_filename (arch));
+ goto bloser;
+ }
+ }
+
+ last_one = &(arch->archive_next);
/* Read all the contents right away, regardless. */
- for (next_one = bfd_openr_next_archived_file (inarch, NULL);
+ for (next_one = bfd_openr_next_archived_file (arch, NULL);
next_one;
- next_one = bfd_openr_next_archived_file (inarch, next_one))
+ next_one = bfd_openr_next_archived_file (arch, next_one))
{
+ PROGRESS (1);
*last_one = next_one;
- last_one = &next_one->next;
+ last_one = &next_one->archive_next;
}
*last_one = (bfd *) NULL;
- if (bfd_error != no_more_archived_files)
+ if (bfd_get_error () != bfd_error_no_more_archived_files)
goto bloser;
- return 1;
+ return arch;
}
static void
-print_contents (abfd)
- bfd *abfd;
+print_contents (bfd *abfd)
{
- int ncopied = 0;
+ bfd_size_type ncopied = 0;
+ bfd_size_type size;
+ char *cbuf = (char *) xmalloc (BUFSIZE);
struct stat buf;
- long size;
+
if (bfd_stat_arch_elt (abfd, &buf) != 0)
- fatal ("internal stat error on %s", bfd_get_filename (abfd));
+ /* xgettext:c-format */
+ fatal (_("internal stat error on %s"), bfd_get_filename (abfd));
if (verbose)
- printf ("\n<member %s>\n\n", bfd_get_filename (abfd));
+ printf ("\n<%s>\n\n", bfd_get_filename (abfd));
- bfd_seek (abfd, 0, SEEK_SET);
+ bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
size = buf.st_size;
while (ncopied < size)
{
- char cbuf[BUFSIZE];
- int nread;
- int tocopy = size - ncopied;
+ bfd_size_type nread;
+ bfd_size_type tocopy = size - ncopied;
+
if (tocopy > BUFSIZE)
tocopy = BUFSIZE;
- nread = bfd_read (cbuf, 1, tocopy, abfd); /* oops -- broke
- abstraction! */
+ nread = bfd_bread (cbuf, tocopy, abfd);
if (nread != tocopy)
- fatal ("%s is not a valid archive",
- bfd_get_filename (bfd_my_archive (abfd)));
- fwrite (cbuf, 1, nread, stdout);
+ /* xgettext:c-format */
+ fatal (_("%s is not a valid archive"),
+ 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
+ unsigned values. */
+ if ((bfd_size_type) fwrite (cbuf, 1, nread, stdout) != nread)
+ fatal ("stdout: %s", strerror (errno));
ncopied += tocopy;
}
+ free (cbuf);
+}
+
+
+static FILE * open_output_file (bfd *) ATTRIBUTE_RETURNS_NONNULL;
+
+static FILE *
+open_output_file (bfd * abfd)
+{
+ output_filename = bfd_get_filename (abfd);
+
+ /* PR binutils/17533: Do not allow directory traversal
+ outside of the current directory tree - unless the
+ user has explicitly specified an output directory. */
+ if (! is_valid_archive_path (output_filename))
+ {
+ char * base = (char *) lbasename (output_filename);
+
+ non_fatal (_("illegal output pathname for archive member: %s, using '%s' instead"),
+ output_filename, base);
+ output_filename = base;
+ }
+
+ if (output_dir)
+ {
+ size_t len = strlen (output_dir);
+
+ if (len > 0)
+ {
+ /* FIXME: There is a memory leak here, but it is not serious. */
+ if (IS_DIR_SEPARATOR (output_dir [len - 1]))
+ output_filename = concat (output_dir, output_filename, NULL);
+ else
+ output_filename = concat (output_dir, "/", output_filename, NULL);
+ }
+ }
+
+ if (verbose)
+ printf ("x - %s\n", output_filename);
+
+ FILE * ostream = fopen (output_filename, FOPEN_WB);
+ if (ostream == NULL)
+ {
+ perror (output_filename);
+ xexit (1);
+ }
+
+ return ostream;
}
/* Extract a member of the archive into its own file.
Gilmore */
void
-extract_file (abfd)
- bfd *abfd;
+extract_file (bfd *abfd)
{
- FILE *ostream;
- char cbuf[BUFSIZE];
- int nread, tocopy;
- int ncopied = 0;
- long size;
+ bfd_size_type size;
struct stat buf;
+
if (bfd_stat_arch_elt (abfd, &buf) != 0)
- fatal ("internal stat error on %s", bfd_get_filename (abfd));
+ /* xgettext:c-format */
+ fatal (_("internal stat error on %s"), bfd_get_filename (abfd));
size = buf.st_size;
- if (verbose)
- printf ("x - %s\n", bfd_get_filename (abfd));
-
- bfd_seek (abfd, 0, SEEK_SET);
+ bfd_seek (abfd, (file_ptr) 0, SEEK_SET);
- ostream = 0;
+ output_file = NULL;
if (size == 0)
{
- /* Seems like an abstraction violation, eh? Well it's OK! */
- ostream = fopen (bfd_get_filename (abfd), FOPEN_WB);
- if (!ostream)
- {
- perror (bfd_get_filename (abfd));
- exit (1);
- }
+ output_file = open_output_file (abfd);
}
else
- while (ncopied < size)
- {
- tocopy = size - ncopied;
- if (tocopy > BUFSIZE)
- tocopy = BUFSIZE;
-
- nread = bfd_read (cbuf, 1, tocopy, abfd);
- if (nread != tocopy)
- fatal ("%s is not a valid archive",
- bfd_get_filename (bfd_my_archive (abfd)));
-
- /* See comment above; this saves disk arm motion */
- if (!ostream)
- {
- /* Seems like an abstraction violation, eh? Well it's OK! */
- ostream = fopen (bfd_get_filename (abfd), FOPEN_WB);
- if (!ostream)
- {
- perror (bfd_get_filename (abfd));
- exit (1);
- }
- }
- fwrite (cbuf, 1, nread, ostream);
- ncopied += tocopy;
- }
-
- fclose (ostream);
- chmod (bfd_get_filename (abfd), buf.st_mode);
-
- if (preserve_dates)
{
-#ifdef POSIX_UTIME
- struct utimbuf tb;
- tb.actime = buf.st_mtime;
- tb.modtime = buf.st_mtime;
- utime (bfd_get_filename (abfd), &tb); /* FIXME check result */
-#else /* ! POSIX_UTIME */
-#ifdef USE_UTIME
- long tb[2];
- tb[0] = buf.st_mtime;
- tb[1] = buf.st_mtime;
- utime (bfd_get_filename (abfd), tb); /* FIXME check result */
-#else /* ! USE_UTIME */
- struct timeval tv[2];
- tv[0].tv_sec = buf.st_mtime;
- tv[0].tv_usec = 0;
- tv[1].tv_sec = buf.st_mtime;
- tv[1].tv_usec = 0;
- utimes (bfd_get_filename (abfd), tv); /* FIXME check result */
-#endif /* ! USE_UTIME */
-#endif /* ! POSIX_UTIME */
- }
-}
+ bfd_size_type ncopied = 0;
+ char *cbuf = (char *) xmalloc (BUFSIZE);
-/* Just do it quickly; don't worry about dups, armap, or anything like that */
+ while (ncopied < size)
+ {
+ bfd_size_type nread, tocopy;
-static void
-do_quick_append (archive_filename, files_to_append)
- char *archive_filename;
- char **files_to_append;
-{
- FILE *ofile, *ifile;
- char buf[BUFSIZE];
- long tocopy, thistime;
- bfd *temp;
- struct stat sbuf;
- boolean newfile = false;
- bfd_error = no_error;
+ tocopy = size - ncopied;
+ if (tocopy > BUFSIZE)
+ tocopy = BUFSIZE;
- if (stat (archive_filename, &sbuf) != 0)
- {
+ nread = bfd_bread (cbuf, tocopy, abfd);
+ if (nread != tocopy)
+ /* xgettext:c-format */
+ fatal (_("%s is not a valid archive"),
+ bfd_get_filename (abfd->my_archive));
-#ifndef __GO32__
+ /* See comment above; this saves disk arm motion. */
+ if (output_file == NULL)
+ output_file = open_output_file (abfd);
-/* KLUDGE ALERT! Temporary fix until I figger why
- * stat() is wrong ... think it's buried in GO32's IDT
- * - Jax
- */
+ /* 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 unsigned values. */
+ if ((bfd_size_type) fwrite (cbuf, 1, nread, output_file) != nread)
+ fatal ("%s: %s", output_filename, strerror (errno));
- if (errno != ENOENT)
- bfd_fatal (archive_filename);
-#endif
+ ncopied += tocopy;
+ }
- newfile = true;
+ free (cbuf);
}
- ofile = fopen (archive_filename, FOPEN_AUB);
- if (ofile == NULL)
- {
- perror (program_name);
- exit (1);
- }
+ fclose (output_file);
- temp = bfd_openr (archive_filename, NULL);
- if (temp == NULL)
- {
- bfd_fatal (archive_filename);
- }
- if (newfile == false)
- {
- if (bfd_check_format (temp, bfd_archive) != true)
- fatal ("%s is not an archive", archive_filename);
- }
- else
- {
- fwrite (ARMAG, 1, SARMAG, ofile);
- if (!silent_create)
- fprintf (stderr, "%s: creating %s\n",
- program_name, archive_filename);
- }
+ output_file = NULL;
- /* assume it's an achive, go straight to the end, sans $200 */
- fseek (ofile, 0, 2);
+ chmod (output_filename, buf.st_mode);
- for (; files_to_append && *files_to_append; ++files_to_append)
+ if (preserve_dates)
{
- struct ar_hdr *hdr = bfd_special_undocumented_glue (temp, *files_to_append);
- if (hdr == NULL)
- {
- bfd_fatal (*files_to_append);
- }
-
- BFD_SEND (temp, _bfd_truncate_arname, (temp, *files_to_append, (char *) hdr));
-
- ifile = fopen (*files_to_append, FOPEN_RB);
- if (ifile == NULL)
- {
- bfd_nonfatal (*files_to_append);
- }
-
- if (stat (*files_to_append, &sbuf) != 0)
- {
- bfd_nonfatal (*files_to_append);
- }
-
- tocopy = sbuf.st_size;
-
- /* XXX should do error-checking! */
- fwrite (hdr, 1, sizeof (struct ar_hdr), ofile);
-
- while (tocopy > 0)
- {
- thistime = tocopy;
- if (thistime > BUFSIZE)
- thistime = BUFSIZE;
- fread (buf, 1, thistime, ifile);
- fwrite (buf, 1, thistime, ofile);
- tocopy -= thistime;
- }
- fclose (ifile);
- if ((sbuf.st_size % 2) == 1)
- putc ('\n', ofile);
+ /* Set access time to modification time. Only st_mtime is
+ initialized by bfd_stat_arch_elt. */
+ buf.st_atime = buf.st_mtime;
+ set_times (output_filename, &buf);
}
- fclose (ofile);
- bfd_close (temp);
-}
+ output_filename = NULL;
+}
-void
-write_archive ()
+static void
+write_archive (bfd *iarch)
{
bfd *obfd;
- int namelen = strlen (inarch->filename);
- char *new_name = xmalloc (namelen + EXT_NAME_LEN);
- bfd *contents_head = inarch->next;
+ char *old_name, *new_name;
+ bfd *contents_head = iarch->archive_next;
- strcpy (new_name, inarch->filename);
+ old_name = (char *) xmalloc (strlen (bfd_get_filename (iarch)) + 1);
+ strcpy (old_name, bfd_get_filename (iarch));
+ new_name = make_tempname (old_name);
-#ifdef __GO32__ /* avoid long .extensions for MS-DOS */
- strcpy (new_name + namelen, "-a");
-#else
- strcpy (new_name + namelen, "-art");
-#endif
+ if (new_name == NULL)
+ bfd_fatal (_("could not create temporary file whilst writing archive"));
+
+ output_filename = new_name;
- obfd = bfd_openw (new_name,
- /* FIXME: violates abstraction; need a better protocol */
- (inarch->xvec ? bfd_get_target (inarch) : NULL));
+ obfd = bfd_openw (new_name, bfd_get_target (iarch));
if (obfd == NULL)
- bfd_fatal (inarch->filename);
+ bfd_fatal (old_name);
+
+ output_bfd = obfd;
bfd_set_format (obfd, bfd_archive);
been explicitly requested not to. */
obfd->has_armap = write_armap >= 0;
- if (bfd_set_archive_head (obfd, contents_head) != true)
- bfd_fatal (inarch->filename);
+ if (ar_truncate)
+ {
+ /* This should really use bfd_set_file_flags, but that rejects
+ archives. */
+ obfd->flags |= BFD_TRADITIONAL_FORMAT;
+ }
+
+ if (deterministic)
+ obfd->flags |= BFD_DETERMINISTIC_OUTPUT;
+
+ if (full_pathname)
+ obfd->flags |= BFD_ARCHIVE_FULL_PATH;
+
+ if (make_thin_archive || bfd_is_thin_archive (iarch))
+ bfd_set_thin_archive (obfd, TRUE);
+
+ if (!bfd_set_archive_head (obfd, contents_head))
+ bfd_fatal (old_name);
if (!bfd_close (obfd))
- bfd_fatal (inarch->filename);
+ bfd_fatal (old_name);
+
+ output_bfd = NULL;
+ output_filename = NULL;
/* We don't care if this fails; we might be creating the archive. */
- unlink (inarch->filename);
+ bfd_close (iarch);
- if (rename (new_name, inarch->filename) != 0)
- bfd_fatal (inarch->filename);
+ 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
into when altering. DEFAULT_POS should be how to interpret pos_default,
and should be a pos value. */
-bfd **
-get_pos_bfd (contents, default_pos)
- bfd **contents;
- enum pos default_pos;
+static bfd **
+get_pos_bfd (bfd **contents, enum pos default_pos, const char *default_posname)
{
bfd **after_bfd = contents;
- enum pos realpos = (postype == pos_default ? default_pos : postype);
+ enum pos realpos;
+ const char *realposname;
+
+ if (postype == pos_default)
+ {
+ realpos = default_pos;
+ realposname = default_posname;
+ }
+ else
+ {
+ realpos = postype;
+ realposname = posname;
+ }
if (realpos == pos_end)
{
while (*after_bfd)
- after_bfd = &((*after_bfd)->next);
+ after_bfd = &((*after_bfd)->archive_next);
}
else
{
- for (; *after_bfd; after_bfd = &(*after_bfd)->next)
- if (!strcmp ((*after_bfd)->filename, posname))
+ for (; *after_bfd; after_bfd = &(*after_bfd)->archive_next)
+ if (FILENAME_CMP ((*after_bfd)->filename, realposname) == 0)
{
if (realpos == pos_after)
- after_bfd = &(*after_bfd)->next;
+ after_bfd = &(*after_bfd)->archive_next;
break;
}
}
}
static void
-delete_members (files_to_delete)
- char **files_to_delete;
+delete_members (bfd *arch, char **files_to_delete)
{
bfd **current_ptr_ptr;
- boolean found;
- boolean something_changed = false;
+ bfd_boolean found;
+ bfd_boolean something_changed = FALSE;
+ int match_count;
+
for (; *files_to_delete != NULL; ++files_to_delete)
{
/* In a.out systems, the armap is optional. It's also called
if (!strcmp (*files_to_delete, "__.SYMDEF"))
{
- inarch->has_armap = false;
+ arch->has_armap = FALSE;
write_armap = -1;
continue;
}
- found = false;
- current_ptr_ptr = &(inarch->next);
+ found = FALSE;
+ match_count = 0;
+ current_ptr_ptr = &(arch->archive_next);
while (*current_ptr_ptr)
{
- if (strcmp (*files_to_delete, (*current_ptr_ptr)->filename) == 0)
+ if (FILENAME_CMP (normalize (*files_to_delete, arch),
+ (*current_ptr_ptr)->filename) == 0)
{
- found = true;
- something_changed = true;
- if (verbose)
- printf ("d - %s\n",
- *files_to_delete);
- *current_ptr_ptr = ((*current_ptr_ptr)->next);
- goto next_file;
- }
- else
- {
- current_ptr_ptr = &((*current_ptr_ptr)->next);
+ ++match_count;
+ if (counted_name_mode
+ && match_count != counted_name_counter)
+ {
+ /* Counting, and didn't match on count; go on to the
+ next one. */
+ }
+ else
+ {
+ found = TRUE;
+ something_changed = TRUE;
+ if (verbose)
+ printf ("d - %s\n",
+ *files_to_delete);
+ *current_ptr_ptr = ((*current_ptr_ptr)->archive_next);
+ goto next_file;
+ }
}
+
+ current_ptr_ptr = &((*current_ptr_ptr)->archive_next);
}
- if (verbose && found == false)
+ if (verbose && !found)
{
- printf ("No member named `%s'\n", *files_to_delete);
+ /* xgettext:c-format */
+ printf (_("No member named `%s'\n"), *files_to_delete);
}
next_file:
;
}
- if (something_changed == true)
- {
- write_archive ();
- }
+ if (something_changed)
+ write_archive (arch);
+ else
+ output_filename = NULL;
}
/* Reposition existing members within an archive */
static void
-move_members (files_to_move)
- char **files_to_move;
+move_members (bfd *arch, char **files_to_move)
{
bfd **after_bfd; /* New entries go after this one */
bfd **current_ptr_ptr; /* cdr pointer into contents */
for (; *files_to_move; ++files_to_move)
{
- current_ptr_ptr = &(inarch->next);
+ current_ptr_ptr = &(arch->archive_next);
while (*current_ptr_ptr)
{
bfd *current_ptr = *current_ptr_ptr;
- if (strcmp (normalize (*files_to_move), current_ptr->filename) == 0)
+ if (FILENAME_CMP (normalize (*files_to_move, arch),
+ current_ptr->filename) == 0)
{
/* Move this file to the end of the list - first cut from
where it is. */
- *current_ptr_ptr = current_ptr->next;
+ bfd *link_bfd;
+ *current_ptr_ptr = current_ptr->archive_next;
/* Now glue to end */
- after_bfd = get_pos_bfd (&inarch->next, pos_end);
+ after_bfd = get_pos_bfd (&arch->archive_next, pos_end, NULL);
+ link_bfd = *after_bfd;
*after_bfd = current_ptr;
- current_ptr->next = (bfd *) NULL;
+ current_ptr->archive_next = link_bfd;
if (verbose)
printf ("m - %s\n", *files_to_move);
goto next_file;
}
- current_ptr_ptr = &((*current_ptr_ptr)->next);
+
+ current_ptr_ptr = &((*current_ptr_ptr)->archive_next);
}
- fprintf (stderr, "%s: no entry %s in archive %s!\n",
- program_name, *files_to_move, inarch->filename);
- exit (1);
+ /* xgettext:c-format */
+ fatal (_("no entry %s in archive %s!"), *files_to_move, arch->filename);
+
next_file:;
}
- write_archive ();
+ write_archive (arch);
}
/* Ought to default to replacing in place, but this is existing practice! */
static void
-replace_members (files_to_move)
- char **files_to_move;
+replace_members (bfd *arch, char **files_to_move, bfd_boolean quick)
{
- bfd **after_bfd; /* New entries go after this one */
+ bfd_boolean changed = FALSE;
+ bfd **after_bfd; /* New entries go after this one. */
bfd *current;
bfd **current_ptr;
- bfd *temp;
while (files_to_move && *files_to_move)
{
- current_ptr = &inarch->next;
- while (*current_ptr)
+ if (! quick)
{
- current = *current_ptr;
-
- if (!strcmp (normalize (*files_to_move), current->filename))
+ current_ptr = &arch->archive_next;
+ while (*current_ptr)
{
- if (newer_only)
- {
- struct stat fsbuf, asbuf;
+ current = *current_ptr;
- if (current->arelt_data == NULL)
+ /* For compatibility with existing ar programs, we
+ permit the same file to be added multiple times. */
+ if (FILENAME_CMP (normalize (*files_to_move, arch),
+ normalize (current->filename, arch)) == 0
+ && current->arelt_data != NULL)
+ {
+ if (newer_only)
{
- /* This can only happen if you specify a file on the
- command line more than once. */
- fprintf (stderr,
- "%s: duplicate file specified: %s -- skipping\n",
- program_name, *files_to_move);
- goto next_file;
+ struct stat fsbuf, asbuf;
+
+ if (stat (*files_to_move, &fsbuf) != 0)
+ {
+ if (errno != ENOENT)
+ bfd_fatal (*files_to_move);
+ goto next_file;
+ }
+ if (bfd_stat_arch_elt (current, &asbuf) != 0)
+ /* xgettext:c-format */
+ fatal (_("internal stat error on %s"),
+ current->filename);
+
+ if (fsbuf.st_mtime <= asbuf.st_mtime)
+ goto next_file;
}
- if (stat (*files_to_move, &fsbuf) != 0)
+ after_bfd = get_pos_bfd (&arch->archive_next, pos_after,
+ current->filename);
+ if (ar_emul_replace (after_bfd, *files_to_move,
+ target, verbose))
{
- if (errno != ENOENT)
- bfd_fatal (*files_to_move);
- goto next_file;
+ /* Snip out this entry from the chain. */
+ *current_ptr = (*current_ptr)->archive_next;
+ changed = TRUE;
}
- if (bfd_stat_arch_elt (current, &asbuf) != 0)
- fatal ("internal stat error on %s", current->filename);
- if (fsbuf.st_mtime <= asbuf.st_mtime)
- goto next_file;
+ goto next_file;
}
-
- /* snip out this entry from the chain */
- *current_ptr = current->next;
-
- after_bfd = get_pos_bfd (&inarch->next, pos_end);
- temp = *after_bfd;
- *after_bfd = bfd_openr (*files_to_move, NULL);
- if (*after_bfd == (bfd *) NULL)
- {
- bfd_fatal (*files_to_move);
- }
- (*after_bfd)->next = temp;
-
- if (verbose)
- {
- printf ("%c - %s\n", (postype == pos_after ? 'r' : 'a'),
- *files_to_move);
- }
- goto next_file;
+ current_ptr = &(current->archive_next);
}
- current_ptr = &(current->next);
}
- /* It isn't in there, so add to end */
+ /* Add to the end of the archive. */
+ after_bfd = get_pos_bfd (&arch->archive_next, pos_end, NULL);
- after_bfd = get_pos_bfd (&inarch->next, pos_end);
- temp = *after_bfd;
- *after_bfd = bfd_openr (*files_to_move, NULL);
- if (*after_bfd == (bfd *) NULL)
- {
- bfd_fatal (*files_to_move);
- }
- if (verbose)
- {
- printf ("c - %s\n", *files_to_move);
- }
-
- (*after_bfd)->next = temp;
+ if (ar_emul_append (after_bfd, *files_to_move, target,
+ verbose, make_thin_archive))
+ changed = TRUE;
next_file:;
files_to_move++;
}
- write_archive ();
+ if (changed)
+ write_archive (arch);
+ else
+ output_filename = NULL;
}
-static void
-ranlib_only (archname)
- char *archname;
+static int
+ranlib_only (const char *archname)
{
+ bfd *arch;
+
+ if (get_file_size (archname) < 1)
+ return 1;
write_armap = 1;
- open_inarch (archname);
- write_archive ();
- exit (0);
+ arch = open_inarch (archname, (char *) NULL);
+ if (arch == NULL)
+ xexit (1);
+ write_archive (arch);
+ return 0;
+}
+
+/* Update the timestamp of the symbol map of an archive. */
+
+static int
+ranlib_touch (const char *archname)
+{
+#ifdef __GO32__
+ /* I don't think updating works on go32. */
+ ranlib_only (archname);
+#else
+ int f;
+ bfd *arch;
+ char **matching;
+
+ if (get_file_size (archname) < 1)
+ return 1;
+ f = open (archname, O_RDWR | O_BINARY, 0);
+ if (f < 0)
+ {
+ bfd_set_error (bfd_error_system_call);
+ bfd_fatal (archname);
+ }
+
+ arch = bfd_fdopenr (archname, (const char *) NULL, f);
+ if (arch == NULL)
+ bfd_fatal (archname);
+ if (! bfd_check_format_matches (arch, bfd_archive, &matching))
+ {
+ bfd_nonfatal (archname);
+ if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
+ {
+ list_matching_formats (matching);
+ free (matching);
+ }
+ xexit (1);
+ }
+
+ if (! bfd_has_map (arch))
+ /* xgettext:c-format */
+ fatal (_("%s: no archive map to update"), archname);
+
+ if (deterministic)
+ arch->flags |= BFD_DETERMINISTIC_OUTPUT;
+
+ bfd_update_armap_timestamp (arch);
+
+ if (! bfd_close (arch))
+ bfd_fatal (archname);
+#endif
+ return 0;
}
/* Things which are interesting to map over all or some of the files: */
static void
-print_descr (abfd)
- bfd *abfd;
+print_descr (bfd *abfd)
{
- print_arelt_descr (stdout, abfd, verbose);
+ print_arelt_descr (stdout, abfd, verbose, display_offsets);
}
projects / deliverable / binutils-gdb.git / blobdiff