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

ash: fix $HOME/.profile reading if !ASH_EXPAND_PRMT, take 2

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-01 23:24:48 +02:00
parent e9aba3e7ea
commit 48c803a206
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shell/ash.c
View File

@ -2484,10 +2484,10 @@ setprompt_if(smallint do_set, int whichprompt)
} }
#if ENABLE_ASH_EXPAND_PRMT #if ENABLE_ASH_EXPAND_PRMT
pushstackmark(&smark, stackblocksize()); pushstackmark(&smark, stackblocksize());
#endif
putprompt(expandstr(prompt)); putprompt(expandstr(prompt));
#if ENABLE_ASH_EXPAND_PRMT
popstackmark(&smark); popstackmark(&smark);
#else
putprompt(prompt);
#endif #endif
} }
@ -11534,9 +11534,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
smallint dblquote; smallint dblquote;
smallint oldstyle; smallint oldstyle;
IF_FEATURE_SH_MATH(smallint prevsyntax;) /* syntax before arithmetic */ IF_FEATURE_SH_MATH(smallint prevsyntax;) /* syntax before arithmetic */
#if ENABLE_ASH_EXPAND_PRMT
smallint pssyntax; /* we are expanding a prompt string */ smallint pssyntax; /* we are expanding a prompt string */
#endif
int varnest; /* levels of variables expansion */ int varnest; /* levels of variables expansion */
IF_FEATURE_SH_MATH(int arinest;) /* levels of arithmetic expansion */ IF_FEATURE_SH_MATH(int arinest;) /* levels of arithmetic expansion */
IF_FEATURE_SH_MATH(int parenlevel;) /* levels of parens in arithmetic */ IF_FEATURE_SH_MATH(int parenlevel;) /* levels of parens in arithmetic */
@ -11548,11 +11546,9 @@ 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;
#endif
dblquote = (syntax == DQSYNTAX); dblquote = (syntax == DQSYNTAX);
varnest = 0; varnest = 0;
IF_FEATURE_SH_MATH(arinest = 0;) IF_FEATURE_SH_MATH(arinest = 0;)
@ -11606,12 +11602,10 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
} else if (c == '\n') { } else if (c == '\n') {
nlprompt(); nlprompt();
} else { } else {
#if ENABLE_ASH_EXPAND_PRMT
if (c == '$' && pssyntax) { if (c == '$' && pssyntax) {
USTPUTC(CTLESC, out); USTPUTC(CTLESC, out);
USTPUTC('\\', out); USTPUTC('\\', out);
} }
#endif
/* Backslash is retained if we are in "str" and next char isn't special */ /* Backslash is retained if we are in "str" and next char isn't special */
if (dblquote if (dblquote
&& c != '\\' && c != '\\'