diff --git a/NEWS b/NEWS index 08973d009..68c8d9c8e 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,15 @@ For full details, see the git log at: https://github.com/ksh93/ksh Any uppercase BUG_* names are modernish shell bug IDs. +2020-09-27: + +- The shell's lexical analisys of a 'case' statement within a do...done block + within a command substitution of the form $(...) has been fixed so that code + like the following no longer throws a spurious syntax error: + x=$(for i in 1; do case $i in word) true;; esac; done) + Previously, this required a leading parenthesis before 'word', although the + syntax error claimed that the ';;' was unexpected. + 2020-09-26: - 'whence -f' now completely ignores the existence of functions, as documented. diff --git a/src/cmd/ksh93/include/version.h b/src/cmd/ksh93/include/version.h index da2529e3d..b80398542 100644 --- a/src/cmd/ksh93/include/version.h +++ b/src/cmd/ksh93/include/version.h @@ -17,4 +17,4 @@ * David Korn * * * ***********************************************************************/ -#define SH_RELEASE "93u+m 2020-09-26" +#define SH_RELEASE "93u+m 2020-09-27" diff --git a/src/cmd/ksh93/sh/lex.c b/src/cmd/ksh93/sh/lex.c index 67184e1b7..90596e446 100644 --- a/src/cmd/ksh93/sh/lex.c +++ b/src/cmd/ksh93/sh/lex.c @@ -1541,6 +1541,7 @@ breakloop: /* * read to end of command substitution + * of the form $(...) */ static int comsub(register Lex_t *lp, int endtok) { @@ -1593,7 +1594,14 @@ static int comsub(register Lex_t *lp, int endtok) if(n==4) break; if(sh_lexstates[ST_NAME][c]) + { + if(c==' ' || c=='\t') + { + n = 0; + continue; + } goto skip; + } word[n++] = c; } if(sh_lexstates[ST_NAME][c]==S_BREAK) diff --git a/src/cmd/ksh93/tests/basic.sh b/src/cmd/ksh93/tests/basic.sh index 4074542bb..5d34105c6 100755 --- a/src/cmd/ksh93/tests/basic.sh +++ b/src/cmd/ksh93/tests/basic.sh @@ -716,5 +716,14 @@ else err_exit "warning: skipping argv rewrite test due to noncompliant 'ps' util let Errors-- fi +# ====== +# https://bugzilla.redhat.com/1241013 +got=$(eval 'x=$(for i in test; do case $i in test) true;; esac; done)' 2>&1) \ +|| err_exit "case in a for loop inside a \$(comsub) caused syntax error (got $(printf %q "$got"))" +got=$(eval 'x=${ for i in test; do case $i in test) true;; esac; done; }' 2>&1) \ +|| err_exit "case in a for loop inside a \${ comsub; } caused syntax error (got $(printf %q "$got"))" +got=$(eval 'x=`for i in test; do case $i in test) true;; esac; done`' 2>&1) \ +|| err_exit "case in a for loop inside a \`comsub\` caused syntax error (got $(printf %q "$got"))" + # ====== exit $((Errors<125?Errors:125))