(usage): Move USAGE_BUILTIN_WARNING to end of --help output.

diff --git a/src/echo.c b/src/echo.c
index 703704e93f37a9f88c00094f29cf756ff3ed164f..94ef2a5af253f6e9939d6e23c3d2f41d5a7d5079 100644 (file)
--- a/src/echo.c
+++ b/src/echo.c
@@ -62,7 +62,6 @@ usage (int status)
   else
     {
       printf (_("Usage: %s [OPTION]... [STRING]...\n"), program_name);
-      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       fputs (_("\
 Echo the STRING(s) to standard output.\n\
 \n\
@@ -95,6 +94,7 @@ If -e is in effect, the following sequences are recognized:\n\
   \\t     horizontal tab\n\
   \\v     vertical tab\n\
 "), stdout);
+      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);

diff --git a/src/kill.c b/src/kill.c
index 6b8455ffefff7a39edffb9a456b415cce08d69be..7caaa473d20f760a0858ddb0512bd9a09345ccbf 100644 (file)
--- a/src/kill.c
+++ b/src/kill.c
@@ -97,7 +97,6 @@ Usage: %s [-s SIGNAL | -SIGNAL] PID...\n\
   or:  %s -t [SIGNAL]...\n\
 "),
              program_name, program_name, program_name);
-      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       fputs (_("\
 Send signals to processes, or list signals.\n\
 \n\
@@ -118,6 +117,7 @@ SIGNAL may be a signal name like `HUP', or a signal number like `1',\n\
 or an exit status of a process terminated by a signal.\n\
 PID is an integer; if negative it identifies a process group.\n\
 "), stdout);
+      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);

diff --git a/src/printf.c b/src/printf.c
index 57ff2c50c3b30c715499ac9b8d5cfb081ce31591..32dbd94c5e3c40f3d15c40bf552641faf4eb3b37 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -101,7 +101,6 @@ Usage: %s FORMAT [ARGUMENT]...\n\
   or:  %s OPTION\n\
 "),
              program_name, program_name);
-      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       fputs (_("\
 Print ARGUMENT(s) according to FORMAT.\n\
 \n\
@@ -141,6 +140,7 @@ FORMAT controls the output as in C printf.  Interpreted sequences are:\n\
 and all C format specifications ending with one of diouxXfeEgGcs, with\n\
 ARGUMENTs converted to proper type first.  Variable widths are handled.\n\
 "), stdout);
+      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);

diff --git a/src/pwd.c b/src/pwd.c
index f272b688d88e69e60f8119ea17e3ffb0227665cd..2fde1d98c6380fa71e153d16112aea4c63e1eef3 100644 (file)
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -64,13 +64,13 @@ usage (int status)
   else
     {
       printf (_("Usage: %s [OPTION]\n"), program_name);
-      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       fputs (_("\
 Print the full filename of the current working directory.\n\
 \n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
+      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);

diff --git a/src/stat.c b/src/stat.c
index 3b3d3a4d0a89a2dff64902fe23546df29ce66976..e5a7a6907b37f58433d358fc9c0b26899040fea3 100644 (file)
--- a/src/stat.c
+++ b/src/stat.c
@@ -678,7 +678,6 @@ usage (int status)
   else
     {
       printf (_("Usage: %s [OPTION] FILE...\n"), program_name);
-      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       fputs (_("\
 Display file or file system status.\n\
 \n\
@@ -746,6 +745,7 @@ Valid format sequences for file systems:\n\
   %t   Type in hex\n\
   %T   Type in human readable form\n\
 "), stdout);
+      printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
       printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);

diff --git a/src/test.c b/src/test.c
index c28cf87ce9052cafc6f0658741c772ac5c97fc27..345ea8ac3b5d51578afc2e8ac9894d867b6805d2 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -850,7 +850,6 @@ Usage: test EXPRESSION\n\
   or:  [ ]\n\
   or:  [ OPTION\n\
 "), stdout);
-      printf (USAGE_BUILTIN_WARNING, _("test and/or ["));
       fputs (_("\
 Exit with the status determined by EXPRESSION.\n\
 \n\
@@ -926,6 +925,7 @@ Except for -h and -L, all FILE-related tests dereference symbolic links.\n\
 Beware that parentheses need to be escaped (e.g., by backslashes) for shells.\n\
 INTEGER may also be -l STRING, which evaluates to the length of STRING.\n\
 "), stdout);
+      printf (USAGE_BUILTIN_WARNING, _("test and/or ["));
       printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);

diff --git a/src/true.c b/src/true.c
index fe43d5441d08d842831e17343c6cb79f1a8b7664..855819e074548b42389436668902a62009d8b1e3 100644 (file)
--- a/src/true.c
+++ b/src/true.c
@@ -34,7 +34,6 @@ Usage: %s [ignored command line arguments]\n\
   or:  %s OPTION\n\
 "),
          program_name, program_name);
-  printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
   fputs (_("\
 Exit with a status code indicating success.\n\
 \n\
@@ -44,6 +43,7 @@ These option names may not be abbreviated.\n\
         stdout);
   fputs (HELP_OPTION_DESCRIPTION, stdout);
   fputs (VERSION_OPTION_DESCRIPTION, stdout);
+  printf (USAGE_BUILTIN_WARNING, PROGRAM_NAME);
   printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
   exit (status);
 }