Implement suggestion from Adam Slattery, (don't default to killing closing bug #1190.

[oweals/busybox.git] / usage.h

diff --git a/usage.h b/usage.h
index 9d1db5950f6a2a188fcf8ac9e99f03e4f3f12c17..a19f0fe2228fc8ea29c48ef2202617d347d8aa17 100644 (file)
--- a/usage.h
+++ b/usage.h
@@ -12,7 +12,7 @@
        "\t-p timeconstant\n"
 
 #define ar_trivial_usage \
-       "-[ov] [ptx] ARCHIVE FILES"
+       "-[ov][ptx] ARCHIVE FILES"
 #define ar_full_usage \
        "Extract or list FILES from an ar archive.\n\n" \
        "Options:\n" \
@@ -129,6 +129,18 @@
        "\t-f\tforce (implied; ignored) - always set\n" \
        "\t-R\tCopies directories recursively"
 
+#define cpio_trivial_usage \
+       "-[dimtuv][F cpiofile]"
+#define cpio_full_usage \
+       "Extract or list files from a cpio archive\n" \
+       "Main operation mode:\n" \
+       "\td\t\tmake leading directories\n" \
+       "\ti\t\textract\n" \
+       "\tm\t\tpreserve mtime\n" \
+       "\tt\t\tlist\n" \
+       "\tu\t\tunconditional overwrite\t" \
+       "\tF\t\tinput from file\t"
+       
 #define cut_trivial_usage \
        "[OPTION]... [FILE]..."
 #define cut_full_usage \
@@ -1154,9 +1166,10 @@
        "221 foobar closing connection\n" 
 
 #define nslookup_trivial_usage \
-       "[HOST]"
+       "[HOST] [SERVER]"
 #define nslookup_full_usage \
-       "Queries the nameserver for the IP address of the given HOST"
+       "Queries the nameserver for the IP address of the given HOST\n" \
+       "optionally using a specified DNS server"
 #define nslookup_example_usage \
        "$ nslookup localhost\n" \
        "Server:     default\n" \
@@ -1297,19 +1310,23 @@
 #define route_full_usage \
        "Edit the kernel's routing tables"
 
+#define rpm2cpio_trivial_usage \
+       "package.rpm"
+#define rpm2cpio_full_usage \
+       "Outputs a cpio archive of the rpm file."
+
 #define rpmunpack_trivial_usage \
        "< package.rpm | gunzip | cpio -idmuv"
 #define rpmunpack_full_usage \
        "Extracts an rpm archive."
-
+       
 #define sed_trivial_usage \
-       "[-Vhnef] pattern [files...]"
+       "[-nef] pattern [files...]"
 #define sed_full_usage \
        "Options:\n" \
        "\t-n\t\tsuppress automatic printing of pattern space\n" \
        "\t-e script\tadd the script to the commands to be executed\n" \
        "\t-f scriptfile\tadd the contents of script-file to the commands to be executed\n" \
-       "\t-h\t\tdisplay this help message\n" \
        "\n" \
        "If no -e or -f is given, the first non-option argument is taken as the\n" \
        "sed script to interpret. All remaining arguments are names of input\n" \
@@ -1470,10 +1487,10 @@
 #define tar_trivial_usage \
        "-[" USAGE_TAR_CREATE("c") "xtvO] " \
        USAGE_TAR_EXCLUDE("[--exclude FILE] [-X FILE]") \
-       "[-f TARFILE] [FILE(s)] ..."
+       "[-f TARFILE] [-C DIR] [FILE(s)] ..."
 #define tar_full_usage \
        "Create, extract, or list files from a tar file.\n\n" \
-       "Main operation mode:\n" \
+       "Options:\n" \
        USAGE_TAR_CREATE("\tc\t\tcreate\n") \
        "\tx\t\textract\n" \
        "\tt\t\tlist\n" \
@@ -1484,7 +1501,7 @@
        "\texclude\t\tfile to exclude\n" \
         "\tX\t\tfile with names to exclude\n" \
        ) \
-       "\nInformative output:\n" \
+       "\tC\t\tchange to directory DIR before operation\n" \
        "\tv\t\tverbosely list files processed"
 #define tar_example_usage \
        "$ zcat /tmp/tarball.tar.gz | tar -xf -\n" \
@@ -1729,12 +1746,13 @@
        "     31      46    1365 /etc/passwd\n" 
 
 #define wget_trivial_usage \
-       "[-c|--continue] [-q|--quiet] [-O|--output-document file] [--header 'header: value'] url"
+       "[-c|--continue] [-q|--quiet] [-O|--output-document file]\n\t[--header 'header: value'] [-P DIR] url"
 #define wget_full_usage \
        "wget retrieves files via HTTP or FTP\n\n" \
        "Options:\n" \
        "\t-c\tcontinue retrieval of aborted transfers\n" \
        "\t-q\tquiet mode - do not print\n" \
+       "\t-P\tSet directory prefix to DIR\n" \
        "\t-O\tsave to filename ('-' for stdout)"
 
 #define which_trivial_usage \