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

ash: if !ENABLE_ASH_EXPAND_PRMT, disable PSSYNTAX code

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-29 22:58:44 +02:00
parent 1c79aeb6a8
commit 5f0a75f24b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shell/ash.c
View File

@ -2494,7 +2494,9 @@ static const char *expandstr(const char *ps, int syntax_type);
#define DQSYNTAX 1 /* in double quotes */ #define DQSYNTAX 1 /* in double quotes */
#define SQSYNTAX 2 /* in single quotes */ #define SQSYNTAX 2 /* in single quotes */
#define ARISYNTAX 3 /* in arithmetic */ #define ARISYNTAX 3 /* in arithmetic */
#define PSSYNTAX 4 /* prompt. never passed to SIT() */ #if ENABLE_ASH_EXPAND_PRMT
# define PSSYNTAX 4 /* prompt. never passed to SIT() */
#endif
/* PSSYNTAX expansion is identical to DQSYNTAX, except keeping '\$' as '\$' */ /* PSSYNTAX expansion is identical to DQSYNTAX, except keeping '\$' as '\$' */
/* /*
@ -11594,9 +11596,13 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
bqlist = NULL; bqlist = NULL;
quotef = 0; quotef = 0;
IF_FEATURE_SH_MATH(prevsyntax = 0;) IF_FEATURE_SH_MATH(prevsyntax = 0;)
#if ENABLE_ASH_EXPAND_PRMT
pssyntax = (syntax == PSSYNTAX); pssyntax = (syntax == PSSYNTAX);
if (pssyntax) if (pssyntax)
syntax = DQSYNTAX; syntax = DQSYNTAX;
#else
pssyntax = 0; /* constant */
#endif
dblquote = (syntax == DQSYNTAX); dblquote = (syntax == DQSYNTAX);
varnest = 0; varnest = 0;
IF_FEATURE_SH_MATH(arinest = 0;) IF_FEATURE_SH_MATH(arinest = 0;)
@ -11650,7 +11656,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
} else if (c == '\n') { } else if (c == '\n') {
nlprompt(); nlprompt();
} else { } else {
if (c == '$' && pssyntax) { if (pssyntax && c == '$') {
USTPUTC(CTLESC, out); USTPUTC(CTLESC, out);
USTPUTC('\\', out); USTPUTC('\\', out);
} }