summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2001-03-15 10:22:50 +0000
committerwill <will@FreeBSD.org>2001-03-15 10:22:50 +0000
commit0492e1e3a6c55f0cdcaa099c187ededfb3edb67d (patch)
treeb077d17add64d3def506508d7e6915934d017ff9
parent355885cfa7fa6e2c28bbdc759a3debe53e0fcc17 (diff)
downloadFreeBSD-src-0492e1e3a6c55f0cdcaa099c187ededfb3edb67d.zip
FreeBSD-src-0492e1e3a6c55f0cdcaa099c187ededfb3edb67d.tar.gz
Revert previous change -- apparently it's not quite right. It broke
src/sys/modules/if_ef and possibly other things. I tested the build with a make based on rev. 1.26, and it worked fine. Since I'm not particularly inclined to figure out what's going on with this, it's probably prudent just to back it out for now. Found by: jkh Suggested by: jhay
-rw-r--r--usr.bin/make/parse.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 2f1c336..7dc9e61 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -2057,24 +2057,18 @@ ParseSkipLine(skip)
while (((c = ParseReadc()) != '\n' || lastc == '\\')
&& c != EOF) {
- if (c == '#' && lastc != '\\') {
- while ((c = ParseReadc()) != '\n' && c != EOF);
+ if (c == '\n') {
+ Buf_ReplaceLastByte(buf, (Byte)' ');
+ lineno++;
- break;
- } else {
- if (c == '\n') {
- Buf_ReplaceLastByte(buf, (Byte)' ');
- lineno++;
+ while ((c = ParseReadc()) == ' ' || c == '\t');
- while ((c = ParseReadc()) == ' ' || c == '\t');
-
- if (c == EOF)
- break;
- }
-
- Buf_AddByte(buf, (Byte)c);
- lastc = c;
+ if (c == EOF)
+ break;
}
+
+ Buf_AddByte(buf, (Byte)c);
+ lastc = c;
}
if (c == EOF) {
OpenPOWER on IntegriCloud