From 2e4de2ddaa11b153e1ea9bfe111aeb09f889b1fd Mon Sep 17 00:00:00 2001
From: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Date: Thu, 19 Dec 2019 18:58:17 +0200
Subject: [PATCH] Improve escaping

---
 platforms/app/main.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/platforms/app/main.c b/platforms/app/main.c
index bd59e04..03232da 100644
--- a/platforms/app/main.c
+++ b/platforms/app/main.c
@@ -85,10 +85,24 @@ void unescape(char* buff)
 {
     char* outp = buff;
     while (*buff) {
-        if (*buff == '\\' && *(buff+1) == 'x') {
-            char hex[3] = { *(buff+2), *(buff+3), '\0' };
-            *outp++ = strtol(hex, NULL, 16);
-            buff += 4;
+        if (*buff == '\\') {
+            switch (*(buff+1)) {
+            case '0':  *outp++ = '\0'; break;
+            case 'b':  *outp++ = '\b'; break;
+            case 'n':  *outp++ = '\n'; break;
+            case 'r':  *outp++ = '\r'; break;
+            case 't':  *outp++ = '\t'; break;
+            case 'x': {
+                char hex[3] = { *(buff+2), *(buff+3), '\0' };
+                *outp++ = strtol(hex, NULL, 16);
+                buff += 2;
+                break;
+            }
+            // Otherwise just pass the letter
+            // Also handles '\\'
+            default: *outp++ = *(buff+1); break;
+            }
+            buff += 2;
         } else {
             *outp++ = *buff++;
         }
@@ -97,7 +111,7 @@ void unescape(char* buff)
 }
 
 static
-int split_argv(char *str, char** argv)
+int split_argv(char *str, const char** argv)
 {
     int result = 0;
     char* curr = str;
@@ -106,6 +120,7 @@ int split_argv(char *str, char** argv)
         if (strchr(" \n\r\t", str[i])) {
             if (len) {  // Found space after non-space
                 str[i] = '\0';
+                unescape(curr);
                 argv[result++] = curr;
                 len = 0;
             }
@@ -203,7 +218,7 @@ int  main  (int i_argc, const char* i_argv[])
     while (argRepl)
     {
         char cmd_buff[1024] = { 0, };
-        char* argv[32] = { 0, };
+        const char* argv[32] = { 0, };
         fprintf(stdout, "wasm3> ");
         fflush(stdout);
         if (!fgets(cmd_buff, sizeof(cmd_buff), stdin)) {
@@ -226,7 +241,6 @@ int  main  (int i_argc, const char* i_argv[])
         } else if (argv[0][0] == ':') {
             result = "no such command";
         } else {
-            unescape(argv[0]);
             result = repl_call(runtime, argv[0], argc-1, argv+1);
         }