tree 42a92619ef723cce5153eb0160df8f36cf9dc5c4
parent eb7f9acda147543079f261753a11d2afa340fc5e
author Ron Yorston <rmy@pobox.com> 1579778768 +0000
committer Denys Vlasenko <vda.linux@googlemail.com> 1580302785 +0100

ash: improve expandstr()

The dash maintainer recently posted a fix for issues with expanding
PS1.  These had already been fixed differently in BusyBox ash.  Borrow
a couple of improvements:

- Use a single call to setjmp() to trap errors in both readtoken1()
  and expandarg().

- In case of error set the prompt to the literal value of PS1 rather
  than the half-digested nonsense in stackblock() which might include
  ugly control characters.

function                                             old     new   delta
expandstr                                            353     300     -53

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>