mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-23 04:51:12 +02:00
Code Releases Activity

zsh-workers/9757

Browse source
This commit is contained in:
Tanaka Akira 2000-02-16 10:14:32 +00:00
parent c7f3045009
commit d5980018d5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Src/subst.c
View file

@ -1766,7 +1766,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
if (prenum || postnum) if (prenum || postnum)
x = dopadding(x, prenum, postnum, preone, postone, x = dopadding(x, prenum, postnum, preone, postone,
premul, postmul); premul, postmul);
if (eval && parsestr(x)) if (eval && parse_subst_string(x))
return NULL; return NULL;
xlen = strlen(x); xlen = strlen(x);
for (tn = firstnode(tl); for (tn = firstnode(tl);
@ -1801,7 +1801,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
if (prenum || postnum) if (prenum || postnum)
x = dopadding(x, prenum, postnum, preone, postone, x = dopadding(x, prenum, postnum, preone, postone,
premul, postmul); premul, postmul);
if (eval && parsestr(x)) if (eval && parse_subst_string(x))
return NULL; return NULL;
xlen = strlen(x); xlen = strlen(x);
strcatsub(&y, ostr, aptr, x, xlen, NULL, globsubst); strcatsub(&y, ostr, aptr, x, xlen, NULL, globsubst);
@ -1816,7 +1816,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
if (prenum || postnum) if (prenum || postnum)
x = dopadding(x, prenum, postnum, preone, postone, x = dopadding(x, prenum, postnum, preone, postone,
premul, postmul); premul, postmul);
if (eval && parsestr(x)) if (eval && parse_subst_string(x))
return NULL; return NULL;
if (qt && !*x && isarr != 2) if (qt && !*x && isarr != 2)
y = dupstring(nulstring); y = dupstring(nulstring);
@ -1832,7 +1832,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
if (prenum || postnum) if (prenum || postnum)
x = dopadding(x, prenum, postnum, preone, postone, x = dopadding(x, prenum, postnum, preone, postone,
premul, postmul); premul, postmul);
if (eval && parsestr(x)) if (eval && parse_subst_string(x))
return NULL; return NULL;
xlen = strlen(x); xlen = strlen(x);
*str = strcatsub(&y, aptr, aptr, x, xlen, fstr, globsubst); *str = strcatsub(&y, aptr, aptr, x, xlen, fstr, globsubst);
@ -1851,7 +1851,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
if (prenum || postnum) if (prenum || postnum)
x = dopadding(x, prenum, postnum, preone, postone, x = dopadding(x, prenum, postnum, preone, postone,
premul, postmul); premul, postmul);
if (eval && parsestr(x)) if (eval && parse_subst_string(x))
return NULL; return NULL;
xlen = strlen(x); xlen = strlen(x);
*str = strcatsub(&y, ostr, aptr, x, xlen, fstr, globsubst); *str = strcatsub(&y, ostr, aptr, x, xlen, fstr, globsubst);