d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
steve 1996-09-25 02:55:49 +00:00
parent 1c3a7303b4
commit b9bf5744b2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/make/compat.c
View File

@ -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);
}
}
}

2
usr.bin/make/parse.c
View File

@ -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] != '.');