History log of /freebsd-current/contrib/bmake/parse.c
Revision Date Author Comments
(<<< Hide modified files)
(Show modified files >>>)
# 9d3df31e 23-May-2024 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20240520

Merge commit '29efb3dcaedd9cbabc6f96f35545baf2c8b28501'


# 548bfc56 03-May-2024 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20240430

Merge commit '507951f55039f9d1ceae507d510f8cb68225fbc5'


# c59c3bf3 13-Mar-2024 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20240309

Merge commit '368b06ce6b0135d6de13f7265f6dcbaeb791b3bb'


# d5e0a182 13-Jan-2024 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20240108


# 98875883 17-Sep-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230909

Merge commit '1012cf15f75d1e9048779abd07270a37cdba590a'


# 148ee845 27-Jun-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230622

Merge commit '3e39ce563b9ba25883e5aa37d9799eda9e57c1e0'


# c1d01b5f 13-May-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230510

Merge commit '945078deae448e0a13c34b3393d836087719fb16'


# 8c973ee2 24-Apr-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230414

Merge commit '51d8a8b4ac1dd7265e891149e470a803906de2a7'


# 4fde40d9 27-Jan-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge/update to bmake-20230126


# 954401e6 26-Jul-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20220724

Merge commit '308a28d6cd2e87028e535eabccb89a9dc2fd9515'


# 2f2a5ecd 22-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220418

o ignore '.POSIX:' if not in first non-comment line
of Makefile as specified by POSIX.
add unit-tests for above.

Merge commit '92bfae0e6bd53a7a0d6fe55e70a916d86cf26e8b'


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 548bfc56 03-May-2024 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20240430

Merge commit '507951f55039f9d1ceae507d510f8cb68225fbc5'


# c59c3bf3 13-Mar-2024 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20240309

Merge commit '368b06ce6b0135d6de13f7265f6dcbaeb791b3bb'


# d5e0a182 13-Jan-2024 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20240108


# 98875883 17-Sep-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230909

Merge commit '1012cf15f75d1e9048779abd07270a37cdba590a'


# 148ee845 27-Jun-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230622

Merge commit '3e39ce563b9ba25883e5aa37d9799eda9e57c1e0'


# c1d01b5f 13-May-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230510

Merge commit '945078deae448e0a13c34b3393d836087719fb16'


# 8c973ee2 24-Apr-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230414

Merge commit '51d8a8b4ac1dd7265e891149e470a803906de2a7'


# 4fde40d9 27-Jan-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge/update to bmake-20230126


# 954401e6 26-Jul-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20220724

Merge commit '308a28d6cd2e87028e535eabccb89a9dc2fd9515'


# 2f2a5ecd 22-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220418

o ignore '.POSIX:' if not in first non-comment line
of Makefile as specified by POSIX.
add unit-tests for above.

Merge commit '92bfae0e6bd53a7a0d6fe55e70a916d86cf26e8b'


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# c59c3bf3 13-Mar-2024 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20240309

Merge commit '368b06ce6b0135d6de13f7265f6dcbaeb791b3bb'


# d5e0a182 13-Jan-2024 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20240108


# 98875883 17-Sep-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230909

Merge commit '1012cf15f75d1e9048779abd07270a37cdba590a'


# 148ee845 27-Jun-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230622

Merge commit '3e39ce563b9ba25883e5aa37d9799eda9e57c1e0'


# c1d01b5f 13-May-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230510

Merge commit '945078deae448e0a13c34b3393d836087719fb16'


# 8c973ee2 24-Apr-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230414

Merge commit '51d8a8b4ac1dd7265e891149e470a803906de2a7'


# 4fde40d9 27-Jan-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge/update to bmake-20230126


# 954401e6 26-Jul-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20220724

Merge commit '308a28d6cd2e87028e535eabccb89a9dc2fd9515'


# 2f2a5ecd 22-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220418

o ignore '.POSIX:' if not in first non-comment line
of Makefile as specified by POSIX.
add unit-tests for above.

Merge commit '92bfae0e6bd53a7a0d6fe55e70a916d86cf26e8b'


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# d5e0a182 13-Jan-2024 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20240108


# 98875883 17-Sep-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230909

Merge commit '1012cf15f75d1e9048779abd07270a37cdba590a'


# 148ee845 27-Jun-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230622

Merge commit '3e39ce563b9ba25883e5aa37d9799eda9e57c1e0'


# c1d01b5f 13-May-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230510

Merge commit '945078deae448e0a13c34b3393d836087719fb16'


# 8c973ee2 24-Apr-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230414

Merge commit '51d8a8b4ac1dd7265e891149e470a803906de2a7'


# 4fde40d9 27-Jan-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge/update to bmake-20230126


# 954401e6 26-Jul-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20220724

Merge commit '308a28d6cd2e87028e535eabccb89a9dc2fd9515'


# 2f2a5ecd 22-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220418

o ignore '.POSIX:' if not in first non-comment line
of Makefile as specified by POSIX.
add unit-tests for above.

Merge commit '92bfae0e6bd53a7a0d6fe55e70a916d86cf26e8b'


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 98875883 17-Sep-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230909

Merge commit '1012cf15f75d1e9048779abd07270a37cdba590a'


# 148ee845 27-Jun-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230622

Merge commit '3e39ce563b9ba25883e5aa37d9799eda9e57c1e0'


# c1d01b5f 13-May-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230510

Merge commit '945078deae448e0a13c34b3393d836087719fb16'


# 8c973ee2 24-Apr-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230414

Merge commit '51d8a8b4ac1dd7265e891149e470a803906de2a7'


# 4fde40d9 27-Jan-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge/update to bmake-20230126


# 954401e6 26-Jul-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20220724

Merge commit '308a28d6cd2e87028e535eabccb89a9dc2fd9515'


# 2f2a5ecd 22-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220418

o ignore '.POSIX:' if not in first non-comment line
of Makefile as specified by POSIX.
add unit-tests for above.

Merge commit '92bfae0e6bd53a7a0d6fe55e70a916d86cf26e8b'


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 148ee845 27-Jun-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230622

Merge commit '3e39ce563b9ba25883e5aa37d9799eda9e57c1e0'


# c1d01b5f 13-May-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230510

Merge commit '945078deae448e0a13c34b3393d836087719fb16'


# 8c973ee2 24-Apr-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230414

Merge commit '51d8a8b4ac1dd7265e891149e470a803906de2a7'


# 4fde40d9 27-Jan-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge/update to bmake-20230126


# 954401e6 26-Jul-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20220724

Merge commit '308a28d6cd2e87028e535eabccb89a9dc2fd9515'


# 2f2a5ecd 22-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220418

o ignore '.POSIX:' if not in first non-comment line
of Makefile as specified by POSIX.
add unit-tests for above.

Merge commit '92bfae0e6bd53a7a0d6fe55e70a916d86cf26e8b'


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 8c973ee2 24-Apr-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20230414

Merge commit '51d8a8b4ac1dd7265e891149e470a803906de2a7'


# 4fde40d9 27-Jan-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge/update to bmake-20230126


# 954401e6 26-Jul-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20220724

Merge commit '308a28d6cd2e87028e535eabccb89a9dc2fd9515'


# 2f2a5ecd 22-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220418

o ignore '.POSIX:' if not in first non-comment line
of Makefile as specified by POSIX.
add unit-tests for above.

Merge commit '92bfae0e6bd53a7a0d6fe55e70a916d86cf26e8b'


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 4fde40d9 27-Jan-2023 Simon J. Gerraty <sjg@FreeBSD.org>

Merge/update to bmake-20230126


# 954401e6 26-Jul-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20220724

Merge commit '308a28d6cd2e87028e535eabccb89a9dc2fd9515'


# 2f2a5ecd 22-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220418

o ignore '.POSIX:' if not in first non-comment line
of Makefile as specified by POSIX.
add unit-tests for above.

Merge commit '92bfae0e6bd53a7a0d6fe55e70a916d86cf26e8b'


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 954401e6 26-Jul-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20220724

Merge commit '308a28d6cd2e87028e535eabccb89a9dc2fd9515'


# 2f2a5ecd 22-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220418

o ignore '.POSIX:' if not in first non-comment line
of Makefile as specified by POSIX.
add unit-tests for above.

Merge commit '92bfae0e6bd53a7a0d6fe55e70a916d86cf26e8b'


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 2f2a5ecd 22-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220418

o ignore '.POSIX:' if not in first non-comment line
of Makefile as specified by POSIX.
add unit-tests for above.

Merge commit '92bfae0e6bd53a7a0d6fe55e70a916d86cf26e8b'


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 1d3f2ddc 03-Apr-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220330
Merge commit 'a052cb432096794be5070dc68a2b302eaf5a4783'


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# a6f0e10b 09-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220208

* unit-tests/Makefile: disable opt-debug-x-trace on Linux if there
is any chance we have dash as .SHELL

* meta.c: use a variable to hold command line to be filtered
to avoid any side effects from content of command line.

Merge commit '535c59a6a9214436f5d6643775d29808e4b3408d'


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 9f45a3c8 05-Feb-2022 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20220204


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 12904384 18-Dec-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20211212

commit '2935fe8237c83c1dcb113dd5335733263e68e6fd'


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# b0c40a00 25-Jun-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge commit 'ee914ef902ae018bd4f67192832120f9bf05651f' into new_merge


# dba7b0ef 10-Feb-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210206

Changes of interest

o unit-tests: use private TMPDIR to avoid errors from other users
o avoid strdup in mkTempFile
o always use vfork
o job.c: do not create empty shell files in jobs mode
reduce unnecessary calls to waitpid
o cond.c: fix debug output for comparison operators in conditionals


# 06b9b3e0 13-Jan-2021 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c


# e2eeea75 19-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20201117

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.

o More code cleanup and refactoring.

o More unit tests

MFC after: 1 week


# 956e45f6 07-Nov-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20201101

Lots of new unit-tests increase code coverage.

Lots of refactoring, cleanup and simlpification to reduce
code size.

Fixes for Bug 223564 and 245807

Updates to dirdeps.mk and meta2deps.py


# 2c3632d1 05-Sep-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200902

Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.

Other significant changes:

o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).

o variable parsing detects more errors.

o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.


# 3841c287 11-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200710

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.
In META MODE; a target flagged .META is out-of-date if meta file
is missing

MFC after: 1 week


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031

# 2d147b47 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20200704

Key changes include reduced noise at end of failed build log
and avoid evaluation of unnecessary terms in conditionals.

MFC after: 1 week


# 49caa483 20-May-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20200517

Changes since 20181221 are mostly portability related
hence the large gap in versions imported.

There are however some bug fixes, and a rework of filemon handling.
In NetBSD make/filemon/filemon_ktrace.c allows use of fktrace
and elimination of filemon(4) which has not had the TLC it needs.

FreeBSD filemon(4) is in much better shape, so bmake/filemon/filemon_dev.c
allows use of that, with a bit less overhead than the ktrace model.

Summary of changes from ChangeLog

o str.c: empty string does not match % pattern
plus unit-test changes
o var.c: import handling of old sysV style modifier using '%'
o str.c: refactor brk_string
o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD
a blank command is perfectly valid.
o meta.c: meta_oodate, check for corrupted meta file
earlier and more often.
* meta.c: meta_compat_parent check for USE_FILEMON
patch from Soeren Tempel
o meta.c: fix compat mode, need to call meta_job_output()
o job.c: extra fds for meta mode not needed if using filemon_dev
o meta.c: avoid passing NULL to filemon_*() when meta_needed()
returns FALSE.
o filemon/filemon_{dev,ktrace}.c: allow selection of
filemon implementation. filemon_dev.c uses the kernel module
while filemon_ktrace.c leverages the fktrace api available in
NetBSD. filemon_ktrace.c can hopefully form the basis for
adding support for other tracing mechanisms such as strace on
Linux.
o meta.c: when target is out-of-date per normal make rules
record value of .OODATE in meta file.
o parse.c: don't pass NULL to realpath(3)
some versions cannot handle it.
o parse.c: ParseDoDependency: free paths rather than assert

plus more unit-tests


# dfd669ab 22-Dec-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20181221


# 494f7191 18-May-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20180512

Skip polling job token pipe,
better handle sysV style includes with variables.


# 50d2e745 01-Mar-2018 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-201802222

Fixes segfault in Var_Set if val is NULL
Don't treat .info as warning with -W


# cac6fd11 10-May-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170510

No-op change other than version update.


# e1cee40d 20-Apr-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170420


# 1ce939a7 06-Mar-2017 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20170301


# 45447996 19-Dec-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20161212


# e48f47dd 20-May-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160512


# 3bebe729 18-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20160315

Archive member handling works again
meta mode, treat missing reads as for writes.

Update dirdeps.mk - much improved startup time.
Update meta.stage.mk - avoid ln when chmod required.


# be19d90b 10-Mar-2016 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20160307


# ac3446e9 07-Dec-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20151201


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim

# 4c620fe5 23-Oct-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake 20151020


# db29cad8 20-Apr-2015 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20150418

PR: 199486


# 5bcb7424 08-Jul-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20140620
Main change is detection of malformed variable references.

Reviewed by: obrien


# 0dede8b0 27-Jan-2014 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20140101 from vendor


# 1bbe5942 05-Sep-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130904


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.

# 51ee2c1c 02-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Merge bmake-20130730
Main feature of interest is .MAKE.JOB.PREFIX=
to suppress --- job --- tokens.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.

# 1748de26 02-Apr-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Update to bmake-20130330


# 3955d011 02-Oct-2012 Marcel Moolenaar <marcel@FreeBSD.org>

Merge bmake-20120831 from vendor/NetBSD/bmake/dist.

Provenance: ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg


# 9093286b 08-Jul-2020 Simon J. Gerraty <sjg@FreeBSD.org>

Revert r363031


# fe90c77a 25-Nov-2015 Simon J. Gerraty <sjg@FreeBSD.org>

ParseTrackInput: do not access beyond end of buffer.

Reviewed by: dim


# c9e3031a 16-May-2014 Simon J. Gerraty <sjg@FreeBSD.org>

New dependencies


# 84efbe96 10-Aug-2013 Simon J. Gerraty <sjg@FreeBSD.org>

ParseGetLine: don't treat a zero byte as end of buffer if P_end says it isn't.
Consume up to next newline, and issue a parse warning.
If no newline found before P_end, carry on as before.


# 15441b18 18-Jun-2013 Simon J. Gerraty <sjg@FreeBSD.org>

Fix use after free bug.
Parse_SetInput:
curFile->fname was using the buffer passed to it - which ReadMakefile frees.
This change makes the comment in ParseEOF about leaking curFile->fname true.