mirror of https://github.com/sheumann/hush.git
ash: perform tilde expansion in all parameter expansion words
Previously tilde expansion was not carried out for =?#% expansion words. Test case: a=~root:~root echo ${a#~root} Old result: /root:/root New result: :/root Based on commit dd721f71 from git://git.kernel.org/pub/scm/utils/dash/dash.git by Herbert Xu function old new delta subevalvar 1152 1153 +1 Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
d68d1fbd6c
commit
eb6b48ba74
|
@ -6361,8 +6361,8 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
|
|||
// p, varname, strloc, subtype, startloc, varflags, quotes);
|
||||
|
||||
herefd = -1;
|
||||
argstr(p, (subtype != VSASSIGN && subtype != VSQUESTION) ? EXP_CASE : 0,
|
||||
var_str_list);
|
||||
argstr(p, EXP_TILDE | (subtype != VSASSIGN && subtype != VSQUESTION ?
|
||||
EXP_CASE : 0), var_str_list);
|
||||
STPUTC('\0', expdest);
|
||||
herefd = saveherefd;
|
||||
argbackq = saveargbackq;
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
:/root
|
|
@ -0,0 +1,2 @@
|
|||
a=~root:~root
|
||||
echo ${a#~root}
|
Loading…
Reference in New Issue