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.

diff --git a/lash.c b/lash.c
index 07715d4e305303e0f75ca8bf21c3f8ecb828a7b9..9fc215c9897c5965436c93de42de4ead2e89acb1 100644 (file)
--- 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 07715d4e305303e0f75ca8bf21c3f8ecb828a7b9..9fc215c9897c5965436c93de42de4ead2e89acb1 100644 (file)
--- 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 07715d4e305303e0f75ca8bf21c3f8ecb828a7b9..9fc215c9897c5965436c93de42de4ead2e89acb1 100644 (file)
--- 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;