Lots of updates. Finished implementing BB_FEATURE_TRIVIAL_HELP

which lets you compile out most of the "--help" output, saving
up to 17k.

Renamed mnc to nc.
 -Erik

2 files changed, 12 insertions, 6 deletions

diff --git a/findutils/find.c b/findutils/find.c
index f6e63afb9..53b85e6b3 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -33,13 +33,16 @@ static char *pattern = NULL;
 static char *directory = ".";
 static int dereferenceFlag = FALSE;
 
-static const char find_usage[] = "find [PATH...] [EXPRESSION]\n\n"
-        "Search for files in a directory hierarchy.  The default PATH is\n"
+static const char find_usage[] = "find [PATH...] [EXPRESSION]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+        "\nSearch for files in a directory hierarchy.  The default PATH is\n"
         "the current directory; default EXPRESSION is '-print'\n\n"
         "\nEXPRESSION may consist of:\n"
         "\t-follow\t\tDereference symbolic links.\n"
         "\t-name PATTERN\tFile name (leading directories removed) matches PATTERN.\n"
-        "\t-print\t\tprint the full file name followed by a newline to stdout.\n";
+        "\t-print\t\tprint the full file name followed by a newline to stdout.\n"
+#endif
+        ;
 
 
 static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
diff --git a/findutils/grep.c b/findutils/grep.c
index 06b6980bc..6872ac271 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -41,8 +41,9 @@
 #include <ctype.h>
 
 static const char grep_usage[] =
-        "grep [OPTIONS]... PATTERN [FILE]...\n\n"
-        "Search for PATTERN in each FILE or standard input.\n\n"
+        "grep [OPTIONS]... PATTERN [FILE]...\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+        "\nSearch for PATTERN in each FILE or standard input.\n\n"
         "OPTIONS:\n"
         "\t-h\tsuppress the prefixing filename on output\n"
         "\t-i\tignore case distinctions\n"
@@ -52,8 +53,10 @@ static const char grep_usage[] =
 #if defined BB_REGEXP
         "This version of grep matches full regular expresions.\n";
 #else
-        "This version of grep matches strings (not regular expresions).\n";
+        "This version of grep matches strings (not regular expresions).\n"
 #endif
+#endif
+        ;
 
 static int match = FALSE, beQuiet = FALSE;