From 607f65d17145e27c3daae6543d08743ab756043d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 9 Jan 2010 20:23:03 +0100 Subject: cpio: improve help text more; fix -p and -F interaction Signed-off-by: Denys Vlasenko --- include/usage.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/usage.h b/include/usage.h index 65836d8..7a5cbcc 100644 --- a/include/usage.h +++ b/include/usage.h @@ -560,8 +560,8 @@ "\n -l,-s Create (sym)links" \ #define cpio_trivial_usage \ - "[-ti" IF_FEATURE_CPIO_O("o") "]" IF_FEATURE_CPIO_P(" [-p DIR]") \ - " [-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]") + "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]") \ + " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]") #define cpio_full_usage "\n\n" \ "Extract or list files from a cpio archive" \ IF_FEATURE_CPIO_O(", or" \ @@ -573,7 +573,7 @@ "\n -t List" \ "\n -i Extract" \ IF_FEATURE_CPIO_O( \ - "\n -o Create" \ + "\n -o Create (requires -H newc)" \ ) \ IF_FEATURE_CPIO_P( \ "\n -p DIR Copy files to DIR" \ @@ -583,9 +583,9 @@ "\n -m Preserve mtime" \ "\n -v Verbose" \ "\n -u Overwrite" \ - "\n -F Input file" \ + "\n -F FILE Input (-t,-i,-p) or output (-o) file" \ IF_FEATURE_CPIO_O( \ - "\n -H Define format" \ + "\n -H newc Archive format" \ ) \ #define crond_trivial_usage \ -- cgit v1.1