diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/expand.c | 32 |
2 files changed, 14 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index dd2ee9d..e981a43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2014-10-08 Herbert Xu <herbert@gondor.apana.org.au> * Split unquoted $@/$* correctly when IFS is set but empty. + * Do not split quoted VSLENGTH and VSTRIM. 2014-10-07 Herbert Xu <herbert@gondor.apana.org.au> diff --git a/src/expand.c b/src/expand.c index 51ba8a1..dc8ae47 100644 --- a/src/expand.c +++ b/src/expand.c @@ -753,28 +753,22 @@ vsplus: argstr(p, flag | EXP_TILDE | EXP_WORD); goto end; } - if (easy) - goto record; - goto end; + goto record; } if (subtype == VSASSIGN || subtype == VSQUESTION) { - if (varlen < 0) { - if (subevalvar(p, var, 0, subtype, startloc, - varflags, flag & ~QUOTES_ESC)) { - varflags &= ~VSNUL; - /* - * Remove any recorded regions beyond - * start of variable - */ - removerecordregions(startloc); - goto again; - } - goto end; - } - if (easy) + if (varlen >= 0) goto record; - goto end; + + subevalvar(p, var, 0, subtype, startloc, varflags, + flag & ~QUOTES_ESC); + varflags &= ~VSNUL; + /* + * Remove any recorded regions beyond + * start of variable + */ + removerecordregions(startloc); + goto again; } if (varlen < 0 && uflag) @@ -786,9 +780,9 @@ vsplus: } if (subtype == VSNORMAL) { +record: if (!easy) goto end; -record: recordregion(startloc, expdest - (char *)stackblock(), nulonly); goto end; } |