emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: expand: Fixed "$@" expansion when EXP_FULL is false

Browse Source 
Upstream commit:

    Date: Thu, 1 Jan 2015 07:53:10 +1100
    expand: Fixed "$@" expansion when EXP_FULL is false

    The commit 3c06acdac0b1ba0e0acdda513a57ee6e31385dce ([EXPAND]
    Split unquoted $@/$* correctly when IFS is set but empty) broke
    the case where $@ is in quotes and EXP_FULL is false.

    In that case we should still emit IFS as field splitting is not
    performed.

    Reported-by: Juergen Daubert <jue@jue.li>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-10-02 02:46:56 +02:00
parent 42eeb255c1
commit 0aaaa50b45
5 changed files with 87 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
shell/ash.c
View File

@ -6615,7 +6615,10 @@ varvalue(char *name, int varflags, int flags, struct strlist *var_str_list, int
int subtype = varflags & VSTYPE;
int discard = subtype == VSPLUS || subtype == VSLENGTH;
int quotes = (discard ? 0 : (flags & QUOTES_ESC)) | QUOTES_KEEPNUL;
int syntax = quoted ? DQSYNTAX : BASESYNTAX;
int syntax;
sep = (flags & EXP_FULL) << CHAR_BIT;
syntax = quoted ? DQSYNTAX : BASESYNTAX;
switch (*name) {
case '$':
@ -6649,23 +6652,18 @@ varvalue(char *name, int varflags, int flags, struct strlist *var_str_list, int
raise_error_syntax("bad substitution");
#endif
break;
case '@': {
case '@':
if (quoted && sep)
goto param;
/* fall through */
case '*': {
char **ap;
char sepc;
if (quoted)
sep = 0;
if (quoted && (flags & EXP_FULL)) {
/* note: this is not meant as PEOF value */
sep = 1 << CHAR_BIT;
goto param;
}
/* fall through */
case '*':
sep = ifsset() ? (unsigned char)(ifsval()[0]) : ' ';
if (!quoted) {
sep |= ifsset() ? ifsval()[0] : ' ';
param:
sep |= (flags & EXP_FULL) << CHAR_BIT;
}
sepc = sep;
*quotedp = !sepc;
ap = shellparam.p;
@ -6680,7 +6678,7 @@ varvalue(char *name, int varflags, int flags, struct strlist *var_str_list, int
}
}
break;
} /* case '@' and '*' */
} /* case '*' */
case '0':
case '1':
case '2':

16
shell/ash_test/ash-vars/var_wordsplit_ifs1.right
View File

@ -22,4 +22,20 @@ Testing: IFS="" "$*"
Testing: IFS="" "$@"
.abc.
.d e.
Testing: !IFS v=$*
v='abc d e'
Testing: !IFS v=$@
v='abc d e'
Testing: !IFS v="$*"
v='abc d e'
Testing: !IFS v="$@"
v='abc d e'
Testing: IFS="" v=$*
v='abcd e'
Testing: IFS="" v=$@
v='abcd e'
Testing: IFS="" v="$*"
v='abcd e'
Testing: IFS="" v="$@"
v='abcd e'
Finished

21
shell/ash_test/ash-vars/var_wordsplit_ifs1.tests
View File

@ -18,4 +18,25 @@ IFS=""; for a in "$*"; do echo ".$a."; done
echo 'Testing: IFS="" "$@"'
IFS=""; for a in "$@"; do echo ".$a."; done
echo 'Testing: !IFS v=$*'
unset IFS; v=$*; echo "v='$v'"
echo 'Testing: !IFS v=$@'
unset IFS; v=$@; echo "v='$v'"
echo 'Testing: !IFS v="$*"'
unset IFS; v="$*"; echo "v='$v'"
echo 'Testing: !IFS v="$@"'
unset IFS; v="$@"; echo "v='$v'"
echo 'Testing: IFS="" v=$*'
IFS=""; v=$*; echo "v='$v'"
echo 'Testing: IFS="" v=$@'
IFS=""; v=$@; echo "v='$v'"
echo 'Testing: IFS="" v="$*"'
IFS=""; v="$*"; echo "v='$v'"
echo 'Testing: IFS="" v="$@"'
IFS=""; v="$@"; echo "v='$v'"
# Note: in IFS="" v=$@ and IFS="" v="$@" cases, bash produces "abc d e"
# We produce "abcd e"
echo Finished

16
shell/hush_test/hush-vars/var_wordsplit_ifs1.right
View File

@ -22,4 +22,20 @@ Testing: IFS="" "$*"
Testing: IFS="" "$@"
.abc.
.d e.
Testing: !IFS v=$*
v='abc d e'
Testing: !IFS v=$@
v='abc d e'
Testing: !IFS v="$*"
v='abc d e'
Testing: !IFS v="$@"
v='abc d e'
Testing: IFS="" v=$*
v='abcd e'
Testing: IFS="" v=$@
v='abcd e'
Testing: IFS="" v="$*"
v='abcd e'
Testing: IFS="" v="$@"
v='abcd e'
Finished

21
shell/hush_test/hush-vars/var_wordsplit_ifs1.tests
View File

@ -18,4 +18,25 @@ IFS=""; for a in "$*"; do echo ".$a."; done
echo 'Testing: IFS="" "$@"'
IFS=""; for a in "$@"; do echo ".$a."; done
echo 'Testing: !IFS v=$*'
unset IFS; v=$*; echo "v='$v'"
echo 'Testing: !IFS v=$@'
unset IFS; v=$@; echo "v='$v'"
echo 'Testing: !IFS v="$*"'
unset IFS; v="$*"; echo "v='$v'"
echo 'Testing: !IFS v="$@"'
unset IFS; v="$@"; echo "v='$v'"
echo 'Testing: IFS="" v=$*'
IFS=""; v=$*; echo "v='$v'"
echo 'Testing: IFS="" v=$@'
IFS=""; v=$@; echo "v='$v'"
echo 'Testing: IFS="" v="$*"'
IFS=""; v="$*"; echo "v='$v'"
echo 'Testing: IFS="" v="$@"'
IFS=""; v="$@"; echo "v='$v'"
# Note: in IFS="" v=$@ and IFS="" v="$@" cases, bash produces "abc d e"
# We produce "abcd e"
echo Finished