X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=applets%2Fusage.c;h=75c421a09dc5e009394c9840d1e4ba68b5372681;hb=bf2b8ae49aa885929bcb20983dd98196416bcc12;hp=b23f2714126d34fb54a39a5413ba9c1c4a55abc1;hpb=11c655295c78970d67bc5ee661076743957d8ffb;p=oweals%2Fbusybox.git

diff --git a/applets/usage.c b/applets/usage.c
index b23f27141..75c421a09 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -1,8 +1,8 @@
-#include "internal.h"
+#include "busybox.h"
 
 #if defined BB_AR
 const char ar_usage[] =
-	"ar [[-ov] -tpv archive] filenames \n"
+	"ar -[ovR]{ptx} archive filenames \n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
 	"\nExtract or list files from an ar archive.\n\n"
 	"Options:\n"
@@ -11,6 +11,7 @@ const char ar_usage[] =
 	"\t-t\t\tlist\n"
 	"\t-x\t\textract\n"
 	"\t-v\t\tverbosely list files processed\n"
+	"\t-R\t\trecursive action\n"
 #endif
 	;
 #endif
@@ -92,6 +93,15 @@ const char clear_usage[] =
 	;
 #endif
 
+#if defined BB_CMP
+const char cmp_usage[] =
+	"cmp FILE1 [FILE2]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\nCompare files.\n"
+#endif
+	;
+#endif
+
 #if defined BB_CP_MV
 const char cp_usage[] =
 	"cp [OPTION]... SOURCE DEST\n"
@@ -130,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
@@ -150,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"
@@ -159,6 +170,8 @@ const char dd_usage[] =
 	"\tcount=N\tcopy only N input blocks\n"
 	"\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
@@ -205,6 +218,15 @@ const char dmesg_usage[] =
 	;
 #endif
 
+#if defined BB_DOS2UNIX
+const char dos2unix_usage[] =
+	"dos2unix < dosfile > unixfile\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\nConverts a text file from dos format to unix format.\n"
+#endif
+	;
+#endif
+
 #if defined BB_DU
 const char du_usage[] =
 	"du [OPTION]... [FILE]...\n"
@@ -355,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"
@@ -438,7 +478,7 @@ const char hostname_usage[] =
 
 	"\t-i\t\tAddresses for the hostname\n"
 	"\t-d\t\tDNS domain name\n"
-	"\t-F FILE\t\tUse the contents of FILE to specify the hostname\n"
+	"\t-F, --file FILE\tUse the contents of FILE to specify the hostname\n"
 #endif
 	;
 #endif
@@ -581,6 +621,9 @@ const char ls_usage[] =
 #ifdef BB_FEATURE_LS_FILETYPES
 	"p"
 #endif
+#ifdef BB_FEATURE_LS_FOLLOWLINKS
+    "L"
+#endif
 #ifdef BB_FEATURE_LS_RECURSIVE
 	"R"
 #endif
@@ -629,6 +672,9 @@ const char ls_usage[] =
 #ifdef BB_FEATURE_LS_FILETYPES
 	"\t-p\tappend indicator (one of /=@|) to entries\n"
 #endif
+#ifdef BB_FEATURE_LS_FOLLOWLINKS
+    "\t-L\tlist entries pointed to by symbolic links\n"
+#endif
 #ifdef BB_FEATURE_LS_RECURSIVE
 	"\t-R\tlist subdirectories recursively\n"
 #endif
@@ -942,6 +988,15 @@ const char rdate_usage[] =
 	;
 #endif
 
+#if defined BB_READLINK
+const char readlink_usage[] =
+	"readlink\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\nRead a symbolic link.\n"
+#endif
+	;
+#endif
+
 #if defined BB_REBOOT
 const char reboot_usage[] =
 	"reboot\n"
@@ -950,7 +1005,6 @@ const char reboot_usage[] =
 #endif
 	;
 #endif
-
 	
 #if defined BB_RENICE
 const char renice_usage[] =
@@ -1006,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"
@@ -1113,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
 	;
@@ -1130,7 +1194,6 @@ const char tail_usage[] =
 	"\t-c=N[kbm]\toutput the last N bytes\n"
 #endif
 	"\t-n NUM\t\tPrint last NUM lines instead of first 10\n"
-	"\t\t\tAlso can be -NUM or +NUM.\n"
 	"\t-f\t\tOutput data as the file grows.\n"
 #ifndef BB_FEATURE_SIMPLE_TAIL
 	"\t-q\t\tnever output headers giving file names\n"
@@ -1156,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"
@@ -1172,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"
@@ -1305,6 +1369,15 @@ const char uniq_usage[] =
 	;
 #endif
 
+#if defined BB_UNIX2DOS
+const char unix2dos_usage[] =
+	"unix2dos < unixfile > dosfile\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\nConverts a text file from unix format to dos format.\n"
+#endif
+	;
+#endif
+
 #if defined BB_UPDATE
 const char update_usage[] =
 	"update [options]\n"
@@ -1403,6 +1476,14 @@ const char whoami_usage[] =
 	;
 #endif
 
+#if defined BB_XARGS
+const char xargs_usage[] = "xargs [COMMAND] [ARGS...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\nExecutes COMMAND on every item given by standard input.\n" 
+#endif
+	;
+#endif
+
 #if defined BB_YES
 const char yes_usage[] =
 	"yes [OPTION]... [STRING]...\n"
@@ -1411,3 +1492,4 @@ const char yes_usage[] =
 #endif
 	;
 #endif
+