From 3de39064591933bc0fbc9141406a206644ced4fd Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sun, 12 Sep 1999 18:14:07 +0000 Subject: [PATCH] 1999-09-12 Donn Terry * ar.c (counted_name_mode): New static variable. (counted_name_counter): New static variable. (map_over_members): Handle counted mode. (usage): Mention N modifier. (main): Handle N modifier. (delete_members): Handle counted mode. * binutils.texi, ar.1: Document N modifier. --- binutils/ChangeLog | 9 +++++ binutils/ar.1 | 38 ++++++++++++++------- binutils/ar.c | 77 +++++++++++++++++++++++++++++++++--------- binutils/binutils.texi | 25 ++++++++------ 4 files changed, 110 insertions(+), 39 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 3abe0aec3d6..3c48546efc0 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,13 @@ 1999-09-12 Donn Terry + * ar.c (counted_name_mode): New static variable. + (counted_name_counter): New static variable. + (map_over_members): Handle counted mode. + (usage): Mention N modifier. + (main): Handle N modifier. + (delete_members): Handle counted mode. + * binutils.texi, ar.1: Document N modifier. + * ar.c (print_contents): Change printing of member name for POSIX.2 conformance. @@ -14,6 +22,7 @@ (usage): Mention P modifier. (normalize): If full_pathname is true, don't do anything. (main): Accept P modifier. + (delete_members): Call normalize on command line parameter. * binutils.texi, ar.1: Document P modifier. 1999-09-09 Andreas Schwab diff --git a/binutils/ar.1 b/binutils/ar.1 index 5a9a9d56d7e..cd71a407b37 100644 --- a/binutils/ar.1 +++ b/binutils/ar.1 @@ -14,10 +14,13 @@ ar \- create, modify, and extract from archives. .hy 0 .na .BR ar " [\|" "-" "\|]"\c -.I {dmpqrtx}[abcilosSuvV] \c +.I {dmpqrtx}[abcfilNoPsSuvV] \c [\|\c .I membername\c \&\|] \c +[\|\c +.I count\c +\&\|] \c .I archive\c \& \c .I files\c @@ -384,18 +387,6 @@ program on some systems. If this is a concern, the modifier may be used to truncate file names when putting them in the archive. -.TP -.B P -Use the full path name when matching names in the archive. -.B ar -can not create an archive with a full path name (such archives are not -POSIX complaint), but other archive creators can. This option will -cause -.B ar -to match file names using a complete path name, which can be -convenient when extracting a single file from an archive created by -another tool. - .TP .B i Insert new files \c @@ -417,6 +408,15 @@ member must be present as the \c .B l This modifier is accepted but not used. +.TP +.B N +Uses the +.I count +parameter. This is used if there are multiple entries in the archive +with the same name. Extract or delete instance +.I count +of the given name from the archive. + .TP .B o Preserve the \c @@ -425,6 +425,18 @@ Preserve the \c you do not specify this modifier, files extracted from the archive will be stamped with the time of extraction. +.TP +.B P +Use the full path name when matching names in the archive. +.B ar +can not create an archive with a full path name (such archives are not +POSIX complaint), but other archive creators can. This option will +cause +.B ar +to match file names using a complete path name, which can be +convenient when extracting a single file from an archive created by +another tool. + .TP .B s Write an object-file index into the archive, or update an existing one, diff --git a/binutils/ar.c b/binutils/ar.c index 4fe166aa89b..50d1edc726c 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -147,6 +147,11 @@ enum pos static bfd ** get_pos_bfd PARAMS ((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 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; @@ -176,6 +181,7 @@ map_over_members (arch, function, files, count) int count; { bfd *head; + int match_count; if (count == 0) { @@ -186,6 +192,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 @@ -196,6 +203,7 @@ map_over_members (arch, function, files, count) { boolean found = false; + match_count = 0; for (head = arch->next; head; head = head->next) { PROGRESS (1); @@ -209,6 +217,15 @@ map_over_members (arch, function, files, count) if ((head->filename != NULL) && (!strcmp (normalize (*files, arch), head->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); } @@ -232,7 +249,8 @@ usage (help) if (! is_ranlib) { /* xgettext:c-format */ - fprintf (s, _("Usage: %s [-]{dmpqrstx}[abcilosSuvV] [member-name] archive-file file...\n"), program_name); + fprintf (s, _("Usage: %s [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n"), + program_name); /* xgettext:c-format */ fprintf (s, _(" %s -M [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 (strcmp (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) diff --git a/binutils/binutils.texi b/binutils/binutils.texi index b2a31298257..b08776ba894 100644 --- a/binutils/binutils.texi +++ b/binutils/binutils.texi @@ -176,7 +176,7 @@ Create the files needed to build and use Dynamic Link Libraries @cindex archives @cindex collections of files @smallexample -ar [-]@var{p}[@var{mod} [@var{relpos}]] @var{archive} [@var{member}@dots{}] +ar [-]@var{p}[@var{mod} [@var{relpos}] [@var{count}]] @var{archive} [@var{member}@dots{}] ar -M [