emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backslashes shouldn't be treated as backticks.

Browse Source
This commit is contained in:
Matt Kraai 2000-09-14 00:43:20 +00:00
parent cbbe4d6bc2
commit 131241f71c
3 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lash.c
View File

@ -1003,16 +1003,6 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
returnCommand = *commandPtr + (src - *commandPtr) + 1; returnCommand = *commandPtr + (src - *commandPtr) + 1;
break; 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 #ifdef BB_FEATURE_SH_BACKTICKS
case '`': case '`':
/* Exec a backtick-ed command */ /* Exec a backtick-ed command */
@ -1082,6 +1072,17 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
} }
break; break;
#endif // BB_FEATURE_SH_BACKTICKS #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: default:
*buf++ = *src; *buf++ = *src;
} }

21
sh.c
View File

@ -1003,16 +1003,6 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
returnCommand = *commandPtr + (src - *commandPtr) + 1; returnCommand = *commandPtr + (src - *commandPtr) + 1;
break; 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 #ifdef BB_FEATURE_SH_BACKTICKS
case '`': case '`':
/* Exec a backtick-ed command */ /* Exec a backtick-ed command */
@ -1082,6 +1072,17 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
} }
break; break;
#endif // BB_FEATURE_SH_BACKTICKS #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: default:
*buf++ = *src; *buf++ = *src;
} }

21
shell/lash.c
View File

@ -1003,16 +1003,6 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
returnCommand = *commandPtr + (src - *commandPtr) + 1; returnCommand = *commandPtr + (src - *commandPtr) + 1;
break; 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 #ifdef BB_FEATURE_SH_BACKTICKS
case '`': case '`':
/* Exec a backtick-ed command */ /* Exec a backtick-ed command */
@ -1082,6 +1072,17 @@ static int parseCommand(char **commandPtr, struct job *job, struct jobSet *jobLi
} }
break; break;
#endif // BB_FEATURE_SH_BACKTICKS #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: default:
*buf++ = *src; *buf++ = *src;
} }