diff options
| author | Ron Yorston <rmy@pobox.com> | 2019-07-29 09:51:14 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2019-07-31 13:44:32 +0200 |
| commit | 943e81f5db56eedbadf43459afbc967d100f9da2 (patch) | |
| tree | 1b527b88be82f034a9e7e97a99257774743c4495 | |
| parent | dac0a7d2341368a1b8e06d1a0c5ca0c76e90b6f9 (diff) | |
| download | busybox-943e81f5db56eedbadf43459afbc967d100f9da2.tar.gz | |
ash: only catch unexpected exceptions in PS1 expansion
Commit d1a2fa2a4 (ash: catch error in arithmetic expansion in PS1)
catches all exceptions raised by expandarg(). Some exceptions, such as
the EXEXIT raised when command expansion is used, are expected:
export PS1='$(echo "$ ")'
These should be processed normally or the shell hangs at the prompt.
function old new delta
expandstr 344 353 +9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 9/0) Total: 9 bytes
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | shell/ash.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/shell/ash.c b/shell/ash.c index e3bbac9a0..c0352602b 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -13126,6 +13126,8 @@ expandstr(const char *ps, int syntax_type) if (setjmp(jmploc.loc) == 0) { exception_handler = &jmploc; expandarg(&n, NULL, EXP_QUOTED); + } else if (exception_type == EXEXIT) { + exitshell(); } exception_handler = savehandler; RESTORE_INT(saveint); |