merge with 1.8.1i

diff --git a/login-utils/su.c b/login-utils/su.c
index 7db31c107cc1eedf82e54085bdfbe89288146614..7669aef1aebc2197d900587207843877c39b65ff 100644 (file)
--- a/login-utils/su.c
+++ b/login-utils/su.c
@@ -551,29 +551,25 @@ static void
 usage (status)
      int status;
 {
-  fprintf (status == 0 ? stdout : stderr, "\
-Usage: %s [OPTION]... [-] [USER [ARG]...]\n\
-",
-          program_name);
-
   if (status != 0)
     fprintf (stderr, "Try `%s --help' for more information.\n",
             program_name);
   else
-
-    printf ("\
+    {
+      printf ("Usage: %s [OPTION]... [-] [USER [ARG]...]\n", program_name);
+      printf ("\
 \n\
   -l, --login                  make the shell a login shell\n\
-  -c, --commmand COMMAND       pass a single COMMAND to the shell with -c\n\
+  -c, --commmand=COMMAND       pass a single COMMAND to the shell with -c\n\
   -f, --fast                   pass -f to the shell (for csh or tcsh)\n\
   -m, --preserve-environment   do not reset environment variables\n\
   -p                           same as -m\n\
-  -s, --shell SHELL            run SHELL if /etc/shells allows it\n\
+  -s, --shell=SHELL            run SHELL if /etc/shells allows it\n\
       --help                   display this help and exit\n\
       --version                output version information and exit\n\
 \n\
 A mere - implies -l.   If USER not given, assume root.\n\
 ");
-
+    }
   exit (status);
 }