Patch from Matt Kraai to fox sh.c escape problem such that

running things like 'echo "\n\tHi\n\t\!"' and 'echo -e "\n\tHi\n\t\!"'
behave as under bash.

3 files changed, 9 insertions, 3 deletions

diff --git a/lash.c b/lash.c
index 07715d4e3..9fc215c98 100644
--- a/lash.c
+++ b/lash.c
@@ -933,8 +933,10 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
                                 }
 
                                 /* in shell, "\'" should yield \' */
-                                if (*src != quote)
+                                if (*src != quote) {
                                         *buf++ = '\\';
+                                        *buf++ = '\\';
+                                }
                         } else if (*src == '*' || *src == '?' || *src == '[' ||
                                            *src == ']') *buf++ = '\\';
                         *buf++ = *src;
diff --git a/sh.c b/sh.c
index 07715d4e3..9fc215c98 100644
--- a/sh.c
+++ b/sh.c
@@ -933,8 +933,10 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
                                 }
 
                                 /* in shell, "\'" should yield \' */
-                                if (*src != quote)
+                                if (*src != quote) {
                                         *buf++ = '\\';
+                                        *buf++ = '\\';
+                                }
                         } else if (*src == '*' || *src == '?' || *src == '[' ||
                                            *src == ']') *buf++ = '\\';
                         *buf++ = *src;
diff --git a/shell/lash.c b/shell/lash.c
index 07715d4e3..9fc215c98 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -933,8 +933,10 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
                                 }
 
                                 /* in shell, "\'" should yield \' */
-                                if (*src != quote)
+                                if (*src != quote) {
                                         *buf++ = '\\';
+                                        *buf++ = '\\';
+                                }
                         } else if (*src == '*' || *src == '?' || *src == '[' ||
                                            *src == ']') *buf++ = '\\';
                         *buf++ = *src;