Accept and ignore -f command line option.

Improve usage message.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 530dbb0ebb4ef3f02cbc8030c02287ca07636ec2..0403f87fd307eae2eb84bb686ddc097dfdbe498d 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,12 @@
+2000-05-14  Alan Modra  <alan@linuxcare.com.au>
+
+       * size.c (usage): Associate short options with corresponding long
+       option to give a clue as to their function.
+
+2000-05-14  Philippe De Muyter  <phdm@macqel.be>
+
+       * size.c (main): Accept and ignore `-f' option.
+
 2000-05-13  Alan Modra  <alan@linuxcare.com.au>
 
        * bucomm.h (gettext, dgettext, dcgettext, textdomain,

diff --git a/binutils/size.c b/binutils/size.c
index 070834b63c09da1273191354cbf35786a4fc39f1..4cf17b2a59eb1d1aeeb96a066f18205a8b31817f 100644 (file)
--- a/binutils/size.c
+++ b/binutils/size.c
@@ -77,8 +77,10 @@ usage (stream, status)
      int status;
 {
   fprintf (stream, _("\
-Usage: %s [-ABdoxV] [--format=berkeley|sysv] [--radix=8|10|16]\n\
-       [--target=bfdname] [--version] [--help] [file...]\n"), program_name);
+Usage: %s [-A | --format=sysv | -B | --format=berkeley]\n\
+       [-o | --radix=8 | -d | --radix=10 | -h | --radix=16]\n\
+       [-V | --version] [--target=bfdname] [--help] [file...]\n"),
+          program_name);
 #if BSD_DEFAULT
   fputs (_("default is --format=berkeley\n"), stream);
 #else
@@ -120,7 +122,7 @@ main (argc, argv)
   bfd_init ();
   set_default_bfd_target ();
 
-  while ((c = getopt_long (argc, argv, "ABVdox", long_options,
+  while ((c = getopt_long (argc, argv, "ABVdfox", long_options,
                           (int *) 0)) != EOF)
     switch (c)
       {
@@ -186,6 +188,16 @@ main (argc, argv)
       case 'o':
        radix = octal;
        break;
+      case 'f': /* FIXME : For sysv68, `-f' means `full format', i.e.
+                  `[fname:] M(.text) + N(.data) + O(.bss) + P(.comment) = Q'
+                  where `fname: ' appears only if there are >= 2 input files,
+                  and M, N, O, P, Q are expressed in decimal by default,
+                  hexa or octal if requested by `-x' or `-o'.
+                  Just to make things interesting, Solaris also accepts -f,
+                  which prints out the size of each allocatable section, the
+                  name of the section, and the total of the section sizes.  */
+               /* For the moment, accept `-f' silently, and ignore it.  */
+       break;
       case 0:
        break;
       case '?':