* cp -fa now works as expected for symlinks (it didn't before)

* zcat works again (wasn't working since option parsing was broken)
* more doc updates/more support for BB_FEATURE_SIMPLE_HELP
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@530 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 6 insertions, 3 deletions

diff --git a/coreutils/echo.c b/coreutils/echo.c
index 2405d0ae1..b31f2229b 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -26,12 +26,15 @@
 #include <stdio.h>
 
 static const char uname_usage[] =
-        "echo [-neE] [ARG ...]\n\n"
-        "Prints the specified ARGs to stdout\n\n"
+        "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";
+        "\t-E\tdisable interpretation of backslash-escaped characters\n"
+#endif
+        ;
 
 extern int 
 echo_main(int argc, char** argv)