X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Far.c;h=fe1c6402222d4166f373de729a0abb3d2d55b281;hb=56424b64208bd26f7e7c787b4d0af06287d387e4;hp=7d431c4627ed65b5688afb9573b8e70bf7e367b9;hpb=fa803dc60f0bf01297674c41d001798e18ade4dc;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/ar.c b/binutils/ar.c index 7d431c4627..fe1c640222 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -1,29 +1,31 @@ /* ar.c - Archive modify and extract. - Copyright 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 + 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 2 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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. */ /* 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. -*/ + more consistent. */ + #include "bfd.h" #include "libiberty.h" #include "progress.h" @@ -31,73 +33,48 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "aout/ar.h" #include "libbfd.h" #include "arsup.h" +#include "filenames.h" +#include "binemul.h" #include -#ifdef HAVE_GOOD_UTIME_H -#include -#else /* ! HAVE_GOOD_UTIME_H */ -#ifdef HAVE_UTIMES -#include -#endif /* HAVE_UTIMES */ -#endif /* ! HAVE_GOOD_UTIME_H */ - #ifdef __GO32___ #define EXT_NAME_LEN 3 /* bufflen of addition to name if it's MS-DOS */ #else #define EXT_NAME_LEN 6 /* ditto for *NIX */ #endif -#define BUFSIZE 8192 +/* We need to open files in binary modes on system where that makes a + difference. */ +#ifndef O_BINARY +#define O_BINARY 0 +#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 const char * -normalize PARAMS ((const char *, bfd *)); - -static void -remove_output PARAMS ((void)); - -static void -map_over_members PARAMS ((bfd *, void (*)(bfd *), char **, int)); - -static void -print_contents PARAMS ((bfd * member)); - -static void -delete_members PARAMS ((bfd *, char **files_to_delete)); - -#if 0 -static void -do_quick_append PARAMS ((const char *archive_filename, - char **files_to_append)); -#endif - -static void -move_members PARAMS ((bfd *, char **files_to_move)); - -static void -replace_members PARAMS ((bfd *, char **files_to_replace, boolean quick)); - -static void -print_descr PARAMS ((bfd * abfd)); - -static void -write_archive PARAMS ((bfd *)); - -static void -ranlib_only PARAMS ((const char *archname)); - -static void -ranlib_touch PARAMS ((const char *archname)); + bfd_special_undocumented_glue (bfd * abfd, const char *filename); + +/* 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 void ranlib_only (const char *archname); +static void ranlib_touch (const char *archname); +static void usage (int); /** Globals and flags */ -int mri_mode; +static int mri_mode; /* This flag distinguishes between ar and ranlib: 1 means this is 'ranlib'; 0 means this is 'ar'. @@ -119,7 +96,7 @@ int newer_only = 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 @@ -139,13 +116,26 @@ enum pos pos_default, pos_before, pos_after, pos_end } postype = pos_default; +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 boolean ar_truncate = false; +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; int interactive = 0; -void -mri_emul () +static void +mri_emul (void) { interactive = isatty (fileno (stdin)); yyparse (); @@ -156,13 +146,10 @@ mri_emul () whose name matches one in FILES. */ static void -map_over_members (arch, function, files, count) - bfd *arch; - void (*function) PARAMS ((bfd *)); - char **files; - int count; +map_over_members (bfd *arch, void (*function)(bfd *), char **files, int count) { bfd *head; + int match_count; if (count == 0) { @@ -173,6 +160,7 @@ map_over_members (arch, function, files, count) } 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 @@ -181,8 +169,9 @@ map_over_members (arch, function, files, count) for (; count > 0; files++, count--) { - boolean found = false; + bfd_boolean found = FALSE; + match_count = 0; for (head = arch->next; head; head = head->next) { PROGRESS (1); @@ -194,39 +183,84 @@ map_over_members (arch, function, files, count) bfd_stat_arch_elt (head, &buf); } if ((head->filename != NULL) && - (!strcmp (*files, head->filename))) + (!FILENAME_CMP (normalize (*files, arch), head->filename))) { - found = true; + ++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); } } if (!found) - fprintf (stderr, "no entry %s in archive\n", *files); + /* xgettext:c-format */ + fprintf (stderr, _("no entry %s in archive\n"), *files); } } -boolean operation_alters_arch = false; +bfd_boolean operation_alters_arch = FALSE; -void -usage (help) - int help; +static void +usage (int help) { FILE *s; s = help ? stdout : stderr; + if (! is_ranlib) - fprintf (s, "\ -Usage: %s [-]{dmpqrtx}[abcilosuvV] [member-name] archive-file file...\n\ - %s -M [ - read options from \n")); + + ar_emul_usage (s); + } else - fprintf (s, "\ -Usage: %s [-vV] archive\n", program_name); + { + /* 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\ + @ Read options from \n\ + -h --help Print this help message\n\ + -V --version Print version information\n")); + } list_supported_targets (program_name, stderr); if (help) - fprintf (s, "Report bugs to bug-gnu-utils@prep.ai.mit.edu\n"); + fprintf (s, _("Report bugs to %s\n"), REPORT_BUGS_TO); xexit (help ? 0 : 1); } @@ -235,13 +269,24 @@ Usage: %s [-vV] archive\n", program_name); name which we will use in an archive. */ static const char * -normalize (file, abfd) - const char *file; - bfd *abfd; +normalize (const char *file, bfd *abfd) { const char *filename; + if (full_pathname) + return file; + filename = strrchr (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 != (char *) NULL) filename++; else @@ -265,30 +310,30 @@ normalize (file, abfd) /* Remove any output file. This is only called via xatexit. */ -static char *output_filename = NULL; +static const char *output_filename = NULL; static FILE *output_file = NULL; static bfd *output_bfd = NULL; static void -remove_output () +remove_output (void) { if (output_filename != NULL) { - if (output_bfd != NULL && output_bfd->iostream != NULL) - fclose ((FILE *) (output_bfd->iostream)); + if (output_bfd != NULL) + bfd_cache_close (output_bfd); if (output_file != NULL) fclose (output_file); - unlink (output_filename); + unlink_if_ordinary (output_filename); } } /* The option parsing should be in its own function. It will be when I have getopt working. */ +int main (int, char **); + int -main (argc, argv) - int argc; - char **argv; +main (int argc, char **argv) { char *arg_ptr; char c; @@ -299,23 +344,47 @@ main (argc, argv) } operation = none; int arg_index; char **files; + int file_count; char *inarch_filename; int show_version; + int i; + int do_posix = 0; + +#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); + expandargv (&argc, &argv); + if (is_ranlib < 0) { char *temp; temp = strrchr (program_name, '/'); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + /* We could have foo/bar\\baz, or foo\\bar, or d:bar. */ + char *bslash = strrchr (program_name, '\\'); + if (temp == NULL || (bslash != NULL && bslash > temp)) + temp = bslash; + if (temp == NULL && program_name[0] != '\0' && program_name[1] == ':') + temp = program_name + 1; + } +#endif if (temp == NULL) temp = program_name; else ++temp; if (strlen (temp) >= 6 - && strcmp (temp + strlen (temp) - 6, "ranlib") == 0) + && FILENAME_CMP (temp + strlen (temp) - 6, "ranlib") == 0) is_ranlib = 1; else is_ranlib = 0; @@ -337,16 +406,27 @@ main (argc, argv) START_PROGRESS (program_name, 0); bfd_init (); + set_default_bfd_target (); + show_version = 0; 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) { - boolean touch = false; + bfd_boolean touch = FALSE; - if (argc < 2 || strcmp (argv[1], "--help") == 0) - usage (); + if (argc < 2 + || strcmp (argv[1], "--help") == 0 + || strcmp (argv[1], "-h") == 0 + || strcmp (argv[1], "-H") == 0) + usage (0); if (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "-v") == 0 || strncmp (argv[1], "--v", 3) == 0) @@ -355,7 +435,7 @@ main (argc, argv) if (strcmp (argv[1], "-t") == 0) { ++arg_index; - touch = true; + touch = TRUE; } while (arg_index < argc) { @@ -375,100 +455,128 @@ main (argc, argv) } if (argc < 2) - usage (); + usage (0); - arg_ptr = argv[1]; + arg_index = 1; + arg_ptr = argv[arg_index]; if (*arg_ptr == '-') - ++arg_ptr; /* compatibility */ + { + /* When the first option starts with '-' we support POSIX-compatible + option parsing. */ + do_posix = 1; + ++arg_ptr; /* compatibility */ + } - while ((c = *arg_ptr++) != '\0') + do { - switch (c) + while ((c = *arg_ptr++) != '\0') { - 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; + 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': + break; + case 'c': + silent_create = 1; + break; + case 'o': + preserve_dates = 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; + default: + /* xgettext:c-format */ + non_fatal (_("illegal option -- %c"), c); + usage (0); } - case 'l': - break; - case 'c': - silent_create = 1; - break; - case 'o': - preserve_dates = 1; - break; - case 'V': - show_version = true; - 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 'f': - ar_truncate = true; - break; - default: - fprintf (stderr, "%s: illegal option -- %c\n", program_name, c); - usage (); } + + /* With POSIX-compatible option parsing continue with the next + argument if it starts with '-'. */ + if (do_posix && arg_index + 1 < argc && argv[arg_index + 1][0] == '-') + arg_ptr = argv[++arg_index] + 1; + else + do_posix = 0; } + while (do_posix); if (show_version) print_version ("ar"); - if (argc < 3) - usage (); + ++arg_index; + if (arg_index >= argc) + usage (0); if (mri_mode) { @@ -478,6 +586,10 @@ main (argc, argv) { bfd *arch; + /* 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) @@ -486,57 +598,32 @@ main (argc, argv) if ((operation == none || operation == print_table) && write_armap == 1) { - ranlib_only (argv[2]); + ranlib_only (argv[arg_index]); xexit (0); } 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."); - - arg_index = 2; + fatal (_("`u' is only meaningful with the `r' option.")); if (postype != pos_default) posname = argv[arg_index++]; - inarch_filename = argv[arg_index++]; - - files = arg_index < argc ? argv + arg_index : NULL; - -#if 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 do a quick append if we need to construct an - extended name table, because do_quick_append won't be able to - rebuild the name table. Unfortunately, at this point we - don't actually know the maximum name length permitted by this - object file format. So, we guess. FIXME. */ - if (operation == quick_append && ! ar_truncate) + if (counted_name_mode) { - char **chk; - - for (chk = files; chk != NULL && *chk != '\0'; chk++) - { - if (strlen (normalize (*chk, (bfd *) NULL)) > 14) - { - operation = replace; - break; - } - } + if (operation != extract && operation != delete) + fatal (_("`N' is only meaningful with the `x' and `d' options.")); + counted_name_counter = atoi (argv[arg_index++]); + if (counted_name_counter <= 0) + fatal (_("Value for `N' must be positive.")); } - if (operation == quick_append) - { - /* 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); - xexit (0); - } -#endif + inarch_filename = argv[arg_index++]; + + files = arg_index < argc ? argv + arg_index : NULL; + file_count = argc - arg_index; arch = open_inarch (inarch_filename, files == NULL ? (char *) NULL : files[0]); @@ -544,38 +631,43 @@ main (argc, argv) switch (operation) { case print_table: - map_over_members (arch, print_descr, files, argc - 3); + map_over_members (arch, print_descr, files, file_count); break; case print_files: - map_over_members (arch, print_contents, files, argc - 3); + map_over_members (arch, print_contents, files, file_count); break; case extract: - map_over_members (arch, extract_file, files, argc - 3); + map_over_members (arch, extract_file, files, file_count); break; case delete: if (files != NULL) delete_members (arch, files); + else + output_filename = NULL; break; case move: if (files != NULL) move_members (arch, files); + else + output_filename = NULL; break; case replace: case quick_append: if (files != NULL || write_armap > 0) 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); - xexit (1); + /* xgettext:c-format */ + fatal (_("internal error -- this option not implemented")); } } @@ -586,9 +678,7 @@ main (argc, argv) } bfd * -open_inarch (archive_filename, file) - const char *archive_filename; - const char *file; +open_inarch (const char *archive_filename, const char *file) { const char *target; bfd **last_one; @@ -603,14 +693,15 @@ open_inarch (archive_filename, file) if (stat (archive_filename, &sbuf) != 0) { - bfd *obj; +#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 - */ + stat() is wrong ... think it's buried in GO32's IDT - Jax */ if (errno != ENOENT) bfd_fatal (archive_filename); #endif @@ -625,12 +716,17 @@ open_inarch (archive_filename, file) /* Try to figure out the target to use for the archive from the first object on the list. */ - obj = bfd_openr (file, NULL); - if (obj != NULL) + if (file != NULL) { - if (bfd_check_format (obj, bfd_object)) - target = bfd_get_target (obj); - (void) bfd_close (obj); + bfd *obj; + + obj = bfd_openr (file, NULL); + if (obj != NULL) + { + if (bfd_check_format (obj, bfd_object)) + target = bfd_get_target (obj); + (void) bfd_close (obj); + } } /* Create an empty archive. */ @@ -639,6 +735,11 @@ open_inarch (archive_filename, file) || ! 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; } arch = bfd_openr (archive_filename, target); @@ -676,20 +777,21 @@ open_inarch (archive_filename, file) } static void -print_contents (abfd) - bfd *abfd; +print_contents (bfd *abfd) { int ncopied = 0; char *cbuf = 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\n\n", bfd_get_filename (abfd)); + /* xgettext:c-format */ + 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) @@ -700,10 +802,10 @@ print_contents (abfd) if (tocopy > BUFSIZE) tocopy = BUFSIZE; - nread = bfd_read (cbuf, 1, tocopy, abfd); /* oops -- broke - abstraction! */ + nread = bfd_bread (cbuf, (bfd_size_type) tocopy, abfd); if (nread != tocopy) - fatal ("%s is not a valid archive", + /* xgettext:c-format */ + fatal (_("%s is not a valid archive"), bfd_get_filename (bfd_my_archive (abfd))); fwrite (cbuf, 1, nread, stdout); ncopied += tocopy; @@ -722,32 +824,37 @@ print_contents (abfd) Gilmore */ void -extract_file (abfd) - bfd *abfd; +extract_file (bfd *abfd) { FILE *ostream; char *cbuf = xmalloc (BUFSIZE); int nread, tocopy; - int ncopied = 0; + long ncopied = 0; long 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 (size < 0) + /* xgettext:c-format */ + fatal (_("stat returns negative size for %s"), bfd_get_filename (abfd)); + 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; + ostream = NULL; if (size == 0) { /* Seems like an abstraction violation, eh? Well it's OK! */ output_filename = bfd_get_filename (abfd); ostream = fopen (bfd_get_filename (abfd), FOPEN_WB); - if (!ostream) + if (ostream == NULL) { perror (bfd_get_filename (abfd)); xexit (1); @@ -762,19 +869,20 @@ extract_file (abfd) if (tocopy > BUFSIZE) tocopy = BUFSIZE; - nread = bfd_read (cbuf, 1, tocopy, abfd); + nread = bfd_bread (cbuf, (bfd_size_type) tocopy, abfd); if (nread != tocopy) - fatal ("%s is not a valid archive", + /* xgettext:c-format */ + fatal (_("%s is not a valid archive"), bfd_get_filename (bfd_my_archive (abfd))); /* See comment above; this saves disk arm motion */ - if (!ostream) + if (ostream == NULL) { /* Seems like an abstraction violation, eh? Well it's OK! */ output_filename = bfd_get_filename (abfd); ostream = fopen (bfd_get_filename (abfd), FOPEN_WB); - if (!ostream) + if (ostream == NULL) { perror (bfd_get_filename (abfd)); xexit (1); @@ -786,7 +894,8 @@ extract_file (abfd) ncopied += tocopy; } - fclose (ostream); + if (ostream != NULL) + fclose (ostream); output_file = NULL; output_filename = NULL; @@ -795,147 +904,17 @@ extract_file (abfd) if (preserve_dates) { -#ifdef HAVE_GOOD_UTIME_H - struct utimbuf tb; - tb.actime = buf.st_mtime; - tb.modtime = buf.st_mtime; - utime (bfd_get_filename (abfd), &tb); /* FIXME check result */ -#else /* ! HAVE_GOOD_UTIME_H */ -#ifndef HAVE_UTIMES - long tb[2]; - tb[0] = buf.st_mtime; - tb[1] = buf.st_mtime; - utime (bfd_get_filename (abfd), tb); /* FIXME check result */ -#else /* HAVE_UTIMES */ - 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 /* HAVE_UTIMES */ -#endif /* ! HAVE_GOOD_UTIME_H */ + /* Set access time to modification time. Only st_mtime is + initialized by bfd_stat_arch_elt. */ + buf.st_atime = buf.st_mtime; + set_times (bfd_get_filename (abfd), &buf); } -free (cbuf); -} - -#if 0 - -/* We don't use this anymore. Too many systems expect ar to rebuild - the symbol table even when q is used. */ -/* Just do it quickly; don't worry about dups, armap, or anything like that */ - -static void -do_quick_append (archive_filename, files_to_append) - const char *archive_filename; - char **files_to_append; -{ - FILE *ofile, *ifile; - char *buf = xmalloc (BUFSIZE); - long tocopy, thistime; - bfd *temp; - struct stat sbuf; - boolean newfile = false; - bfd_set_error (bfd_error_no_error); - - if (stat (archive_filename, &sbuf) != 0) - { - -#ifndef __GO32__ - -/* 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 - - newfile = true; - } - - ofile = fopen (archive_filename, FOPEN_AUB); - if (ofile == NULL) - { - perror (program_name); - xexit (1); - } - - 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); - } - - if (ar_truncate) - temp->flags |= BFD_TRADITIONAL_FORMAT; - - /* assume it's an achive, go straight to the end, sans $200 */ - fseek (ofile, 0, 2); - - for (; files_to_append && *files_to_append; ++files_to_append) - { - 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 ('\012', ofile); - } - fclose (ofile); - bfd_close (temp); - free (buf); + free (cbuf); } -#endif /* 0 */ - static void -write_archive (iarch) - bfd *iarch; +write_archive (bfd *iarch) { bfd *obfd; char *old_name, *new_name; @@ -967,7 +946,7 @@ write_archive (iarch) obfd->flags |= BFD_TRADITIONAL_FORMAT; } - if (bfd_set_archive_head (obfd, contents_head) != true) + if (!bfd_set_archive_head (obfd, contents_head)) bfd_fatal (old_name); if (!bfd_close (obfd)) @@ -978,23 +957,32 @@ write_archive (iarch) /* We don't care if this fails; we might be creating the archive. */ bfd_close (iarch); - unlink (old_name); - if (rename (new_name, old_name) != 0) - bfd_fatal (old_name); + if (smart_rename (new_name, old_name, 0) != 0) + xexit (1); } /* 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) { @@ -1004,7 +992,7 @@ get_pos_bfd (contents, default_pos) else { for (; *after_bfd; after_bfd = &(*after_bfd)->next) - if (!strcmp ((*after_bfd)->filename, posname)) + if (FILENAME_CMP ((*after_bfd)->filename, realposname) == 0) { if (realpos == pos_after) after_bfd = &(*after_bfd)->next; @@ -1015,13 +1003,13 @@ get_pos_bfd (contents, default_pos) } static void -delete_members (arch, files_to_delete) - bfd *arch; - 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 @@ -1032,52 +1020,61 @@ delete_members (arch, files_to_delete) if (!strcmp (*files_to_delete, "__.SYMDEF")) { - arch->has_armap = false; + arch->has_armap = FALSE; write_armap = -1; continue; } - found = false; + found = FALSE; + match_count = 0; current_ptr_ptr = &(arch->next); while (*current_ptr_ptr) { - if (strcmp (*files_to_delete, (*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 + if (FILENAME_CMP (normalize (*files_to_delete, arch), + (*current_ptr_ptr)->filename) == 0) { - 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)->next); + goto next_file; + } } + + current_ptr_ptr = &((*current_ptr_ptr)->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 (arch); - } + if (something_changed) + write_archive (arch); + else + output_filename = NULL; } /* Reposition existing members within an archive */ static void -move_members (arch, files_to_move) - bfd *arch; - 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 */ @@ -1088,8 +1085,8 @@ move_members (arch, files_to_move) while (*current_ptr_ptr) { bfd *current_ptr = *current_ptr_ptr; - if (strcmp (normalize (*files_to_move, arch), - 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. */ @@ -1097,7 +1094,7 @@ move_members (arch, files_to_move) *current_ptr_ptr = current_ptr->next; /* Now glue to end */ - after_bfd = get_pos_bfd (&arch->next, pos_end); + after_bfd = get_pos_bfd (&arch->next, pos_end, NULL); link = *after_bfd; *after_bfd = current_ptr; current_ptr->next = link; @@ -1110,9 +1107,9 @@ move_members (arch, files_to_move) current_ptr_ptr = &((*current_ptr_ptr)->next); } - fprintf (stderr, "%s: no entry %s in archive %s!\n", - program_name, *files_to_move, arch->filename); - xexit (1); + /* xgettext:c-format */ + fatal (_("no entry %s in archive %s!"), *files_to_move, arch->filename); + next_file:; } @@ -1122,16 +1119,12 @@ move_members (arch, files_to_move) /* Ought to default to replacing in place, but this is existing practice! */ static void -replace_members (arch, files_to_move, quick) - bfd *arch; - char **files_to_move; - boolean quick; +replace_members (bfd *arch, char **files_to_move, bfd_boolean quick) { - boolean changed = false; - 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) { @@ -1144,8 +1137,8 @@ replace_members (arch, files_to_move, quick) /* For compatibility with existing ar programs, we permit the same file to be added multiple times. */ - if (strcmp (normalize (*files_to_move, arch), - normalize (current->filename, arch)) == 0 + if (FILENAME_CMP (normalize (*files_to_move, arch), + normalize (current->filename, arch)) == 0 && current->arelt_data != NULL) { if (newer_only) @@ -1159,30 +1152,23 @@ replace_members (arch, files_to_move, quick) goto next_file; } if (bfd_stat_arch_elt (current, &asbuf) != 0) - fatal ("internal stat error on %s", current->filename); + /* xgettext:c-format */ + fatal (_("internal stat error on %s"), + current->filename); if (fsbuf.st_mtime <= asbuf.st_mtime) goto next_file; } - /* snip out this entry from the chain */ - *current_ptr = current->next; - - after_bfd = get_pos_bfd (&arch->next, pos_end); - temp = *after_bfd; - *after_bfd = bfd_openr (*files_to_move, NULL); - if (*after_bfd == (bfd *) NULL) + after_bfd = get_pos_bfd (&arch->next, pos_after, + current->filename); + if (ar_emul_replace (after_bfd, *files_to_move, + verbose)) { - bfd_fatal (*files_to_move); + /* Snip out this entry from the chain. */ + *current_ptr = (*current_ptr)->next; + changed = TRUE; } - (*after_bfd)->next = temp; - - if (verbose) - { - printf ("r - %s\n", *files_to_move); - } - - changed = true; goto next_file; } @@ -1191,22 +1177,10 @@ replace_members (arch, files_to_move, quick) } /* Add to the end of the archive. */ + after_bfd = get_pos_bfd (&arch->next, pos_end, NULL); - after_bfd = get_pos_bfd (&arch->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 ("a - %s\n", *files_to_move); - } - - (*after_bfd)->next = temp; - - changed = true; + if (ar_emul_append (after_bfd, *files_to_move, verbose)) + changed = TRUE; next_file:; @@ -1215,14 +1189,17 @@ replace_members (arch, files_to_move, quick) if (changed) write_archive (arch); + else + output_filename = NULL; } static void -ranlib_only (archname) - const char *archname; +ranlib_only (const char *archname) { bfd *arch; + if (get_file_size (archname) < 1) + return; write_armap = 1; arch = open_inarch (archname, (char *) NULL); if (arch == NULL) @@ -1233,8 +1210,7 @@ ranlib_only (archname) /* Update the timestamp of the symbol map of an archive. */ static void -ranlib_touch (archname) - const char *archname; +ranlib_touch (const char *archname) { #ifdef __GO32__ /* I don't think updating works on go32. */ @@ -1244,7 +1220,9 @@ ranlib_touch (archname) bfd *arch; char **matching; - f = open (archname, O_RDWR, 0); + if (get_file_size (archname) < 1) + return; + f = open (archname, O_RDWR | O_BINARY, 0); if (f < 0) { bfd_set_error (bfd_error_system_call); @@ -1266,7 +1244,8 @@ ranlib_touch (archname) } if (! bfd_has_map (arch)) - fatal ("%s: no archive map to update", archname); + /* xgettext:c-format */ + fatal (_("%s: no archive map to update"), archname); bfd_update_armap_timestamp (arch); @@ -1278,8 +1257,7 @@ ranlib_touch (archname) /* 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); }