Make no local logging a runtime option for network logging...

[oweals/busybox.git] / applets / usage.c

diff --git a/applets/usage.c b/applets/usage.c
index 11326432cebbbc2f7284caab2fcdf0a3c6deba6d..75c421a09dc5e009394c9840d1e4ba68b5372681 100644 (file)
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -140,9 +140,10 @@ const char date_usage[] =
        "  or:  date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
        "\nDisplays the current time in the given FORMAT, or sets the system date.\n"
-       "\nOptions:\n\t-R\tOutputs RFC-822 compliant date string\n"
-       "\t-s\tSets time described by STRING\n"
-       "\t-u\tPrints or sets Coordinated Universal Time\n"
+       "\nOptions:\n\t-R\t\tOutputs RFC-822 compliant date string\n"
+       "\t-d STRING\tdisplay time described by STRING, not `now'\n"
+       "\t-s\t\tSets time described by STRING\n"
+       "\t-u\t\tPrints or sets Coordinated Universal Time\n"
 #endif
        ;
 #endif
@@ -160,7 +161,7 @@ const char dc_usage[] =
 
 #if defined BB_DD
 const char dd_usage[] =
-       "dd [if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N]\n"
+       "dd [if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N] [conv=notrunc|sync]\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
        "\nCopy a file, converting and formatting according to options\n\n"
        "\tif=FILE\tread from FILE instead of stdin\n"
@@ -170,6 +171,7 @@ const char dd_usage[] =
        "\tskip=N\tskip N input blocks\n"
        "\tseek=N\tskip N output blocks\n"
        "\tconv=notrunc\t dont truncate of at end of write\n"
+       "\tconv=sync\t pad the last block with zeros until blocksize\n"
        "\n"
        "Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n"
 #endif
@@ -375,6 +377,24 @@ const char fsck_minix_usage[] =
        ;
 #endif
 
+#if defined BB_GETOPT
+const char getopt_usage[] =
+"getopt [OPTIONS]...\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+"Parse command options\n"
+"  -a, --alternative            Allow long options starting with single -\n"
+"  -l, --longoptions=longopts   Long options to be recognized\n"
+"  -n, --name=progname          The name under which errors are reported\n"
+"  -o, --options=optstring      Short options to be recognized\n"
+"  -q, --quiet                  Disable error reporting by getopt(3)\n"
+"  -Q, --quiet-output           No normal output\n"
+"  -s, --shell=shell            Set shell quoting conventions\n"
+"  -T, --test                   Test for getopt(1) version\n"
+"  -u, --unqote                 Do not quote the output\n"
+#endif
+;
+#endif
+
 #if defined BB_GREP
 const char grep_usage[] =
        "grep [-ihHnqvs] pattern [files...]\n"
@@ -1040,6 +1060,15 @@ const char rmmod_usage[] =
        ;
 #endif
 
+#if defined BB_RPMUNPACK
+const char rpmunpack_usage[] =
+       "rpmunpack < package.rpm | gunzip | cpio -idmuv\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nExtracts an rpm archive.\n"
+#endif
+       ;
+#endif
+
 #if defined BB_SED
 const char sed_usage[] =
        "sed [-Vhnef] pattern [files...]\n"
@@ -1147,6 +1176,7 @@ const char syslogd_usage[] =
        "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
 #ifdef BB_FEATURE_REMOTE_LOG
        "\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
+       "\t-N\t\tDo not log anything locally -- network logging only.\n"
 #endif
 #endif
        ;
@@ -1189,11 +1219,11 @@ const char tar_usage[] =
 #endif
 #if defined BB_FEATURE_TAR_EXCLUDE
        "[--exclude File] "
+        "[-X File]"
 #endif
        "[-f tarFile] [FILE(s)] ...\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nCreate, extract, or list files from a tar file.  Note that\n"
-       "this version of tar treats hard links as separate files.\n\n"
+       "\nCreate, extract, or list files from a tar file.\n\n"
        "Main operation mode:\n"
 #ifdef BB_FEATURE_TAR_CREATE
        "\tc\t\tcreate\n"
@@ -1205,6 +1235,7 @@ const char tar_usage[] =
        "\tO\t\textract to stdout\n"
 #if defined BB_FEATURE_TAR_EXCLUDE
        "\texclude\t\tfile to exclude\n"
+        "\tX\t\tfile with names to exclude\n"
 #endif
        "\nInformative output:\n"
        "\tv\t\tverbosely list files processed\n"
@@ -1347,15 +1378,6 @@ const char unix2dos_usage[] =
        ;
 #endif
 
-#if defined BB_UNRPM
-const char unrpm_usage[] =
-       "unrpm < package.rpm | gzip -d | cpio -idmuv\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nExtracts an rpm archive.\n"
-#endif
-       ;
-#endif
-
 #if defined BB_UPDATE
 const char update_usage[] =
        "update [options]\n"
@@ -1455,11 +1477,9 @@ const char whoami_usage[] =
 #endif
 
 #if defined BB_XARGS
-const char xargs_usage[] = "xargs [OPTIONS] [COMMAND] [ARGS...]\n"
+const char xargs_usage[] = "xargs [COMMAND] [ARGS...]\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nExecutes COMMAND on every item given by standard input.\n\n" 
-       "Options:\n"
-       "\t-t\tPrint the command just before it is run\n"
+       "\nExecutes COMMAND on every item given by standard input.\n" 
 #endif
        ;
 #endif
@@ -1472,3 +1492,4 @@ const char yes_usage[] =
 #endif
        ;
 #endif
+