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

Fix parsing of := for magicequalsubst.

Browse source
This commit is contained in:
Bart Schaefer 2000-06-17 19:51:51 +00:00
parent adfa6193a2
commit 1add53c578
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2000-06-17 Bart Schaefer <schaefer@zsh.org>
* 11961: Src/subst.c: 11959 was really a bug in magicequalsubst,
it shouldn't have treated x:=y as a reason to expand =y.
2000-06-17 Tanaka Akira <akr@zsh.org> 2000-06-17 Tanaka Akira <akr@zsh.org>
* 11959: Completion/User/_urls: make it magicequalsubst aware. * 11959: Completion/User/_urls: make it magicequalsubst aware.

8
Src/subst.c
View file

@ -307,7 +307,7 @@ multsub(char **s, char ***a, int *isarr, char *sep)
mod_export void mod_export void
filesub(char **namptr, int assign) filesub(char **namptr, int assign)
{ {
char *sub = NULL, *str, *ptr; char *eql = NULL, *sub = NULL, *str, *ptr;
int len; int len;
filesubstr(namptr, assign); filesubstr(namptr, assign);
@ -316,7 +316,7 @@ filesub(char **namptr, int assign)
return; return;
if (assign & PF_TYPESET) { if (assign & PF_TYPESET) {
if ((*namptr)[1] && (sub = strchr(*namptr + 1, Equals))) { if ((*namptr)[1] && (eql = sub = strchr(*namptr + 1, Equals))) {
str = sub + 1; str = sub + 1;
if ((sub[1] == Tilde || sub[1] == Equals) && filesubstr(&str, assign)) { if ((sub[1] == Tilde || sub[1] == Equals) && filesubstr(&str, assign)) {
sub[1] = '\0'; sub[1] = '\0';
@ -330,7 +330,9 @@ filesub(char **namptr, int assign)
while ((sub = strchr(ptr, ':'))) { while ((sub = strchr(ptr, ':'))) {
str = sub + 1; str = sub + 1;
len = sub - *namptr; len = sub - *namptr;
if ((sub[1] == Tilde || sub[1] == Equals) && filesubstr(&str, assign)) { if (sub > eql &&
(sub[1] == Tilde || sub[1] == Equals) &&
filesubstr(&str, assign)) {
sub[1] = '\0'; sub[1] = '\0';
*namptr = dyncat(*namptr, str); *namptr = dyncat(*namptr, str);
} }