PR binutils/12058

        * ar.c (usage): Revert previous change.  Describe how 's' can be
        used as a command letter.
        * doc/binutils.texi (ar cmdline): Describe how 's' can be used as
        a command letter.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7b6db60e7aea28f67668180232f29ef9bbaf4013..13c5fff3884de9767cf3e3e6e62c28085dcb13ed 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-29  Nick Clifton  <nickc@redhat.com>
+
+       PR binutils/12058
+       * ar.c (usage): Revert previous change.  Describe how 's' can be
+       used as a command letter.
+       * doc/binutils.texi (ar cmdline): Describe how 's' can be used as
+       a command letter.
+
 2010-10-29  Bernd Schmidt  <bernds@codesourcery.com>
             Joseph Myers  <joseph@codesourcery.com>
 

diff --git a/binutils/ar.c b/binutils/ar.c
index c2e6f4c4c58e3175ae509d9b910f8b89560c74e3..5fe43bc4c27bea9a5a487ecc7addcb2b7633df71 100644 (file)
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -230,9 +230,9 @@ usage (int help)
       /* xgettext:c-format */
       const char * command_line =
 #if BFD_SUPPORTS_PLUGINS
-       _("Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrtx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n");
+       _("Usage: %s [emulation options] [--plugin <name>] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n");
 #else
-       _("Usage: %s [emulation options] [-]{dmpqrtx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n");
+       _("Usage: %s [emulation options] [-]{dmpqrstx}[abcfilNoPsSuvV] [member-name] [count] archive-file file...\n");
 #endif
       fprintf (s, command_line, program_name);
 
@@ -244,6 +244,7 @@ usage (int help)
       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            - display contents of archive\n"));
       fprintf (s, _("  x[o]         - extract file(s) from the archive\n"));
       fprintf (s, _(" command specific modifiers:\n"));

diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
index 82c3a675fc0a8ff263d28f1e7cc88c3cd585904b..26d690760c09f7f641eb107c2d8a7c860bc49f7a 100644 (file)
--- a/binutils/doc/binutils.texi
+++ b/binutils/doc/binutils.texi
@@ -345,6 +345,13 @@ output for each file inserted, along with one of the letters @samp{a} or
 @samp{r} to indicate whether the file was appended (no old member
 deleted) or replaced.
 
+@item s
+@cindex ranlib
+Add an index to the archive, or update it if it already exists.  Note
+this command is an exception to the rule that there can only be one
+command letter, as it is possible to use it as either a command or a
+modifier.  In either case it does the same thing.
+
 @item t
 @cindex contents of archive
 Display a @emph{table} listing the contents of @var{archive}, or those