* archival/bunzip2.c: Include <unistd.h>.

  (bunzip2_main): Read data from standard input if FILE argument is `-' or
  omitted.
* include/usage.h (bunzip2_trivial_usage, bunzip2_full_usage): Rewrite.
* testsuite/bunzip2/bunzip2-reads-from-standard-input: New.

1 files changed, 5 insertions, 4 deletions

diff --git a/include/usage.h b/include/usage.h
index 6692aa520..e7de6f53f 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -52,11 +52,12 @@
         "bar"
 
 #define bunzip2_trivial_usage \
-        "[-c] FILE"
+        "[OPTION]... [FILE]"
 #define bunzip2_full_usage \
-        "Uncompress FILE to current directory, stripping its .bz2 extension.\n"\
-        " -c output to stdout\n"\
-        " -k is assumed" 
+        "Uncompress FILE (or standard input if FILE is '-' or omitted).\n\n" \
+        "Options:\n" \
+        "\t-c\tWrite output to standard output\n" \
+        "\t-f\tForce"
 
 #define bzcat_trivial_usage \
         "FILE"