summaryrefslogtreecommitdiff
path: root/usr.bin/make/parse.c
diff options
context:
space:
mode:
authordsl <dsl@NetBSD.org>2007-01-02 23:22:37 +0000
committerdsl <dsl@NetBSD.org>2007-01-02 23:22:37 +0000
commit8a7693fba61c0b64c8498281d2c826cd8581a4d8 (patch)
tree17b1a25c2b7342656e755ae9e2c1dc4a93ef19ae /usr.bin/make/parse.c
parent7510ceee96b408f9341cce63b951da82374557f5 (diff)
Don't delete whitespace before a "\\\n" sequence. Somewhere I'd misread
the required behaviour and replaced it with something more sensible - except for makefiles that contain "\n\t\\\n shell command"...
Diffstat (limited to 'usr.bin/make/parse.c')
-rw-r--r--usr.bin/make/parse.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index e4cbe0ff4e9..2fc88c10606 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.127 2007/01/01 21:47:32 dsl Exp $ */
+/* $NetBSD: parse.c,v 1.128 2007/01/02 23:22:37 dsl Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.127 2007/01/01 21:47:32 dsl Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.128 2007/01/02 23:22:37 dsl Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.127 2007/01/01 21:47:32 dsl Exp $");
+__RCSID("$NetBSD: parse.c,v 1.128 2007/01/02 23:22:37 dsl Exp $");
#endif
#endif /* not lint */
#endif
@@ -2263,10 +2263,7 @@ ParseGetLine(int flags, int *length)
continue;
}
- /* Escaped '\n' replace all whitespace with a single ' ' */
- while (tp > escaped && isspace((unsigned char)tp[-1]))
- /* Back up - stopping at "\ " */
- tp--;
+ /* Escaped '\n' replace following whitespace with a single ' ' */
while (ptr[0] == ' ' || ptr[0] == '\t')
ptr++;
ch = ' ';