[PATCH 10/12] echo command: Add -e option

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 commands/Kconfig |    6 +++++
 commands/echo.c  |   65 ++++++++++++-----------------------------------------
 2 files changed, 21 insertions(+), 50 deletions(-)

diff --git a/commands/Kconfig b/commands/Kconfig
index 543ee71..0c09f91 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -118,6 +118,12 @@ config CMD_ECHO
 	default y
 	prompt "echo"
 
+config CMD_ECHO_E
+	bool
+	depends on CMD_ECHO
+	select PROCESS_ESCAPE_SEQUENCE
+	prompt "support -e option to echo"
+
 endmenu
 
 menu "memory                        "
diff --git a/commands/echo.c b/commands/echo.c
index 6f4f136..dfa14d6 100644
--- a/commands/echo.c
+++ b/commands/echo.c
@@ -25,52 +25,7 @@
 #include <fs.h>
 #include <fcntl.h>
 #include <errno.h>
-
-static int my_fputs(int fd, const char *s)
-{
-	int c;
-
-	while (*s) {
-		if (*s == '\\') {
-			switch (*(s + 1)) {
-			case 0:
-				return 0;
-			case '\\':
-				c = '\\';
-				break;
-			case 'a':
-				c = '\a';
-				break;
-			case 'b':
-				c = '\b';
-				break;
-			case 'n':
-				c = '\n';
-				break;
-			case 'r':
-				c = '\r';
-				break;
-			case 't':
-				c = '\t';
-				break;
-			case 'f':
-				c = '\f';
-				break;
-			case 'e':
-				c = 0x1b;
-				break;
-			default:
-				fputc(fd, '\\');
-				c = *(s + 1);
-			}
-			s++;
-			fputc(fd, c);
-		} else
-			fputc(fd, *s);
-		s++;
-	}
-	return 0;
-}
+#include <libbb.h>
 
 static int do_echo(struct command *cmdtp, int argc, char *argv[])
 {
@@ -78,8 +33,10 @@ static int do_echo(struct command *cmdtp, int argc, char *argv[])
 	int fd = stdout, opt, newline = 1;
 	char *file = NULL;
 	int oflags = O_WRONLY | O_CREAT;
-	int (*fputsfunc)(int, const char *) = fputs;
-
+#ifdef CONFIG_CMD_ECHO_E
+	char str[CONFIG_CBSIZE];
+	int process_escape = 0;
+#endif
 	/* We can't use getopt() here because we want to
 	 * echo all things we don't understand.
 	 */
@@ -109,9 +66,11 @@ static int do_echo(struct command *cmdtp, int argc, char *argv[])
 				goto no_optarg_out;
 			optind++;
 			break;
+#ifdef CONFIG_CMD_ECHO_E
 		case 'e':
-			fputsfunc = my_fputs;
+			process_escape = 1;
 			break;
+#endif
 		default:
 			goto exit_parse;
 		}
@@ -130,7 +89,13 @@ exit_parse:
 	for (i = optind; i < argc; i++) {
 		if (i > optind)
 			fputc(fd, ' ');
-		fputsfunc(fd, argv[i]);
+#ifdef CONFIG_CMD_ECHO_E
+		if (process_escape) {
+			process_escape_sequence(argv[i], str, CONFIG_CBSIZE);
+			fputs(fd, str);
+		} else
+#endif
+			fputs(fd, argv[i]);
 	}
 
 	if (newline)
-- 
1.7.0