JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use evalstr instead of wdstrip+substitute and drop home-grown backslash removal

Browse Source
This commit is contained in:
tg 2015-12-12 18:47:22 +00:00
parent d4aa35212c
commit 8d22d9226f
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
eval.c
View File

@ -23,7 +23,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.175 2015/12/12 17:28:10 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.176 2015/12/12 18:47:22 tg Exp $");
/* /*
* string expansion * string expansion
@ -496,30 +496,9 @@ expand(
else else
d[-2] = EOS; d[-2] = EOS;
sp += (d ? d : p) - s - 1; sp += (d ? d : p) - s - 1;
tpat0 = wdstrip(s, pat = evalstr(s, DOTILDE | DOPAT);
WDS_KEEPQ | WDS_MAGIC); rrep = d ? evalstr(p, DOTILDE) : null;
pat = substitute(tpat0, DOTILDE);
if (d) {
d = wdstrip(p, WDS_KEEPQ);
rrep = substitute(d,
DOTILDE);
afree(d, ATEMP);
} else
rrep = null;
afree(s, ATEMP); afree(s, ATEMP);
s = d = pat;
while (*s)
if (*s != '\\' ||
s[1] == '%' ||
s[1] == '#' ||
s[1] == '\0' ||
/* XXX really? */ s[1] == '\\' ||
s[1] == '/')
*d++ = *s++;
else
s++;
*d = '\0';
afree(tpat0, ATEMP);
/* check for special cases */ /* check for special cases */
switch (*pat) { switch (*pat) {