Update internal.h to conditionally include asm/string.h

[oweals/busybox.git] / echo.c

diff --git a/echo.c b/echo.c
index 91f17aa0f4b51a9b8302ec6f54e544dfe7f284fb..4659e4bc627f9f07dae50515440fdc1a8489e4dd 100644 (file)
--- a/echo.c
+++ b/echo.c
@@ -25,6 +25,17 @@
 #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)
 {
@@ -45,6 +56,9 @@ echo_main(int argc, char** argv)
                } else if (strcmp(p, "-E")==0) {
                        eflag = 0;
                }
+               else if (strncmp(p, "--", 2)==0) {
+                       usage( uname_usage);
+               } 
                else break;
                ap++;
        }
@@ -82,7 +96,7 @@ echo_main(int argc, char** argv)
        if (! nflag)
                putchar('\n');
        fflush(stdout);
-       exit( 0);
+       return( 0);
 }
 
 /*-