merge with 1.8.1i

1 files changed, 4 insertions, 8 deletions

diff --git a/src/dirname.c b/src/dirname.c
index a40c8267d..802713543 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -57,22 +57,18 @@ static void
 usage (status)
      int status;
 {
-  fprintf (status == 0 ? stdout : stderr, "\
-Usage: %s [OPTION]... PATH\n\
-",
-	   program_name);
-
   if (status != 0)
     fprintf (stderr, "Try `%s --help' for more information.\n",
 	     program_name);
   else
-
-    printf ("\
+    {
+      printf ("Usage: %s [OPTION]... PATH\n", program_name);
+      printf ("\
 \n\
   --help      display this help and exit\n\
   --version   output version information and exit\n\
 ");
-
+    }
   exit (status);
 }