Module Name: src
Committed By: rillig
Date: Fri Jul 31 19:06:33 UTC 2020
Modified Files:
src/usr.bin/make: dir.c
src/usr.bin/make/unit-tests: dir.exp
Log Message:
make(1): fix parsing of nested braces in dependency lines
Before, make could not parse {{thi,fou}r,fif}teen properly. It did
correctly split up the outer brace into "" + "{thi,fou}r,fif" + "teen",
but then, when expanding the inner braces, it interpreted the first
comma already as a separator, even though this comma was enclosed in
another set of braces.
This resulted in the wrong expansion "{thiteen", which produced the
error message. The next word "fouteen" was produced since the parser
stopped at the next closing brace. After this, parsing continued after
the closing brace, producing "rteen". Finally, the last expansion was
the correct "fifteen".
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/make/dir.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/dir.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
