Backslashes shouldn't be treated as backticks.

3 files changed, 33 insertions, 30 deletions

diff --git a/lash.c b/lash.c
index b4b11fb89..7bc43190d 100644
--- a/lash.c
+++ b/lash.c
@@ -1003,16 +1003,6 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
                                 returnCommand = *commandPtr + (src - *commandPtr) + 1;
                                 break;
 
-                        case '\\':
-                                src++;
-                                if (!*src) {
-                                        errorMsg("character expected after \\\n");
-                                        freeJob(job);
-                                        return 1;
-                                }
-                                if (*src == '*' || *src == '[' || *src == ']'
-                                        || *src == '?') *buf++ = '\\';
-                                /* fallthrough */
 #ifdef BB_FEATURE_SH_BACKTICKS
                         case '`':
                                 /* Exec a backtick-ed command */
@@ -1082,6 +1072,17 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
                                 }
                                 break;
 #endif // BB_FEATURE_SH_BACKTICKS
+
+                        case '\\':
+                                src++;
+                                if (!*src) {
+                                        errorMsg("character expected after \\\n");
+                                        freeJob(job);
+                                        return 1;
+                                }
+                                if (*src == '*' || *src == '[' || *src == ']'
+                                        || *src == '?') *buf++ = '\\';
+                                /* fallthrough */
                         default:
                                 *buf++ = *src;
                         }
diff --git a/sh.c b/sh.c
index b4b11fb89..7bc43190d 100644
--- a/sh.c
+++ b/sh.c
@@ -1003,16 +1003,6 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
                                 returnCommand = *commandPtr + (src - *commandPtr) + 1;
                                 break;
 
-                        case '\\':
-                                src++;
-                                if (!*src) {
-                                        errorMsg("character expected after \\\n");
-                                        freeJob(job);
-                                        return 1;
-                                }
-                                if (*src == '*' || *src == '[' || *src == ']'
-                                        || *src == '?') *buf++ = '\\';
-                                /* fallthrough */
 #ifdef BB_FEATURE_SH_BACKTICKS
                         case '`':
                                 /* Exec a backtick-ed command */
@@ -1082,6 +1072,17 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
                                 }
                                 break;
 #endif // BB_FEATURE_SH_BACKTICKS
+
+                        case '\\':
+                                src++;
+                                if (!*src) {
+                                        errorMsg("character expected after \\\n");
+                                        freeJob(job);
+                                        return 1;
+                                }
+                                if (*src == '*' || *src == '[' || *src == ']'
+                                        || *src == '?') *buf++ = '\\';
+                                /* fallthrough */
                         default:
                                 *buf++ = *src;
                         }
diff --git a/shell/lash.c b/shell/lash.c
index b4b11fb89..7bc43190d 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1003,16 +1003,6 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
                                 returnCommand = *commandPtr + (src - *commandPtr) + 1;
                                 break;
 
-                        case '\\':
-                                src++;
-                                if (!*src) {
-                                        errorMsg("character expected after \\\n");
-                                        freeJob(job);
-                                        return 1;
-                                }
-                                if (*src == '*' || *src == '[' || *src == ']'
-                                        || *src == '?') *buf++ = '\\';
-                                /* fallthrough */
 #ifdef BB_FEATURE_SH_BACKTICKS
                         case '`':
                                 /* Exec a backtick-ed command */
@@ -1082,6 +1072,17 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
                                 }
                                 break;
 #endif // BB_FEATURE_SH_BACKTICKS
+
+                        case '\\':
+                                src++;
+                                if (!*src) {
+                                        errorMsg("character expected after \\\n");
+                                        freeJob(job);
+                                        return 1;
+                                }
+                                if (*src == '*' || *src == '[' || *src == ']'
+                                        || *src == '?') *buf++ = '\\';
+                                /* fallthrough */
                         default:
                                 *buf++ = *src;
                         }