merge with 3.8.4k

1 files changed, 8 insertions, 12 deletions

diff --git a/src/rmdir.c b/src/rmdir.c
index 8859f94ea..c863973f7 100644
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -147,21 +147,17 @@ static void
 usage (status)
      int status;
 {
-  fprintf (status == 0 ? stdout : stderr, "\
-Usage: %s [OPTION]... DIRECTORY...\n\
-",
-	   program_name);
-
-  if (status == 0)
-    printf ("\
+  if (status != 0)
+    fprintf (stderr, "Try `%s --help' for more information.\n",
+	     program_name);
+  else
+    {
+      printf ("Usage: %s [OPTION]... DIRECTORY...\n", program_name);
+      printf ("\
 \n\
   -p, --parents   remove explicit parent directories if being emptied\n\
       --help      display this help and exit\n\
       --version   output version information and exit\n");
-
-  else
-    fprintf (stderr, "Try `%s --help' for more information.\n",
-	     program_name);
-
+    }
   exit (status);
 }