Fix for PR# 1231, make(1) execution of ``.BEGIN'' does

not halt on error.  Thanks to Wolfram for reminding me. ;)

Also remove a unnecessary test for c == '\n', since the
loop (in ParseSkipLine) will not terminate unless
c == '\n' || c == EOF, and the EOF case is already
explicted handled by a return statement.

2 files changed, 4 insertions, 2 deletions

diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index a9e8970..0557789 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -615,6 +615,10 @@ Compat_Run(targs)
 	gn = Targ_FindNode(".BEGIN", TARG_NOCREATE);
 	if (gn != NILGNODE) {
 	    Lst_ForEach(gn->commands, CompatRunCommand, (ClientData)gn);
+            if (gn->made == ERROR) {
+                printf("\n\nStop.\n");
+                exit(1);
+            }
 	}
     }
 
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 3bd2475..b241063 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -2041,8 +2041,6 @@ ParseSkipLine(skip)
         }
 
         lineno++;
-        if (c != '\n')
-            Buf_AddByte(buf, (Byte)'\0');
         Buf_AddByte(buf, (Byte)'\0');
         line = (char *)Buf_GetAll(buf, &lineLength);
     } while (skip == 1 && line[0] != '.');