merge with 1.8.1i

1 files changed, 6 insertions, 9 deletions

diff --git a/src/env.c b/src/env.c
index 2fb0d7ec9..743cf5d0d 100644
--- a/src/env.c
+++ b/src/env.c
@@ -195,25 +195,22 @@ static void
 usage (status)
      int status;
 {
-  fprintf (status == 0 ? stdout : stderr, "\
-Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n\
-",
-	   program_name);
-
   if (status != 0)
     fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
-
-    printf ("\
+    {
+      printf ("Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n",
+	      program_name);
+      printf ("\
 \n\
-  -u, --unset NAME           remove variable from the environment\n\
+  -u, --unset=NAME           remove variable from the environment\n\
   -i, --ignore-environment   start with an empty environment\n\
       --help                 display this help and exit\n\
       --version              output version information and exit\n\
 \n\
 A mere - implies -i.  If no COMMAND, print the resulting environment.\n\
 ");
-
+    }
   exit (status);
 }