Fix handling of comments on .elif lines. The patch given in a followup

to the PR failed, because the line skipping function is actually called
from two places in the code to do quite different things (this should
be two functions probably): in a false .if to skip to the next line
beginning with a dot and to collect .for loops. In the seconds case we
should not skip comments, because they are actually harder to handle than
we need for the .if case and should defer this to the main code.

PR:		bin/25627
Submitted by:	Seth Kingsley (original patch)

1 files changed, 7 insertions, 0 deletions

diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index e8a9935..9cbef99 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -2021,6 +2021,13 @@ ParseSkipLine(int skip, int keep_newline)
 
         while (((c = ParseReadc()) != '\n' || lastc == '\\')
                && c != EOF) {
+            if (skip && c == '#' && lastc != '\\') {
+		/* let a comment be terminated even by an escaped \n.
+		 * This is consistent to comment handling in ParseReadLine */
+                while ((c = ParseReadc()) != '\n' && c != EOF)
+		    ;
+		break;
+	    }
             if (c == '\n') {
                 if (keep_newline)
                     Buf_AddByte(buf, (Byte)c);