Extract usage information into a separate file.

40 files changed, 6 insertions, 471 deletions

diff --git a/coreutils/basename.c b/coreutils/basename.c
index 5678c4433..5b83eef49 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -24,14 +24,6 @@
 #include "internal.h"
 #include <stdio.h>
 
-const char *basename_usage="basename FILE [SUFFIX]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nStrips directory path and suffixes from FILE.\n"
-	"If specified, also removes any trailing SUFFIX.\n"
-#endif
-;
-
-
 extern int basename_main(int argc, char **argv)
 {
 	int m, n;
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 6c17ee620..c27f07e82 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -34,13 +34,6 @@ static void print_file(FILE * file)
 	fflush(stdout);
 }
 
-static const char cat_usage[] =
-	"cat [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nConcatenates FILE(s) and prints them to stdout.\n"
-#endif
-	;
-
 extern int cat_main(int argc, char **argv)
 {
 	FILE *file;
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 95aed3d17..9b1a5a82d 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -27,15 +27,6 @@
 #include <stdio.h>
 #include <errno.h>
 
-
-static const char chroot_usage[] = "chroot NEWROOT [COMMAND...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRun COMMAND with root directory set to NEWROOT.\n"
-#endif
-	;
-
-
-
 int chroot_main(int argc, char **argv)
 {
 	char *prog;
diff --git a/coreutils/cut.c b/coreutils/cut.c
index 08b4586a4..8b28fff7a 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -206,20 +206,6 @@ void cut()
 	}
 }
 
-const char cut_usage[] =
-	"cut [OPTION]... [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints selected fields from each input FILE to standard output.\n\n"
-	"Options:\n"
-	"\t-b LIST\tOutput only bytes from LIST\n"
-	"\t-c LIST\tOutput only characters from LIST\n"
-	"\t-d CHAR\tUse CHAR instead of tab as the field delimiter\n"
-	"\t-s\tOnly output Lines if the include DELIM\n"
-	"\t-f N\tPrint only these fields\n"
-	"\t-n\tIgnored\n"
-#endif
-	;
-
 int cut_main(int argc, char **argv)
 {
 	int i = 1;
diff --git a/coreutils/date.c b/coreutils/date.c
index 3ede1237c..b6fc6c686 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -39,17 +39,6 @@
    an RFC 822 complient date output for shell scripting
    mail commands */
 
-static const char date_usage[] = "date [OPTION]... [+FORMAT]\n"
-	"  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"
-#endif
-	;
-
-
 /* Input parsing code is always bulky - used heavy duty libc stuff as
    much as possible, missed out a lot of bounds checking */
 
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 6261dfef5..86899194c 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -40,23 +40,6 @@
 typedef unsigned long long int uintmax_t;
 #endif
 
-static const char dd_usage[] =
-	"dd [if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N]\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"
-	"\tof=FILE\twrite to FILE instead of stdout\n"
-	"\tbs=N\tread and write N bytes at a time\n"
-	"\tcount=N\tcopy only N input blocks\n"
-	"\tskip=N\tskip N input blocks\n"
-	"\tseek=N\tskip N output blocks\n"
-	"\n"
-	"Numbers may be suffixed by w (x2), k (x1024), b (x512), or M (x1024^2)\n"
-#endif
-	;
-
-
-
 extern int dd_main(int argc, char **argv)
 {
 	char *inFile = NULL;
diff --git a/coreutils/df.c b/coreutils/df.c
index 62226ceb8..714c79965 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -28,12 +28,6 @@
 #include <sys/stat.h>
 #include <sys/vfs.h>
 
-static const char df_usage[] = "df [filesystem ...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint the filesystem space used and space available.\n"
-#endif
-	;
-
 extern const char mtab_file[];	/* Defined in utility.c */
 
 static int df(char *device, const char *mountPoint)
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 0b60ceb88..e63fef30b 100644
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -23,13 +23,6 @@
 #include "internal.h"
 #include <stdio.h>
 
-const char dirname_usage[] =
-	"dirname [FILENAME ...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nStrips non-directory suffix from FILENAME\n"
-#endif
-	;
-
 extern int dirname_main(int argc, char **argv)
 {
 	char* s;
diff --git a/coreutils/du.c b/coreutils/du.c
index f1a44427a..147914c9e 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -35,17 +35,6 @@
 
 typedef void (Display) (long, char *);
 
-static const char du_usage[] =
-	"du [OPTION]... [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSummarizes disk space used for each FILE and/or directory.\n"
-	"Disk space is printed in units of 1024 bytes.\n\n"
-	"Options:\n"
-	"\t-l\tcount sizes many times if hard linked\n"
-	"\t-s\tdisplay only a total for each argument\n"
-#endif
-	;
-
 static int du_depth = 0;
 static int count_hardlinks = 0;
 
@@ -174,7 +163,7 @@ int du_main(int argc, char **argv)
 	return(0);
 }
 
-/* $Id: du.c,v 1.22 2000/07/14 18:38:26 andersen Exp $ */
+/* $Id: du.c,v 1.23 2000/07/16 20:57:15 kraai Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 387ea3fef..73be8f2e2 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -25,17 +25,6 @@
 #include "internal.h"
 #include <stdio.h>
 
-static const char uname_usage[] =
-	"echo [-neE] [ARG ...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints the specified ARGs to stdout\n\n"
-	"Options:\n"
-	"\t-n\tsuppress trailing newline\n"
-	"\t-e\tinterpret backslash-escaped characters (i.e. \\t=tab etc)\n"
-	"\t-E\tdisable interpretation of backslash-escaped characters\n"
-#endif
-	;
-
 extern int 
 echo_main(int argc, char** argv)
 {
@@ -58,7 +47,7 @@ echo_main(int argc, char** argv)
 			eflag = 0;
 			break;
 		default: 
-			usage(uname_usage);
+			usage(echo_usage);
 		}
 	}
 
diff --git a/coreutils/head.c b/coreutils/head.c
index b82678dc2..58b3cae68 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -26,17 +26,6 @@
 #include <errno.h>
 #include <stdio.h>
 
-const char head_usage[] =
-	"head [OPTION] [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint first 10 lines of each FILE to standard output.\n"
-	"With more than one FILE, precede each with a header giving the\n"
-	"file name. With no FILE, or when FILE is -, read standard input.\n\n"
-
-	"Options:\n" "\t-n NUM\t\tPrint first NUM lines instead of first 10\n"
-#endif
-	;
-
 int head(int len, FILE * src)
 {
 	int i;
@@ -111,4 +100,4 @@ int head_main(int argc, char **argv)
 	return(0);
 }
 
-/* $Id: head.c,v 1.12 2000/07/14 01:51:25 kraai Exp $ */
+/* $Id: head.c,v 1.13 2000/07/16 20:57:15 kraai Exp $ */
diff --git a/coreutils/id.c b/coreutils/id.c
index 69dfe2658..56a2e279f 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -28,17 +28,6 @@
 #include <grp.h>
 #include <sys/types.h>
 
-static const char id_usage[] =
-	"id [OPTIONS]... [USERNAME]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint information for USERNAME or the current user\n\n"
-	"Options:\n"
-	"\t-g\tprints only the group ID\n"
-	"\t-u\tprints only the user ID\n"
-	"\t-r\tprints the real user ID instead of the effective ID (with -ug)\n\n"
-#endif
-	;
-
 extern int id_main(int argc, char **argv)
 {
 	int no_user = 0, no_group = 0, print_real = 0;
diff --git a/coreutils/length.c b/coreutils/length.c
index 82f50c159..cf4fb1c07 100644
--- a/coreutils/length.c
+++ b/coreutils/length.c
@@ -4,13 +4,6 @@
 #include <string.h>
 #include <stdio.h>
 
-const char length_usage[] =
-	"length STRING\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints out the length of the specified STRING.\n"
-#endif
-	;
-
 extern int length_main(int argc, char **argv)
 {
 	if (argc != 2 || **(argv + 1) == '-')
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 9f7774380..8b8fa1c58 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -30,19 +30,6 @@
 #include <dirent.h>
 #include <errno.h>
 
-static const char ln_usage[] =
-	"ln [OPTION] TARGET... LINK_NAME|DIRECTORY\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreate a link named LINK_NAME or DIRECTORY to the specified TARGET\n"
-	"\nYou may use '--' to indicate that all following arguments are non-options.\n\n"
-	"Options:\n"
-	"\t-s\tmake symbolic links instead of hard links\n"
-
-	"\t-f\tremove existing destination files\n"
-	"\t-n\tno dereference symlinks - treat like normal file\n"
-#endif
-	;
-
 static int symlinkFlag = FALSE;
 static int removeoldFlag = FALSE;
 static int followLinks = TRUE;
diff --git a/coreutils/logname.c b/coreutils/logname.c
index 12ebfbde6..a0aff42d6 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -23,12 +23,6 @@
 #include "internal.h"
 #include <stdio.h>
 
-static const char logname_usage[] = "logname\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint the name of the current user.\n"
-#endif
-	;
-
 extern int logname_main(int argc, char **argv)
 {
 	char *user = xmalloc(9);
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 0644cde87..e56e3bcfb 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -427,63 +427,6 @@ static int list_item(const char *name)
 	return 1;
 }
 
-static const char ls_usage[] = "ls [-1a"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"c"
-#endif
-	"d"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"e"
-#endif
-	"ln"
-#ifdef BB_FEATURE_LS_FILETYPES
-	"p"
-#endif
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"u"
-#endif
-	"xAC"
-#ifdef BB_FEATURE_LS_FILETYPES
-	"F"
-#endif
-#ifdef BB_FEATURE_LS_RECURSIVE
-	"R"
-#endif
-	"] [filenames...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nList directory contents\n\n"
-	"Options:\n"
-	"\t-a\tdo not hide entries starting with .\n"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"\t-c\twith -l: show ctime (the time of last\n"
-    "\t\tmodification of file status information)\n"
-#endif
-	"\t-d\tlist directory entries instead of contents\n"
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"\t-e\tlist both full date and full time\n"
-#endif
-	"\t-l\tuse a long listing format\n"
-	"\t-n\tlist numeric UIDs and GIDs instead of names\n"
-#ifdef BB_FEATURE_LS_FILETYPES
-	"\t-p\tappend indicator (one of /=@|) to entries\n"
-#endif
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-	"\t-u\twith -l: show access time (the time of last\n"
-	"\t\taccess of the file)\n"
-#endif
-	"\t-x\tlist entries by lines instead of by columns\n"
-	"\t-A\tdo not list implied . and ..\n"
-	"\t-C\tlist entries by columns\n"
-#ifdef BB_FEATURE_LS_FILETYPES
-	"\t-F\tappend indicator (one of */=@|) to entries\n"
-#endif
-#ifdef BB_FEATURE_LS_RECURSIVE
-	"\t-R\tlist subdirectories recursively\n"
-#endif
-#endif
-	;
-
-
 #ifdef BB_FEATURE_LS_RECURSIVE
 static int dirAction(const char *fileName, struct stat *statbuf, void* junk)
 {
diff --git a/coreutils/md5sum.c b/coreutils/md5sum.c
index e6f1c86b4..fad563fe7 100644
--- a/coreutils/md5sum.c
+++ b/coreutils/md5sum.c
@@ -582,23 +582,6 @@ static int status_only = 0; /* With -c, don't generate any output.
 static int warn = 0; /* With -w, print a message to standard error warning
                         about each improperly formatted MD5 checksum line */
 
-static const char md5sum_usage[] =
-    "md5sum [OPTION] [FILE]...\n"
-    "or:    md5sum [OPTION] -c [FILE]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-    "\nPrint or check MD5 checksums.\n\n"
-    "Options:\n"
-    "With no FILE, or when FILE is -, read standard input.\n\n"
-    "\t-b\tread files in binary mode\n"
-    "\t-c\tcheck MD5 sums against given list\n"
-    "\t-t\tread files in text mode (default)\n"
-    "\t-g\tread a string\n"
-    "\nThe following two options are useful only when verifying checksums:\n"
-    "\t-s,\tdon't output anything, status code shows success\n"
-    "\t-w,\twarn about improperly formated MD5 checksum lines\n"
-#endif
-;
-
 static int split_3(char *s,
                    size_t s_len,
                    unsigned char **u,
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index f6e08cadc..f824cdcb6 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -29,18 +29,6 @@
 #include <stdio.h>
 #include <errno.h>
 
-static const char mkdir_usage[] =
-	"mkdir [OPTION] DIRECTORY...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreate the DIRECTORY(ies), if they do not already exist\n\n"
-	"Options:\n"
-
-	"\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n"
-	"\t-p\tno error if existing, make parent directories as needed\n"
-#endif
-	;
-
-
 static int parentFlag = FALSE;
 static mode_t mode = 0777;
 
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index f701a97d5..3db17bbbc 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -26,14 +26,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-static const char mkfifo_usage[] = "mkfifo [OPTIONS] name\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreates a named pipe (identical to 'mknod name p')\n\n"
-	"Options:\n"
-	"\t-m\tcreate the pipe using the specified mode (default a=rw)\n"
-#endif
-	;
-
 extern int mkfifo_main(int argc, char **argv)
 {
 	char *thisarg;
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index ac96817ee..b51c8f3e3 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -28,18 +28,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-static const char mknod_usage[] = "mknod [OPTIONS] NAME TYPE MAJOR MINOR\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreate a special file (block, character, or pipe).\n\n"
-	"Options:\n"
-	"\t-m\tcreate the special file using the specified mode (default a=rw)\n\n"
-	"TYPEs include:\n"
-	"\tb:\tMake a block (buffered) device.\n"
-	"\tc or u:\tMake a character (un-buffered) device.\n"
-	"\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes.\n"
-#endif
-	;
-
 int mknod_main(int argc, char **argv)
 {
 	char *thisarg;
diff --git a/coreutils/printf.c b/coreutils/printf.c
index f57289759..6a87fc319 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -137,13 +137,6 @@ static void verify __P((char *s, char *end));
 /* The value to return to the calling program.  */
 static int exit_status;
 
-static const char printf_usage[] = "printf FORMAT [ARGUMENT...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nFormats and prints ARGUMENT(s) according to FORMAT,\n"
-	"Where FORMAT controls the output exactly as in C printf.\n"
-#endif
-	;
-
 int printf_main(int argc, char **argv)
 {
 	char *format;
diff --git a/coreutils/rm.c b/coreutils/rm.c
index 2067d878c..275c05946 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -29,17 +29,6 @@
 #include <dirent.h>
 #include <errno.h>
 
-static const char *rm_usage = "rm [OPTION]... FILE...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRemove (unlink) the FILE(s).  You may use '--' to\n"
-	"indicate that all following arguments are non-options.\n\n"
-	"Options:\n"
-	"\t-f\t\tremove existing destinations, never prompt\n"
-	"\t-r or -R\tremove the contents of directories recursively\n"
-#endif
-	;
-
-
 static int recursiveFlag = FALSE;
 static int forceFlag = FALSE;
 static const char *srcName;
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 3c3533fae..500890e40 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -26,13 +26,6 @@
 #include <stdio.h>
 #include <errno.h>
 
-const char rmdir_usage[] =
-	"rmdir [OPTION]... DIRECTORY...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRemove the DIRECTORY(ies), if they are empty.\n"
-#endif
-	;
-
 extern int rmdir_main(int argc, char **argv)
 {
 	if (argc == 1 || **(argv + 1) == '-')
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index c7ab32d4b..d6705c4c3 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -24,12 +24,6 @@
 #include "internal.h"
 #include <stdio.h>
 
-const char sleep_usage[] = "sleep N\n" 
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPause for N seconds.\n"
-#endif
-	;
-
 extern int sleep_main(int argc, char **argv)
 {
 	if ((argc < 2) || (**(argv + 1) == '-')) {
diff --git a/coreutils/sort.c b/coreutils/sort.c
index c754989ea..6af5c4df3 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -29,16 +29,6 @@
 #include <stdio.h>
 #include <errno.h>
 
-static const char sort_usage[] = "sort [-n]"
-#ifdef BB_FEATURE_SORT_REVERSE
-" [-r]"
-#endif
-" [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-"\nSorts lines of text in the specified files\n"
-#endif
-;
-
 #ifdef BB_FEATURE_SORT_REVERSE
 #define APPLY_REVERSE(x) (reverse ? -(x) : (x))
 static int reverse = 0;
@@ -304,4 +294,4 @@ int sort_main(int argc, char **argv)
 	return(0);
 }
 
-/* $Id: sort.c,v 1.19 2000/07/14 01:51:25 kraai Exp $ */
+/* $Id: sort.c,v 1.20 2000/07/16 20:57:15 kraai Exp $ */
diff --git a/coreutils/sync.c b/coreutils/sync.c
index f7c14b04c..3737cb1f1 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -24,13 +24,6 @@
 #include "internal.h"
 #include <stdio.h>
 
-const char sync_usage[] =
-	"sync\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nWrite all buffered filesystem blocks to disk.\n"
-#endif
-	;
-
 extern int sync_main(int argc, char **argv)
 {
 	if (argc > 1 && **(argv + 1) == '-')
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 9232356eb..cea63e840 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -72,21 +72,6 @@ static int forever;
 /* If nonzero, print filename headers.  */
 static int print_headers;
 
-const char tail_usage[] =
-	"tail [OPTION] [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint last 10 lines of each FILE to standard output.\n"
-	"With more than one FILE, precede each with a header giving the\n"
-	"file name. With no FILE, or when FILE is -, read standard input.\n\n"
-	"Options:\n"
-	"\t-n NUM\t\tPrint last NUM lines instead of first 10\n"
-
-	"\t-f\t\tOutput data as the file grows.  This version\n"
-	"\t\t\tof 'tail -f' supports only one file at a time.\n"
-#endif
-	;
-
-
 static void write_header(const char *filename)
 {
 	static int first_file = 1;
@@ -516,25 +501,6 @@ char *program_name;
 /* Nonzero if we have ever read standard input.  */
 static int have_read_stdin;
 
-
-static const char tail_usage[] = "tail [OPTION]... [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-"\nPrint last 10 lines of each FILE to standard output.\n\
-With more than one FILE, precede each with a header giving the file name.\n\
-With no FILE, or when FILE is -, read standard input.\n\
-\n\
-  -c=N[kbm]       output the last N bytes\n\
-  -f              output appended data as the file grows\n\
-  -n=N            output the last N lines, instead of last 10\n\
-  -q              never output headers giving file names\n\
-  -v              always output headers giving file names\n\
-\n\
-If the first character of N (bytes or lines) is a `+', output begins with \n\
-the Nth item from the start of each file, otherwise, print the last N items\n\
-in the file.  N bytes may be suffixed by k (x1024), b (x512), or m (1024^2).\n"
-#endif
-;
-
 static void write_header(const char *filename, const char *comment)
 {
 	static int first_file = 1;
diff --git a/coreutils/tee.c b/coreutils/tee.c
index 67b42a24d..c15408b51 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -26,18 +26,6 @@
 #include <errno.h>
 #include <stdio.h>
 
-static const char tee_usage[] =
-	"tee [OPTION]... [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCopy standard input to each FILE, and also to standard output.\n\n"
-	"Options:\n" "\t-a\tappend to the given FILEs, do not overwrite\n"
-#if 0
-	"\t-i\tignore interrupt signals\n"
-#endif
-#endif
-;
-
-
 /* FileList _______________________________________________________________ */
 
 #define FL_MAX	1024
@@ -133,4 +121,4 @@ int tee_main(int argc, char **argv)
 	return(0);
 }
 
-/* $Id: tee.c,v 1.12 2000/07/14 01:51:25 kraai Exp $ */
+/* $Id: tee.c,v 1.13 2000/07/16 20:57:15 kraai Exp $ */
diff --git a/coreutils/test.c b/coreutils/test.c
index bf1622cde..9a1888b28 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -178,15 +178,6 @@ static int test_eaccess();
 static int is_a_group_member();
 static void initialize_group_array();
 
-const char test_usage[] =
-	"test EXPRESSION\n"
-	"or   [ EXPRESSION ]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nChecks file types and compares values returning an exit\n"
-	"code determined by the value of EXPRESSION.\n"
-#endif
-	;
-
 extern int
 test_main(int argc, char** argv)
 {
diff --git a/coreutils/touch.c b/coreutils/touch.c
index ac275423c..afdd265f7 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -30,16 +30,6 @@
 #include <utime.h>
 #include <errno.h>
 
-
-static const char touch_usage[] = "touch [-c] file [file ...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nUpdate the last-modified date on the given file[s].\n\n"
-	"Options:\n"
-	"\t-c\tDo not create any files\n"
-#endif
-	;
-
-
 extern int touch_main(int argc, char **argv)
 {
 	int fd;
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 2971ef68e..004092477 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -34,19 +34,6 @@
 #define bb_need_write_error
 #include "messages.c"
 
-const char *tr_usage="tr [-cds] STRING1 [STRING2]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nTranslate, squeeze, and/or delete characters from\n"
-	"standard input, writing to standard output.\n\n"
-	"Options:\n"
-	"\t-c\ttake complement of STRING1\n"
-	"\t-d\tdelete input characters coded STRING1\n"
-	"\t-s\tsqueeze multiple output characters of STRING2 into one character\n"
-#endif
-;
-
-
-
 #ifdef TRUE
 #undef TRUE
 #undef FALSE
diff --git a/coreutils/tty.c b/coreutils/tty.c
index f3c7fb74f..bbc051f6b 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -24,14 +24,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-static const char tty_usage[] = "tty\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint the file name of the terminal connected to standard input.\n\n"
-	"Options:\n"
-	"\t-s\tprint nothing, only return an exit status\n"
-#endif
-	;
-
 extern int tty_main(int argc, char **argv)
 {
 	char *tty;
diff --git a/coreutils/uname.c b/coreutils/uname.c
index b7c88ece5..55616dd19 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -40,24 +40,6 @@
 # include <sys/systeminfo.h>
 #endif
 
-
-static const char uname_usage[] =
-	"uname [OPTION]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint certain system information.  With no OPTION, same as -s.\n\n"
-	"Options:\n"
-	"\t-a\tprint all information\n"
-	"\t-m\tthe machine (hardware) type\n"
-	"\t-n\tprint the machine's network node hostname\n"
-	"\t-r\tprint the operating system release\n"
-	"\t-s\tprint the operating system name\n"
-
-	"\t-p\tprint the host processor type\n"
-	"\t-v\tprint the operating system version\n"
-#endif
-	;
-
-
 static void print_element(unsigned int mask, char *element);
 
 /* Values that are bitwise or'd into `toprint'. */
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 16b257670..016fc7780 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -27,14 +27,6 @@
 #include <string.h>
 #include <errno.h>
 
-static const char uniq_usage[] =
-	"uniq [OPTION]... [INPUT [OUTPUT]]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nDiscard all but one of successive identical lines from INPUT\n"
-	"(or standard input), writing to OUTPUT (or standard output).\n"
-#endif
-	;
-
 /* max chars in line */
 #define UNIQ_MAX 4096
 
@@ -187,4 +179,4 @@ int uniq_main(int argc, char **argv)
 	return(0);
 }
 
-/* $Id: uniq.c,v 1.12 2000/07/14 01:51:25 kraai Exp $ */
+/* $Id: uniq.c,v 1.13 2000/07/16 20:57:15 kraai Exp $ */
diff --git a/coreutils/usleep.c b/coreutils/usleep.c
index da6cca9ab..fcdf3bbf6 100644
--- a/coreutils/usleep.c
+++ b/coreutils/usleep.c
@@ -25,12 +25,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-const char usleep_usage[] = "usleep N\n" 
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPause for N microseconds.\n"
-#endif
-	;
-
 extern int usleep_main(int argc, char **argv)
 {
 	if ((argc < 2) || (**(argv + 1) == '-')) {
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 12a71a573..90bef9238 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -300,15 +300,6 @@ static int decode (const char *inname,
     return read_stduu (inname);
 }
 
-static const char uudecode_usage[] =
-    "uudecode [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-    "\nUudecode a file that is uuencoded.\n\n"
-    "Options:\n"
-    "\t-o FILE\tdirect output to FILE\n"
-#endif
-;
-
 int uudecode_main (int argc,
                    char **argv)
 {
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index e107a01e7..1433c7f3b 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -180,15 +180,6 @@ static void encode()
   }
 }
 
-static const char uuencode_usage[] =
-    "uuencode [OPTION] [INFILE] REMOTEFILE\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-    "\nUuencode a file.\n\n"
-    "Options:\n"
-    "\t-m\tuse base64 encoding as of RFC1521\n"
-#endif
-;
-
 int uuencode_main (int argc,
                    char **argv)
 {
diff --git a/coreutils/wc.c b/coreutils/wc.c
index 3b0e589b6..058444d89 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -23,19 +23,6 @@
 #include "internal.h"
 #include <stdio.h>
 
-static const char wc_usage[] = "wc [OPTION]... [FILE]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint line, word, and byte counts for each FILE, and a total line if\n"
-	"more than one FILE is specified.  With no FILE, read standard input.\n\n"
-	"Options:\n"
-	"\t-c\tprint the byte counts\n"
-	"\t-l\tprint the newline counts\n"
-
-	"\t-L\tprint the length of the longest line\n"
-	"\t-w\tprint the word counts\n"
-#endif
-	;
-
 static int total_lines, total_words, total_chars, max_length;
 static int print_lines, print_words, print_chars, print_length;
 
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 01dff81f9..84b27fe58 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -24,12 +24,6 @@
 #include <stdio.h>
 #include <pwd.h>
 
-static const char whoami_usage[] = "whoami\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints the user name associated with the current effective user id.\n"
-#endif
-	;
-
 extern int whoami_main(int argc, char **argv)
 {
 	char *user = xmalloc(9);
diff --git a/coreutils/yes.c b/coreutils/yes.c
index 0191bb003..f41bbb6ef 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -23,13 +23,6 @@
 #include "internal.h"
 #include <stdio.h>
 
-const char yes_usage[] =
-	"yes [OPTION]... [STRING]...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRepeatedly outputs a line with all specified STRING(s), or `y'.\n"
-#endif
-	;
-
 extern int yes_main(int argc, char **argv)
 {
 	int i;