mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

46100: Fix =subst before =(subst)

Browse source 
This occurs with SH file expansion ordering.

Add test.
This commit is contained in:
Peter Stephenson 2020-06-26 17:32:02 +01:00
parent d14a924c37
commit 7865486994
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2020-06-26 Peter Stephenson <p.stephenson@samsung.com>
* 46110: Src/subst.c, Test/D03procsubst.ztst: If =subst occurs
before =(subst) we should allow for the possibility of the latter.
2020-06-26 Oliver Kiddle <okiddle@yahoo.co.uk>
* unposted c.f. 46034: Completion/Unix/Command/_gpg: workaround

2
Src/subst.c
View file

@ -796,7 +796,7 @@ filesubstr(char **namptr, int assign)
*namptr = dyncat(hom, ptr);
return 1;
}
} else if (*str == Equals && isset(EQUALS) && str[1]) { /* =foo */
} else if (*str == Equals && isset(EQUALS) && str[1] && str[1] != Inpar) { /* =foo */
char *expn = equalsubstr(str+1, assign, isset(NOMATCH));
if (expn) {
*namptr = expn;

4
Test/D03procsubst.ztst
View file

@ -156,3 +156,7 @@
procfunc <(echo argument)
0:With /proc/self file descriptors must not be tidied up too early
>argument
$ZTST_testdir/../Src/zsh -df -o shfileexpansion -c 'cat =(echo hi)'
0:EQUALS expansion followed by =(...) (sh ordering) should work
>hi