d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Allow quoting pattern match characters in ${v%pat} and ${v#pat}.

Browse Source 
Note that this depends on r206145 for allowing pattern match characters to
have their special meaning inside a double-quoted expansion like "${v%pat}".

PR:		bin/117748
Exp-run done by:	erwin (with some other sh(1) changes)
This commit is contained in:
jilles 2010-04-03 21:07:50 +00:00
parent 8bc40943f5
commit 8b7edeca44
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/sh/expand.c
View File

@ -506,7 +506,9 @@ subevalvar(char *p, char *str, int strloc, int subtype, int startloc,
int amount;
herefd = -1;
argstr(p, 0);
argstr(p, subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX ||
subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX ?
EXP_CASE : 0);
STACKSTRNUL(expdest);
herefd = saveherefd;
argbackq = saveargbackq;

55
tools/regression/bin/sh/expansion/trim2.0 Normal file
View File

@ -0,0 +1,55 @@
# $FreeBSD$
e= q='?' a='*' t=texttext s='ast*que?non' p='/et[c]/' w='a b c' b='{{(#)}}'
h='##'
failures=''
ok=''
testcase() {
code="$1"
expected="$2"
oIFS="$IFS"
eval "$code"
IFS='|'
result="$#|$*"
IFS="$oIFS"
if [ "x$result" = "x$expected" ]; then
ok=x$ok
else
failures=x$failures
echo "For $code, expected $expected actual $result"
fi
}
set -f
testcase 'set -- $s' '1|ast*que?non'
testcase 'set -- ${s%\?*}' '1|ast*que'
testcase 'set -- "${s%\?*}"' '1|ast*que'
testcase 'set -- ${s%\**}' '1|ast'
testcase 'set -- "${s%\**}"' '1|ast'
testcase 'set -- ${s%"$q"*}' '1|ast*que'
testcase 'set -- "${s%"$q"*}"' '1|ast*que'
testcase 'set -- ${s%"$a"*}' '1|ast'
testcase 'set -- "${s%"$a"*}"' '1|ast'
testcase 'set -- ${s%"$q"$a}' '1|ast*que'
testcase 'set -- "${s%"$q"$a}"' '1|ast*que'
testcase 'set -- ${s%"$a"$a}' '1|ast'
testcase 'set -- "${s%"$a"$a}"' '1|ast'
set +f
testcase 'set -- "${b%\}}"' '1|{{(#)}'
# Parentheses are special in ksh, check that they can be escaped
testcase 'set -- "${b%\)*}"' '1|{{(#'
testcase 'set -- "${h#\#}"' '1|#'
testcase 'set -- ${p%"${p#?}"}' '1|/'
testcase 'set -- ${p%"${p#??????}"}' '1|/etc'
testcase 'set -- ${p%"${p#???????}"}' '1|/etc/'
testcase 'set -- "${p%"${p#?}"}"' '1|/'
testcase 'set -- "${p%"${p#??????}"}"' '1|/et[c]'
testcase 'set -- "${p%"${p#???????}"}"' '1|/et[c]/'
testcase 'set -- ${p#"${p}"}' '0|'
testcase 'set -- "${p#"${p}"}"' '1|'
testcase 'set -- "${p#*\[}"' '1|c]/'
test "x$failures" = x