diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-04 13:59:53 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-04-04 13:59:53 +0200 |
| commit | ee1fd1246e7d25990531dbbb2d267605b8914d5d (patch) | |
| tree | 54cb14fe9bd0bebfc0260e1d065eac681d7a865e /shell | |
| parent | fbf44854a3b7a32a0a0ff1a03f4163d25f2d62af (diff) | |
| download | busybox-w32-ee1fd1246e7d25990531dbbb2d267605b8914d5d.tar.gz busybox-w32-ee1fd1246e7d25990531dbbb2d267605b8914d5d.tar.bz2 busybox-w32-ee1fd1246e7d25990531dbbb2d267605b8914d5d.zip | |
ash: unbreak PS1 parsing after "ash: parser: Add syntax stack..." commit
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index ed1a4416c..558601543 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -11959,7 +11959,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs) | |||
| 11959 | smallint pssyntax; /* we are expanding a prompt string */ | 11959 | smallint pssyntax; /* we are expanding a prompt string */ |
| 11960 | IF_BASH_DOLLAR_SQUOTE(smallint bash_dollar_squote = 0;) | 11960 | IF_BASH_DOLLAR_SQUOTE(smallint bash_dollar_squote = 0;) |
| 11961 | /* syntax stack */ | 11961 | /* syntax stack */ |
| 11962 | struct synstack synbase = { .syntax = syntax }; | 11962 | struct synstack synbase = { }; |
| 11963 | struct synstack *synstack = &synbase; | 11963 | struct synstack *synstack = &synbase; |
| 11964 | 11964 | ||
| 11965 | #if ENABLE_ASH_EXPAND_PRMT | 11965 | #if ENABLE_ASH_EXPAND_PRMT |
| @@ -11969,6 +11969,8 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs) | |||
| 11969 | #else | 11969 | #else |
| 11970 | pssyntax = 0; /* constant */ | 11970 | pssyntax = 0; /* constant */ |
| 11971 | #endif | 11971 | #endif |
| 11972 | synstack->syntax = syntax; | ||
| 11973 | |||
| 11972 | if (syntax == DQSYNTAX) | 11974 | if (syntax == DQSYNTAX) |
| 11973 | synstack->dblquote = 1; | 11975 | synstack->dblquote = 1; |
| 11974 | quotef = 0; | 11976 | quotef = 0; |
