mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2024-12-28 15:57:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Be sure to start parsing prereqs in the right place even if there are

Browse source 
escape characters (backslashes) in the target name.
See Savannah bug #33399
This commit is contained in:
Paul Smith 2011-11-14 07:31:06 +00:00
parent 9fcd90e36c
commit 4f47fbf953
4 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2011-11-14 Paul Smith <psmith@gnu.org>
* read.c (eval): parse_file_seq() might shorten the string due to
backslash removal. Start parsing again at the colon.
Fixes Savannah bug #33399.
2011-11-13 Paul Smith <psmith@gnu.org> 2011-11-13 Paul Smith <psmith@gnu.org>
* file.c (file_timestamp_cons): Match up data types to avoid warnings. * file.c (file_timestamp_cons): Match up data types to avoid warnings.

7
read.c
View file

@ -1016,16 +1016,17 @@ eval (struct ebuffer *ebuf, int set_default)
/* There's no need to be ivory-tower about this: check for /* There's no need to be ivory-tower about this: check for
one of the most common bugs found in makefiles... */ one of the most common bugs found in makefiles... */
fatal (fstart, _("missing separator%s"), fatal (fstart, _("missing separator%s"),
(cmd_prefix == '\t' && !strneq(line, " ", 8)) (cmd_prefix == '\t' && !strneq (line, " ", 8))
? "" : _(" (did you mean TAB instead of 8 spaces?)")); ? "" : _(" (did you mean TAB instead of 8 spaces?)"));
continue; continue;
} }
/* Make the colon the end-of-string so we know where to stop /* Make the colon the end-of-string so we know where to stop
looking for targets. */ looking for targets. Start there again once we're done. */
*colonp = '\0'; *colonp = '\0';
filenames = PARSE_FILE_SEQ (&p2, struct nameseq, '\0', NULL, 0); filenames = PARSE_FILE_SEQ (&p2, struct nameseq, '\0', NULL, 0);
*p2 = ':'; *colonp = ':';
p2 = colonp;
if (!filenames) if (!filenames)
{ {

5
tests/ChangeLog
View file

@ -1,3 +1,8 @@
2011-11-14 Paul Smith <psmith@gnu.org>
* scripts/features/double_colon: Check double-colon with escaped
filenames. See Savannah bug #33399.
2011-09-18 Paul Smith <psmith@gnu.org> 2011-09-18 Paul Smith <psmith@gnu.org>
* scripts/features/parallelism: On re-exec make sure we preserve * scripts/features/parallelism: On re-exec make sure we preserve

9
tests/scripts/features/double_colon
View file

@ -151,5 +151,14 @@ two');
unlink('result','one','two'); unlink('result','one','two');
# TEST 10: check for proper backslash handling
# Savannah bug #33399
run_make_test('
a\ xb :: ; @echo one
a\ xb :: ; @echo two
',
'', "one\ntwo\n");
# This tells the test driver that the perl test script executed properly. # This tells the test driver that the perl test script executed properly.
1; 1;