PATCH: Mention "@FILE" in --help output

Mark Mitchell mark@codesourcery.com
Sun Oct 30 18:16:00 GMT 2005


Nick Clifton requested this patch some time ago, but I failed to get
it done until today.  This patch adds "@FILE" to the --help output for
as, gprof, and ld; the binutils programs were already done.

(I still owe patches to add @FILE documentation to the Texinfo
manuals.  That will be my next post.)

Tested by looking at the "--help" output for the affected tools and
committed.

--
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

2005-10-30  Mark Mitchell  <mark@codesourcery.com>

	* as.c (show_usage): Document "@FILE".

2005-10-30  Mark Mitchell  <mark@codesourcery.com>

	* gprof.c (usage): Document "@FILE".

2005-10-30  Mark Mitchell  <mark@codesourcery.com>

	* lexsup.c (help): Document "@FILE".

Index: gas/as.c
===================================================================
RCS file: /cvs/src/src/gas/as.c,v
retrieving revision 1.66
diff -c -5 -p -r1.66 as.c
*** gas/as.c	11 Oct 2005 11:16:16 -0000	1.66
--- gas/as.c	30 Oct 2005 17:51:37 -0000
*************** Options:\n\
*** 344,353 ****
--- 344,355 ----
    --listing-rhs-width     set the max width in characters of the lines from\n\
                            the source file\n"));
    fprintf (stream, _("\
    --listing-cont-lines    set the maximum number of continuation lines used\n\
                            for the output data column of the listing\n"));
+   fprintf (stream, _("\
+   @FILE                   read options from FILE\n")); 
  
    md_show_usage (stream);
  
    fputc ('\n', stream);
    fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
Index: gprof/gprof.c
===================================================================
RCS file: /cvs/src/src/gprof/gprof.c,v
retrieving revision 1.24
diff -c -5 -p -r1.24 gprof.c
*** gprof/gprof.c	30 Sep 2005 16:37:32 -0000	1.24
--- gprof/gprof.c	30 Oct 2005 17:51:40 -0000
*************** Usage: %s [-[abcDhilLsTvwxyz]] [-[ACeEfF
*** 165,175 ****
  	[--directory-path=dirs] [--display-unused-functions]\n\
  	[--file-format=name] [--file-info] [--help] [--line] [--min-count=n]\n\
  	[--no-static] [--print-path] [--separate-files]\n\
  	[--static-call-graph] [--sum] [--table-length=len] [--traditional]\n\
  	[--version] [--width=n] [--ignore-non-functions]\n\
! 	[--demangle[=STYLE]] [--no-demangle]\n\
  	[image-file] [profile-file...]\n"),
  	   whoami);
    if (status == 0)
      fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    done (status);
--- 165,175 ----
  	[--directory-path=dirs] [--display-unused-functions]\n\
  	[--file-format=name] [--file-info] [--help] [--line] [--min-count=n]\n\
  	[--no-static] [--print-path] [--separate-files]\n\
  	[--static-call-graph] [--sum] [--table-length=len] [--traditional]\n\
  	[--version] [--width=n] [--ignore-non-functions]\n\
! 	[--demangle[=STYLE]] [--no-demangle] [@FILE]\n\
  	[image-file] [profile-file...]\n"),
  	   whoami);
    if (status == 0)
      fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    done (status);
Index: ld/lexsup.c
===================================================================
RCS file: /cvs/src/src/ld/lexsup.c,v
retrieving revision 1.86
diff -c -5 -p -r1.86 lexsup.c
*** ld/lexsup.c	12 May 2005 07:32:03 -0000	1.86
--- ld/lexsup.c	30 Oct 2005 17:51:42 -0000
*************** set_segment_start (const char *section, 
*** 1440,1459 ****
  static void
  help (void)
  {
    unsigned i;
    const char **targets, **pp;
  
    printf (_("Usage: %s [options] file...\n"), program_name);
  
    printf (_("Options:\n"));
    for (i = 0; i < OPTION_COUNT; i++)
      {
        if (ld_options[i].doc != NULL)
  	{
  	  bfd_boolean comma;
- 	  int len;
  	  unsigned j;
  
  	  printf ("  ");
  
  	  comma = FALSE;
--- 1440,1459 ----
  static void
  help (void)
  {
    unsigned i;
    const char **targets, **pp;
+   int len;
  
    printf (_("Usage: %s [options] file...\n"), program_name);
  
    printf (_("Options:\n"));
    for (i = 0; i < OPTION_COUNT; i++)
      {
        if (ld_options[i].doc != NULL)
  	{
  	  bfd_boolean comma;
  	  unsigned j;
  
  	  printf ("  ");
  
  	  comma = FALSE;
*************** help (void)
*** 1522,1531 ****
--- 1522,1535 ----
  	    putchar (' ');
  
  	  printf ("%s\n", _(ld_options[i].doc));
  	}
      }
+   printf (_("  @FILE"));
+   for (len = strlen ("  @FILE"); len < 30; len++)
+     putchar (' ');
+   printf (_("Read options from FILE\n"));
  
    /* Note: Various tools (such as libtool) depend upon the
       format of the listings below - do not change them.  */
    /* xgettext:c-format */
    printf (_("%s: supported targets:"), program_name);



More information about the Binutils mailing list