CVS log for src/usr.bin/make/main.c

Up to [cvs.NetBSD.org] / src / usr.bin / make

Request diff between arbitrary revisions

Default branch: MAIN

Revision 1.612 / (download) - annotate - [select for diffs], Sun Mar 10 02:53:37 2024 UTC (5 weeks, 4 days ago) by sjg
Branch: MAIN
CVS Tags: HEAD
Changes since 1.611: +5 -2 lines
Diff to previous 1.611 (colored) to selected 1.30 (colored)

make: record exit status in GNode

SetErrorVars can now set .ERROR_EXIT which allows
a .ERROR target to ignore the case of .ERROR_EXIT == 6
which means failure happened elsewhere.

Reviewed by:

Revision 1.611 / (download) - annotate - [select for diffs], Fri Mar 1 16:41:42 2024 UTC (6 weeks, 6 days ago) by sjg
Branch: MAIN
Changes since 1.610: +3 -3 lines
Diff to previous 1.610 (colored) to selected 1.30 (colored)

make: export target scope values

Pass target scope to Var_ReexportVars so that a target process
will see the correct values in its env.
We must then mark any Global scope variable as unexported
so targets without local value get the Global one.

Revision 1.610 / (download) - annotate - [select for diffs], Wed Feb 7 06:43:02 2024 UTC (2 months, 1 week ago) by rillig
Branch: MAIN
Changes since 1.609: +3 -17 lines
Diff to previous 1.609 (colored) to selected 1.30 (colored)

make: remove unneeded conditional-compilation toggles

The toggles INCLUDES, LIBRARIES, POSIX, SYSVINCLUDE, SYSVVARSUB,
GMAKEEXPORT and SUNSHCMD are no longer needed, they were unconditionally
set.

The toggle NO_REGEX was configurable from the command line, but
disabling it would result in various error messages about the unknown
':C' modifier.

OK sjg@.

Revision 1.609 / (download) - annotate - [select for diffs], Sun Jan 7 01:33:57 2024 UTC (3 months, 1 week ago) by sjg
Branch: MAIN
Changes since 1.608: +3 -2 lines
Diff to previous 1.608 (colored) to selected 1.30 (colored)

make: more consistent error messages

Move %s: progname from Job_CheckCommands to Fatal
to avoid is being repeated when Job_CheckCommands is passed Error.

This means some errors from var also report progname (and level)
which is useful.

Reviewed by: rillig

Revision 1.608 / (download) - annotate - [select for diffs], Fri Jan 5 23:22:06 2024 UTC (3 months, 1 week ago) by rillig
Branch: MAIN
Changes since 1.607: +5 -6 lines
Diff to previous 1.607 (colored) to selected 1.30 (colored)

make: miscellaneous cleanups

Revision 1.607 / (download) - annotate - [select for diffs], Fri Jan 5 22:20:07 2024 UTC (3 months, 1 week ago) by sjg
Branch: MAIN
Changes since 1.606: +32 -6 lines
Diff to previous 1.606 (colored) to selected 1.30 (colored)

Cmd_Exec use tempfile if cmd is too big

To avoid blowing commandline/env limits, if "cmd"
is more than 1000 bytes, write it to a file and pass that
to shell.

Reviewed by: rillig

Revision 1.606 / (download) - annotate - [select for diffs], Wed Dec 27 00:45:37 2023 UTC (3 months, 3 weeks ago) by sjg
Branch: MAIN
Changes since 1.605: +3 -3 lines
Diff to previous 1.605 (colored) to selected 1.30 (colored)

make: ensure shellPath is set before using it.

Revision 1.605 / (download) - annotate - [select for diffs], Sun Dec 17 09:02:26 2023 UTC (4 months ago) by rillig
Branch: MAIN
Changes since 1.604: +7 -12 lines
Diff to previous 1.604 (colored) to selected 1.30 (colored)

make: clean up unused return value of str2Lst_Append

No functional change.

Revision 1.604 / (download) - annotate - [select for diffs], Sun Dec 17 08:53:55 2023 UTC (4 months ago) by rillig
Branch: MAIN
Changes since 1.603: +23 -23 lines
Diff to previous 1.603 (colored) to selected 1.30 (colored)

make: clean up names of local variables

No binary change.

Revision 1.603 / (download) - annotate - [select for diffs], Thu Nov 2 05:55:22 2023 UTC (5 months, 2 weeks ago) by rillig
Branch: MAIN
Changes since 1.602: +8 -8 lines
Diff to previous 1.602 (colored) to selected 1.30 (colored)

make: miscellaneous cleanups

No functional change.

Revision 1.602 / (download) - annotate - [select for diffs], Thu Nov 2 05:40:49 2023 UTC (5 months, 2 weeks ago) by rillig
Branch: MAIN
Changes since 1.601: +9 -26 lines
Diff to previous 1.601 (colored) to selected 1.30 (colored)

make: clean up comments

No functional change.

Revision 1.601 / (download) - annotate - [select for diffs], Thu Nov 2 04:50:44 2023 UTC (5 months, 2 weeks ago) by rillig
Branch: MAIN
Changes since 1.600: +3 -3 lines
Diff to previous 1.600 (colored) to selected 1.30 (colored)

make: inline a single-line cross-file function

No functional change.

Revision 1.600 / (download) - annotate - [select for diffs], Tue Sep 19 17:43:43 2023 UTC (6 months, 4 weeks ago) by rillig
Branch: MAIN
Changes since 1.599: +6 -6 lines
Diff to previous 1.599 (colored) to selected 1.30 (colored)

make: clean up code for parsing the '-j' command line option

No binary change.

Revision 1.599 / (download) - annotate - [select for diffs], Sun Sep 10 21:52:36 2023 UTC (7 months, 1 week ago) by rillig
Branch: MAIN
Changes since 1.598: +3 -3 lines
Diff to previous 1.598 (colored) to selected 1.30 (colored)

make: fix typo

Revision 1.598 / (download) - annotate - [select for diffs], Sun Sep 10 11:41:32 2023 UTC (7 months, 1 week ago) by rillig
Branch: MAIN
Changes since 1.597: +5 -4 lines
Diff to previous 1.597 (colored) to selected 1.30 (colored)

make: add more details to usage message of -j option

Revision 1.597 / (download) - annotate - [select for diffs], Sun Sep 10 10:18:05 2023 UTC (7 months, 1 week ago) by rillig
Branch: MAIN
Changes since 1.596: +10 -7 lines
Diff to previous 1.596 (colored) to selected 1.30 (colored)

make: fix lint warning about strchr

main.c(416): warning:
    call to 'strchr' effectively discards 'const' from argument [346]

Even though C23 turns strchr into a const-generic function, it doesn't
do the same for strtol, so use separate pointers for the current parsing
position and the end of a number, as their constness differs.

Revision 1.596 / (download) - annotate - [select for diffs], Sat Sep 9 16:41:04 2023 UTC (7 months, 1 week ago) by sjg
Branch: MAIN
Changes since 1.595: +8 -2 lines
Diff to previous 1.595 (colored) to selected 1.30 (colored)

Add .MAKE.JOBS.C to indicate wether -jC is supported

Revision 1.595 / (download) - annotate - [select for diffs], Sat Sep 9 04:38:48 2023 UTC (7 months, 1 week ago) by mrg
Branch: MAIN
Changes since 1.594: +3 -3 lines
Diff to previous 1.594 (colored) to selected 1.30 (colored)

add explicit cast for long -> int truncation warning-as-error.

as this is number of CPUs, i don't think we have to care about
it for a long, long, *long* time...

Revision 1.594 / (download) - annotate - [select for diffs], Sat Sep 9 01:30:59 2023 UTC (7 months, 1 week ago) by sjg
Branch: MAIN
Changes since 1.593: +23 -4 lines
Diff to previous 1.593 (colored) to selected 1.30 (colored)

make: allow -j to compute a multiple of ncpu

If _SC_NPROCESSORS_ONLN is supported; and -j arg is a floating point
number or ends in 'C' compute .MAKE.JOBS as a multiple of _SC_NPROCESSORS_ONLN

Based on a suggestion from des at freebsd.org
Discussed with: rillig, christos

Revision 1.593 / (download) - annotate - [select for diffs], Tue Mar 28 14:39:31 2023 UTC (12 months, 3 weeks ago) by rillig
Branch: MAIN
Changes since 1.592: +3 -3 lines
Diff to previous 1.592 (colored) to selected 1.30 (colored)

make: declare all common symbols in headers, unexport others

No functional change.

Revision 1.592 / (download) - annotate - [select for diffs], Sat Feb 25 00:07:08 2023 UTC (13 months, 3 weeks ago) by rillig
Branch: MAIN
Changes since 1.591: +4 -4 lines
Diff to previous 1.591 (colored) to selected 1.30 (colored)

make: rename function for parsing command line options

No binary change.

Revision 1.591 / (download) - annotate - [select for diffs], Wed Feb 15 06:52:58 2023 UTC (14 months ago) by rillig
Branch: MAIN
Changes since 1.590: +8 -8 lines
Diff to previous 1.590 (colored) to selected 1.30 (colored)

make: inline macros for variable names

The variable name '.MAKEOVERRIDES' was already used in the non-macro
form.

No binary change.

Revision 1.590 / (download) - annotate - [select for diffs], Tue Feb 14 21:38:31 2023 UTC (14 months ago) by rillig
Branch: MAIN
Changes since 1.589: +20 -25 lines
Diff to previous 1.589 (colored) to selected 1.30 (colored)

make: clean up calls to Var_Subst

None of the calls to Var_Subst used the return value, and the return
value was always VPR_OK.

No functional change.

Revision 1.589 / (download) - annotate - [select for diffs], Thu Jan 26 20:48:17 2023 UTC (14 months, 3 weeks ago) by sjg
Branch: MAIN
Changes since 1.588: +8 -8 lines
Diff to previous 1.588 (colored) to selected 1.30 (colored)

make: some variables should be read-only

Make variables like .newline and .MAKE.{GID,PID,PPID,UID} read-only.

Reviewed by: rillig

Revision 1.588 / (download) - annotate - [select for diffs], Tue Jan 24 00:24:02 2023 UTC (14 months, 3 weeks ago) by sjg
Branch: MAIN
Changes since 1.587: +7 -2 lines
Diff to previous 1.587 (colored) to selected 1.30 (colored)

make: .SYSPATH: to add dirs to sysIncPath

.SYSPATH: with no sources will clear sysIncPath
otherwise sources are added

Reviewed by: rillig

Revision 1.587 / (download) - annotate - [select for diffs], Thu Jan 19 21:33:06 2023 UTC (14 months, 4 weeks ago) by rillig
Branch: MAIN
Changes since 1.586: +3 -3 lines
Diff to previous 1.586 (colored) to selected 1.30 (colored)

make: inline macro for variable name

This fixes the inconsistency of using the macro name in one place and
its value in another place (since 2010).

No binary change.

Revision 1.586 / (download) - annotate - [select for diffs], Sun Jan 1 16:46:26 2023 UTC (15 months, 2 weeks ago) by rillig
Branch: MAIN
Changes since 1.585: +3 -3 lines
Diff to previous 1.585 (colored) to selected 1.30 (colored)

make: don't assemble identifiers from smaller tokens

No binary change.

Revision 1.585 / (download) - annotate - [select for diffs], Mon Oct 10 21:17:25 2022 UTC (18 months, 1 week ago) by rillig
Branch: MAIN
CVS Tags: netbsd-10-base, netbsd-10-0-RELEASE, netbsd-10-0-RC6, netbsd-10-0-RC5, netbsd-10-0-RC4, netbsd-10-0-RC3, netbsd-10-0-RC2, netbsd-10-0-RC1, netbsd-10
Changes since 1.584: +6 -6 lines
Diff to previous 1.584 (colored) to selected 1.30 (colored)

make: change return type of unlink_file back to int

As unlink_file is a wrapper around unlink, use the same encoding for the
possible return values as in the wrapped function.  This consistency is
more important than expressing all possible return values in the return
type 'bool'.

https://mail-index.netbsd.org/tech-toolchain/2022/10/06/msg004155.html

No functional change.

Revision 1.584 / (download) - annotate - [select for diffs], Mon Oct 10 17:33:35 2022 UTC (18 months, 1 week ago) by rillig
Branch: MAIN
Changes since 1.583: +6 -2 lines
Diff to previous 1.583 (colored) to selected 1.30 (colored)

make: document the guard for directories in unlink_file

Document only the POSIX requirement for now, as I didn't find
information about _which_ ancient UNIX systems would corrupt the
filesystem on unlinking a directory.

http://man.cat-v.org/unix-1st/2/sys-unlink (1971) says:
> It is also illegal to unlink a directory (except for the super-user).

https://mail-index.netbsd.org/tech-toolchain/2022/10/06/msg004147.html

Revision 1.583 / (download) - annotate - [select for diffs], Wed Sep 28 16:34:47 2022 UTC (18 months, 2 weeks ago) by sjg
Branch: MAIN
Changes since 1.582: +6 -4 lines
Diff to previous 1.582 (colored) to selected 1.30 (colored)

Don't ignore return from snprintf or getcwd

Revision 1.582 / (download) - annotate - [select for diffs], Sat May 7 17:49:47 2022 UTC (23 months, 1 week ago) by rillig
Branch: MAIN
Changes since 1.581: +4 -2 lines
Diff to previous 1.581 (colored) to selected 1.30 (colored)

make: allow to randomize build order of targets

In complex dependency structures, when a build fails, a probable cause
is a missing dependency declaration between some files.  In compat mode,
the build order is deterministic, in jobs mode, it is somewhat
deterministic.  To explore more edge cases, add the line ".MAKE.MODE +=
randomize-targets" somewhere in the makefile.

Fixes PR bin/45226 by riastradh.  Reviewed by christos.

Revision 1.581 / (download) - annotate - [select for diffs], Sat May 7 08:01:20 2022 UTC (23 months, 1 week ago) by rillig
Branch: MAIN
Changes since 1.580: +3 -7 lines
Diff to previous 1.580 (colored) to selected 1.30 (colored)

make: rename Compat_Run to Compat_MakeAll

No functional change.

Revision 1.580 / (download) - annotate - [select for diffs], Mon Apr 18 15:06:27 2022 UTC (2 years ago) by rillig
Branch: MAIN
Changes since 1.579: +3 -2 lines
Diff to previous 1.579 (colored) to selected 1.30 (colored)

make: only switch to POSIX mode if '.POSIX:' is the first line

https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html
says that in order to make a makefile POSIX-conforming, its first
non-comment line must be the special dependency line '.POSIX:' without
any source dependencies.

Previously, make switched to POSIX mode even if such a line occurred
anywhere else, which was allowed by POSIX but was deep in the
"unspecified behavior" area.  For NetBSD make, there is no big
difference since it doesn't ship any <posix.mk> file, this change mainly
affects the bmake distribution.

Previously, makefiles that contain '.POSIX:' somewhere in the middle
could fail due to <posix.mk> resetting .SUFFIXES, among other things.

Suggested by Simon J. Gerraty, who also reviewed an earlier version of
this change.

Revision 1.579 / (download) - annotate - [select for diffs], Tue Mar 22 23:37:09 2022 UTC (2 years ago) by rillig
Branch: MAIN
Changes since 1.578: +6 -11 lines
Diff to previous 1.578 (colored) to selected 1.30 (colored)

make: clean up comments and code for setting debug flags

No binary change.

Revision 1.578 / (download) - annotate - [select for diffs], Wed Feb 9 20:52:06 2022 UTC (2 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.577: +3 -3 lines
Diff to previous 1.577 (colored) to selected 1.30 (colored)

make: prefix the warning about read-only .OBJDIR with a colon

For consistency with the other warnings.

Revision 1.577 / (download) - annotate - [select for diffs], Sat Jan 29 09:38:26 2022 UTC (2 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.576: +3 -2 lines
Diff to previous 1.576 (colored) to selected 1.30 (colored)

make: print stack trace on fatal errors

The only fatal error that occurs while the makefiles are read in is the
one about recursive variables, which didn't give any hint about the
location before.

If a recursive variable is detected while evaluating the commands of a
target to be made, there is no location information, as before.

Revision 1.576 / (download) - annotate - [select for diffs], Thu Jan 27 06:02:59 2022 UTC (2 years, 2 months ago) by sjg
Branch: MAIN
Changes since 1.575: +3 -3 lines
Diff to previous 1.575 (colored) to selected 1.30 (colored)

Allow local variable assignments in dependency lines

The variable is set in the context of the target.
This syntax has been supported by gmake for ~ever.
If necessary a makefile can set .MAKE.TARGET_LOCAL_VARIABLES=false
to disable this.

Expose GetBooleanExpr so parse.c can use it.

Revision 1.575 / (download) - annotate - [select for diffs], Sat Jan 22 18:59:23 2022 UTC (2 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.574: +5 -7 lines
Diff to previous 1.574 (colored) to selected 1.30 (colored)

make: add missing newline after "cannot continue" message

It was wrong of Parse_File to output an unfinished line and hope for
some other code to finish it.  As demonstrated in the test, PrintOnError
did not do that in the case of additional debug output.

To keep the overall behavior as close as possible to before, the other
callers of PrintOnError now have to pass the newline themselves. Passing
strings that start with newlines but don't end with them looked
suspicious anyway.

Revision 1.574 / (download) - annotate - [select for diffs], Sat Jan 22 16:24:45 2022 UTC (2 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.573: +5 -5 lines
Diff to previous 1.573 (colored) to selected 1.30 (colored)

make: clean up comments

Revision 1.573 / (download) - annotate - [select for diffs], Sat Jan 15 22:18:04 2022 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.572: +3 -3 lines
Diff to previous 1.572 (colored) to selected 1.30 (colored)

make: remove extra semicolon after statement

Lint will complain about this very soon.

No binary change.

Revision 1.572 / (download) - annotate - [select for diffs], Sat Jan 15 19:34:07 2022 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.571: +4 -7 lines
Diff to previous 1.571 (colored) to selected 1.30 (colored)

make: replace Var_Value with Var_Exists where applicable

The latter function already existed in 1993, no idea why it was not
used.

No functional change.

Revision 1.571 / (download) - annotate - [select for diffs], Sat Jan 15 19:05:23 2022 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.570: +3 -3 lines
Diff to previous 1.570 (colored) to selected 1.30 (colored)

make: remove unnecessary functions for expanding variable names

In meta mode, the affected variable patterns do not contain a '$'.

Outside of meta mode, Global_SetExpand was only called a single time, so
inline that call.

No functional change.

Revision 1.570 / (download) - annotate - [select for diffs], Sat Jan 15 18:34:41 2022 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.569: +3 -10 lines
Diff to previous 1.569 (colored) to selected 1.30 (colored)

make: merge duplicate code for expanding variable expressions

No functional change.

Revision 1.569 / (download) - annotate - [select for diffs], Mon Jan 10 20:32:28 2022 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.568: +3 -2 lines
Diff to previous 1.568 (colored) to selected 1.30 (colored)

make: add debug logging for capturing the output of external commands

This applies to all 4 situations in which the output of an external
command is used for modifying a variable or an expression:

* the assignment operator '!='
* the assignment modifier '::!='
* the SUN shell modifier ':sh'
* the other shell modifier ':!cmd!'

Previously, only the shell modifier ':!cmd!' had debug logging.

Suggested by Christoph Badura.

Revision 1.568 / (download) - annotate - [select for diffs], Sun Jan 9 18:49:28 2022 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.567: +19 -23 lines
Diff to previous 1.567 (colored) to selected 1.30 (colored)

make: in Cmd_Exec, return error message instead of format string

This change leaves only literal format strings in parse.c.  It allows
for more detailed error messages than the current "non-zero status" or
"exited on a signal".

No functional change.

Revision 1.567 / (download) - annotate - [select for diffs], Fri Jan 7 21:00:49 2022 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.566: +5 -4 lines
Diff to previous 1.566 (colored) to selected 1.30 (colored)

make: have as few statements as possible between va_start and va_end

No functional change.

Revision 1.566 / (download) - annotate - [select for diffs], Fri Jan 7 20:37:25 2022 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.565: +20 -20 lines
Diff to previous 1.565 (colored) to selected 1.30 (colored)

make: clean up comments, variable names, function names

The comment in ApplyDependencySourceOther repeated the code, its second
half didn't match any current code.

The comment above ParseDependencySourcesEmpty repeated the code.

No binary change, except for assertion line numbers.

Revision 1.565 / (download) - annotate - [select for diffs], Sat Jan 1 21:41:50 2022 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.564: +3 -3 lines
Diff to previous 1.564 (colored) to selected 1.30 (colored)

make: fix error message when reading more than 1 GB from stdin

Previously, the error message was:
	make: (null): file too large
Now it is:
	make: (stdin): file too large

Revision 1.564 / (download) - annotate - [select for diffs], Sat Jan 1 19:53:40 2022 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.563: +17 -19 lines
Diff to previous 1.563 (colored) to selected 1.30 (colored)

make: reduce indentation in Main_SetObjdir

No functional change.

Revision 1.563 / (download) - annotate - [select for diffs], Fri Dec 31 00:18:06 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.562: +3 -6 lines
Diff to previous 1.562 (colored) to selected 1.30 (colored)

make: unexport types VarAssignOp and VarAssign

These types are only needed in the parsing module.

No functional change.

Revision 1.562 / (download) - annotate - [select for diffs], Tue Dec 28 21:56:13 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.561: +6 -10 lines
Diff to previous 1.561 (colored) to selected 1.30 (colored)

make: fix double-free in CLEANUP mode (since 2021.12.27.23.11.55)

When make is run without the '-f' option, it searches for the files
'makefile' and 'Makefile' in the current directory.  The function
ReadFirstDefaultMakefile allocated memory for these filenames, added the
filenames to opts.makefiles and then freed the memory.  From that
moment, opts.makefiles contained dangling pointers.

The function main_CleanUp cleans the list, but only if make is compiled
with -DCLEANUP.  Since main.c 1.557 from 2021.12.27.23.11.55, the
strings in opts.makefiles are freed as well, before that, only the list
nodes were freed.  Freeing the strings led to the double-free.

Fix this bug by using a separate list for these short-lived strings.  At
the point where ReadFirstDefaultMakefile is called, opts.makefiles is
not used anymore, therefore there are no side effects.

To reproduce, run 'make test-coverage', which compiles with -DCLEANUP.
The test opt-chdir failed with a segmentation fault in main_Cleanup.
This test may be the only one that doesn't use the option '-f'.

Revision 1.561 / (download) - annotate - [select for diffs], Tue Dec 28 01:20:24 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.560: +14 -20 lines
Diff to previous 1.560 (colored) to selected 1.30 (colored)

make: clean up stylistically

No binary change.

Revision 1.560 / (download) - annotate - [select for diffs], Tue Dec 28 01:11:36 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.559: +3 -3 lines
Diff to previous 1.559 (colored) to selected 1.30 (colored)

make: constify cached_realpath

No binary change.

Revision 1.559 / (download) - annotate - [select for diffs], Mon Dec 27 23:44:06 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.558: +12 -16 lines
Diff to previous 1.558 (colored) to selected 1.30 (colored)

make: clean up Cmd_Exec

Renaming savederr to saved_errno makes the comment redundant.

Group the conditions for setting errfmt, retaining their relative order.

No functional change.

Revision 1.558 / (download) - annotate - [select for diffs], Mon Dec 27 23:19:41 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.557: +40 -44 lines
Diff to previous 1.557 (colored) to selected 1.30 (colored)

make: reduce indentation of Cmd_Exec

No functional change.

Revision 1.557 / (download) - annotate - [select for diffs], Mon Dec 27 23:11:55 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.556: +4 -11 lines
Diff to previous 1.556 (colored) to selected 1.30 (colored)

make: free the names of the makefiles in cleanup mode

Since parse.c 1.576 from 2021-12-13 the filenames from opts.makefiles no
longer end up in the GNodes, they are copied by Str_Intern.

Revision 1.556 / (download) - annotate - [select for diffs], Mon Dec 27 23:06:19 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.555: +5 -7 lines
Diff to previous 1.555 (colored) to selected 1.30 (colored)

make: merge local variables holding the path to the object directory

This is a similar pattern as in the other situations where a string is
fed through Var_Subst.  In this case though, the unexpanded string may
need to be freed, therefore the FStr_Done that is not needed in the
other places.

No functional change.

Revision 1.555 / (download) - annotate - [select for diffs], Mon Dec 27 22:57:26 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.554: +4 -4 lines
Diff to previous 1.554 (colored) to selected 1.30 (colored)

make: prevent out-of-bounds read for debug log file name

Even though the name of the debug log file currently only occurs in
strings of the form '-dFname' or '-dF+name', the code for replacing '%d'
with the PID accesses the passed string out of bounds.  That's not a
problem in practice but looks suspicious anyway.

Revision 1.554 / (download) - annotate - [select for diffs], Mon Dec 27 22:22:48 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.553: +4 -4 lines
Diff to previous 1.553 (colored) to selected 1.30 (colored)

make: remove usage message if the debug file cannot be opened

Since a non-writable file is not a syntax error, there is no point in
showing the usage in this situation.  Showing the usage may have been a
copy-and-paste mistake from a few lines below, when this option was
added back in main.c 1.133 from 2006-10-15.

Revision 1.553 / (download) - annotate - [select for diffs], Mon Dec 27 21:27:25 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.552: +11 -11 lines
Diff to previous 1.552 (colored) to selected 1.30 (colored)

make: narrow down the return type of ReadMakefile

No functional change.

Revision 1.552 / (download) - annotate - [select for diffs], Mon Dec 27 21:21:17 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.551: +13 -13 lines
Diff to previous 1.551 (colored) to selected 1.30 (colored)

make: rename local variables to be simpler

No binary change.

Revision 1.551 / (download) - annotate - [select for diffs], Mon Dec 27 20:59:59 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.550: +15 -20 lines
Diff to previous 1.550 (colored) to selected 1.30 (colored)

make: clean up 'explode'

Breaking out of the first 'for' loop was unnecessarily complicated.  The
call to strlen was not necessary since f already pointed at the end of
the string.

No functional change.

Revision 1.550 / (download) - annotate - [select for diffs], Mon Dec 27 18:54:19 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.549: +27 -79 lines
Diff to previous 1.549 (colored) to selected 1.30 (colored)

make: clean up comments

Revision 1.549 / (download) - annotate - [select for diffs], Mon Dec 27 18:26:22 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.548: +9 -9 lines
Diff to previous 1.548 (colored) to selected 1.30 (colored)

make: remove unnecessary words from command line options

Several years ago, the command line options were individual global
variables.  The global variable could therefore not be named 'silent'
since that would have conflicted with local variables of the same name.
After moving the global variable to the namespace 'struct CmdOpts',
there is no conflict anymore.

There doesn't seem to be any risk of naming collisions for the names
'touch' and 'query'.

No functional change.

Revision 1.548 / (download) - annotate - [select for diffs], Mon Dec 27 17:18:57 2021 UTC (2 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.547: +7 -11 lines
Diff to previous 1.547 (colored) to selected 1.30 (colored)

make: rename eunlink to unlink_file

The name eunlink suggested a relation with the similarly named functions
emalloc or esnprintf, but that was misleading.  Instead, unlink_file
works like unlink, except that it refuses to remove an empty directory.

No functional change.

Revision 1.547 / (download) - annotate - [select for diffs], Wed Dec 15 12:58:01 2021 UTC (2 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.546: +31 -16 lines
Diff to previous 1.546 (colored) to selected 1.30 (colored)

make: format comments according to /usr/share/misc/style

Assisted by indent(1), with manual corrections due to its many remaining
bugs.

No functional change.

Revision 1.546 / (download) - annotate - [select for diffs], Wed Dec 15 12:24:13 2021 UTC (2 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.545: +8 -7 lines
Diff to previous 1.545 (colored) to selected 1.30 (colored)

make: use consistent indentation for statements and continuations

No binary change, except for line numbers in assertions in suff.c.

Revision 1.545 / (download) - annotate - [select for diffs], Wed Dec 15 11:01:39 2021 UTC (2 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.544: +4 -4 lines
Diff to previous 1.544 (colored) to selected 1.30 (colored)

make: remove bmake_free

It was only used in 2 places, and in both these places, the pointer was
never null.

Revision 1.544 / (download) - annotate - [select for diffs], Wed Dec 15 10:57:01 2021 UTC (2 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.543: +3 -2 lines
Diff to previous 1.543 (colored) to selected 1.30 (colored)

make: in CLEANUP mode, free interned strings at the very end

Noticed by sjg.

Revision 1.543 / (download) - annotate - [select for diffs], Mon Dec 13 22:26:21 2021 UTC (2 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.542: +25 -25 lines
Diff to previous 1.542 (colored) to selected 1.30 (colored)

make: convert debugging flags from enum to bit-field

This gets rid of the magic numbers, making it possible to add another
debug flag without renumbering the others.

No functional change.

Revision 1.542 / (download) - annotate - [select for diffs], Mon Dec 13 05:25:04 2021 UTC (2 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.541: +3 -2 lines
Diff to previous 1.541 (colored) to selected 1.30 (colored)

make: fix memory leak for filenames in .for loops (since 2013-06-18)

Previously, each time a .for directive pushed its buffer on the input
file stack, the current filename was duplicated.  This was a waste of
memory.

The name of a file is typically only used while it is read in.  There is
one situation when the filename is needed for longer, which is when a
target is defined.

Since .for loops are implemented as a special form of included files,
each .for loop duplicated the current filename as well.

$ cat << EOF > for.mk
.for i in 1 2 3 4 5 6 7 8 9 0
.for i in 1 2 3 4 5 6 7 8 9 0
.for i in 1 2 3 4 5 6 7 8 9 0
.for i in 1 2 3 4 5 6 7 8 9 0
.for i in 1 2 3 4 5 6 7 8 9 0
.for i in 1 2 3 4 5 6 7 8 9 0
.for i in 1 2 3 4 5 6 7 8 9 0
.endfor
.endfor
.endfor
.endfor
.endfor
.endfor
.endfor

all:
	@ps -o rsz -p ${.MAKE.PID}
EOF

$ make-2021.12.13.03.55.16 -r -f for.mk
  RSZ
10720

$ ./make -r -f for.mk
 RSZ
1716

The difference is 8 MB, which amounts to 1 million .for loops.

Revision 1.541 / (download) - annotate - [select for diffs], Sat Aug 14 13:32:12 2021 UTC (2 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.540: +3 -3 lines
Diff to previous 1.540 (colored) to selected 1.30 (colored)

make: rename variable and function for handling parse errors

The word 'fatals' was an unnecessary abbreviation.

No functional change.

Revision 1.540 / (download) - annotate - [select for diffs], Fri Jun 18 12:54:17 2021 UTC (2 years, 10 months ago) by rillig
Branch: MAIN
Changes since 1.539: +9 -9 lines
Diff to previous 1.539 (colored) to selected 1.30 (colored)

make: clean up access to character iterator

Having both p[0] and *p intermixed was inconsistent.

No functional change.

Revision 1.265.2.2 / (download) - annotate - [select for diffs], Fri May 7 17:40:31 2021 UTC (2 years, 11 months ago) by martin
Branch: netbsd-8
Changes since 1.265.2.1: +5 -3 lines
Diff to previous 1.265.2.1 (colored) to branchpoint 1.265 (colored) next main 1.266 (colored) to selected 1.30 (colored)

Pull up following revision(s) (requested by mrg in ticket #1678):

	bin/pax/options.c: revision 1.119
	usr.bin/config/scan.l: revision 1.32
	usr.bin/make/main.c: revision 1.274
	bin/pax/extern.h: revision 1.60
	usr.bin/config/defs.h: revision 1.106
	usr.bin/make/make.h: revision 1.105
	sbin/newfs_udf/udf_create.c: revision 1.27 (patch)
	sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch)
	usr.bin/config/main.c: revision 1.100
	usr.sbin/installboot/Makefile:	revisions 1.53,1.54 (patch)
	usr.sbin/installboot/installboot.h: revision 1.41 (patch)
	usr.sbin/installboot/machines.c: revisisons 1.41,1.42 (patch)

Avoid depending on common symbols.

Revision 1.273.6.1 / (download) - annotate - [select for diffs], Fri Apr 30 14:07:02 2021 UTC (2 years, 11 months ago) by martin
Branch: netbsd-9
CVS Tags: netbsd-9-3-RELEASE, netbsd-9-2-RELEASE
Changes since 1.273: +5 -3 lines
Diff to previous 1.273 (colored) next main 1.274 (colored) to selected 1.30 (colored)

Pull up following revision(s) (requested by mrg in ticket #1263):

	bin/pax/options.c: revision 1.119
	usr.bin/config/scan.l: revision 1.32
	usr.bin/make/main.c: revision 1.274
	bin/pax/extern.h: revision 1.60
	usr.bin/config/defs.h: revision 1.106
	usr.bin/make/make.h: revision 1.105
	sbin/newfs_udf/udf_create.c: revision 1.27 (patch)
	sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch)
	usr.bin/config/main.c: revision 1.100

Avoid depending on common symbols.

Revision 1.539 / (download) - annotate - [select for diffs], Mon Apr 19 16:35:11 2021 UTC (3 years ago) by rillig
Branch: MAIN
CVS Tags: cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1, cjep_staticlib_x-base, cjep_staticlib_x
Changes since 1.538: +3 -3 lines
Diff to previous 1.538 (colored) to selected 1.30 (colored)

make: avoid double slash in name of temporary directory

If the environment variable TMPDIR is not set, make uses a default path
that includes a trailing '/'.

For extra correctness it always appended an extra '/', leading to paths
of the form '/tmp//makeXXXXXX'.  This looked suspicious, as if there had
been a forgotten empty part between the two '/'.  Avoid this ambiguity
by replacing '//' with '/'.

Revision 1.538 / (download) - annotate - [select for diffs], Wed Apr 14 17:24:48 2021 UTC (3 years ago) by rillig
Branch: MAIN
Changes since 1.537: +8 -8 lines
Diff to previous 1.537 (colored) to selected 1.30 (colored)

make: turn run-time string concatenation into compile-time

No functional change.

Revision 1.537 / (download) - annotate - [select for diffs], Wed Apr 14 17:20:48 2021 UTC (3 years ago) by rillig
Branch: MAIN
Changes since 1.536: +3 -3 lines
Diff to previous 1.536 (colored) to selected 1.30 (colored)

make: remove unnecessary modifier ':U' for certain fixed expressions

No functional change, since the expression is evaluated using
VARE_WANTRES, not using VARE_UNDEFERR.

Revision 1.536 / (download) - annotate - [select for diffs], Sun Apr 4 10:13:09 2021 UTC (3 years ago) by rillig
Branch: MAIN
Changes since 1.535: +3 -3 lines
Diff to previous 1.535 (colored) to selected 1.30 (colored)

make: remove filler word 'Do' from function names for parsing

No functional change, except for debug logging.

Revision 1.535 / (download) - annotate - [select for diffs], Sun Apr 4 10:05:08 2021 UTC (3 years ago) by rillig
Branch: MAIN
Changes since 1.534: +3 -3 lines
Diff to previous 1.534 (colored) to selected 1.30 (colored)

make: rename a few functions to be more descriptive

No functional change.

Revision 1.534 / (download) - annotate - [select for diffs], Sat Apr 3 11:08:40 2021 UTC (3 years ago) by rillig
Branch: MAIN
Changes since 1.533: +112 -112 lines
Diff to previous 1.533 (colored) to selected 1.30 (colored)

make: use C99 bool type instead of defining its own

No functional change.

Revision 1.533 / (download) - annotate - [select for diffs], Fri Feb 5 19:19:17 2021 UTC (3 years, 2 months ago) by sjg
Branch: MAIN
Changes since 1.532: +11 -9 lines
Diff to previous 1.532 (colored) to selected 1.30 (colored)

Avoid strdup in mkTempFile

Require caller to pass a buffer and size if they
want the tempfile not unlinked.

Add Job_TempFile to handle blocking signals around
call to mkTempFile, so that meta_open_filemon can use it
in jobs mode.

Revision 1.532 / (download) - annotate - [select for diffs], Fri Feb 5 05:15:12 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.531: +13 -13 lines
Diff to previous 1.531 (colored) to selected 1.30 (colored)

make: in the Var_ functions, move the scope to the front

This change provides for a more natural reading order in the code.
Placing the scope first makes it immediately clear in which context the
remaining parameters are interpreted.

No functional change.

Revision 1.531 / (download) - annotate - [select for diffs], Fri Feb 5 04:41:17 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.530: +3 -3 lines
Diff to previous 1.530 (colored) to selected 1.30 (colored)

make: add shortcut Global_Delete for deleting a global variable

Revision 1.530 / (download) - annotate - [select for diffs], Thu Feb 4 21:33:13 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.529: +27 -27 lines
Diff to previous 1.529 (colored) to selected 1.30 (colored)

make: rename some VAR constants to SCOPE

The word "context" does not fit perfectly to the variables that are
associate with a GNode, as the context is usually something from the
outside and the variables are more like properties inherent to the
GNode.

The term "global context" fits even less.  Since the thing where
variables are looked up is commonly named a scope, use that term
instead.

This commit only renames the global variables VAR_GLOBAL, VAR_INTERNAL
and VAR_CMDLINE, plus a few very closely related comments.  These are:

	GNode.vars (because of line breaks)
	GNode_Free (dito)
	varname-make_print_var_on_error.mk
	varname-make_print_var_on_error-jobs.mk

The debug message in Var_Stats is left as-is since there is no unit test
for it yet.

The other renamings (variable names "context", "ctxt", as well as
further comments) will be done in a follow-up commit.

Revision 1.529 / (download) - annotate - [select for diffs], Wed Feb 3 13:53:12 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.528: +36 -36 lines
Diff to previous 1.528 (colored) to selected 1.30 (colored)

make: replace Global_AppendExpand with Global_Append

All callers with a variable name that is guaranteed to not contain a
dollar sign have been converted to call Global_Append instead of the
previous Global_AppendExpand.  After that, Global_AppendExpand was
unused, therefore it was effectively just renamed.

Revision 1.528 / (download) - annotate - [select for diffs], Wed Feb 3 08:08:18 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.527: +26 -26 lines
Diff to previous 1.527 (colored) to selected 1.30 (colored)

make: replace Global_SetExpand with Global_Set for constant names

Revision 1.527 / (download) - annotate - [select for diffs], Wed Feb 3 08:00:36 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.526: +61 -61 lines
Diff to previous 1.526 (colored) to selected 1.30 (colored)

make: use shortcut functions Global_SetExpand and Global_AppendExpand

There are many places where global variables are set or appended to.  To
reduce clutter and code size, encode the VAR_GLOBAL in the function
name.

The word Expand in the function names says that the variable name is
expanded.  In most of the cases, this is not necessary, but there are no
corresponding functions Global_Set or Global_Append yet.

Encoding the information whether the name is expanded or not in the
function name will make inconsistencies obvious in future manual code
reviews. Letting the compiler check this by using different types for
unexpanded and expanded variable names is probably not worth the effort.
There are still a few bugs to be fixed, such as in SetVar, which expands
the variable name twice in a row.

Revision 1.526 / (download) - annotate - [select for diffs], Mon Feb 1 21:04:10 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.525: +3 -3 lines
Diff to previous 1.525 (colored) to selected 1.30 (colored)

make: always use vfork, never fork

Before compat.c 1.217, job.c 1.390 and main.c 1.504 from 2020-12-27, the
exported make variables were exported from each freshly forked child
process.  There was no practical difference though between exporting the
variables from the parent process or the child process since these two
processes share the same address space, except that the forked process
is very limited in what it may actually do.  This limitation was
violated on a regular basis.

When an exported variable referred to a variable that used the :sh
variable modifier, this led to a fork from within vfork, which is not
allowed.  Since 2020-12-27, exporting the variables is done from the
main process, which prevents this situation from ever occurring.

Since that day, there is no need anymore to distinguish between vfork
and fork, which removes any need for the macro.

Revision 1.525 / (download) - annotate - [select for diffs], Mon Feb 1 20:01:26 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.524: +17 -14 lines
Diff to previous 1.524 (colored) to selected 1.30 (colored)

make: clean up main.c

Revision 1.524 / (download) - annotate - [select for diffs], Mon Feb 1 19:53:31 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.523: +10 -15 lines
Diff to previous 1.523 (colored) to selected 1.30 (colored)

make: simplify MakeMode

Revision 1.523 / (download) - annotate - [select for diffs], Mon Feb 1 19:46:58 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.522: +5 -5 lines
Diff to previous 1.522 (colored) to selected 1.30 (colored)

make: replace pre-increment with post-increment or simple addition

The rest of the code already prefers post-increment if there is no
actual difference.

Revision 1.522 / (download) - annotate - [select for diffs], Mon Feb 1 19:43:07 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.521: +14 -14 lines
Diff to previous 1.521 (colored) to selected 1.30 (colored)

make: rename functions for parsing command line arguments

The function names now match the names around them.

Revision 1.521 / (download) - annotate - [select for diffs], Mon Feb 1 19:39:31 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.520: +12 -13 lines
Diff to previous 1.520 (colored) to selected 1.30 (colored)

make: clean up comments

Revision 1.520 / (download) - annotate - [select for diffs], Sat Jan 30 21:25:10 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.519: +4 -4 lines
Diff to previous 1.519 (colored) to selected 1.30 (colored)

make(1): inline Buf_Len

Revision 1.519 / (download) - annotate - [select for diffs], Sat Jan 30 21:03:32 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.518: +3 -3 lines
Diff to previous 1.518 (colored) to selected 1.30 (colored)

make(1): inline Buf_GetAll

Revision 1.518 / (download) - annotate - [select for diffs], Sat Jan 30 20:53:29 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.517: +4 -4 lines
Diff to previous 1.517 (colored) to selected 1.30 (colored)

make(1): split Buf_Destroy into Buf_Done and Buf_DoneData

In all cases except one, the boolean argument to Buf_Destroy was
constant.  Removing that argument by splitting the function into two
separate functions makes the intention clearer on the call site.  It
also removes the possibility for using the return value of Buf_Done,
which would have made no sense.

The function Buf_Done now pairs with Buf_Init, just as in HashTable and
Lst.

Even though Buf_Done is essentially a no-op, it is kept as a function,
both for symmetry with Buf_Init and for clearing the Buffer members
after use (this will be done only in CLEANUP mode, in a follow-up
commit).

Revision 1.517 / (download) - annotate - [select for diffs], Sun Jan 24 20:11:55 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.516: +4 -4 lines
Diff to previous 1.516 (colored) to selected 1.30 (colored)

make(1): convert SearchPath to struct

This prepares for making dotLast a simple struct member instead of a
fake CachedDir, which is easier to understand.

Revision 1.516 / (download) - annotate - [select for diffs], Sat Jan 23 11:34:41 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.515: +7 -7 lines
Diff to previous 1.515 (colored) to selected 1.30 (colored)

make(1): rename Dir_AddDir, reorder parameters of SearchPath_ToFlags

Revision 1.515 / (download) - annotate - [select for diffs], Sat Jan 23 10:48:49 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.514: +4 -3 lines
Diff to previous 1.514 (colored) to selected 1.30 (colored)

make(1): rename Dir_Expand to SearchPath_Expand

The main subject of this function is the search path.  In this search
path the pattern is expanded.

Revision 1.514 / (download) - annotate - [select for diffs], Tue Jan 19 20:51:46 2021 UTC (3 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.513: +3 -3 lines
Diff to previous 1.513 (colored) to selected 1.30 (colored)

make(1): remove do-not-format markers from comments

These markers had been used inconsistently.  Furthermore the source code
had not been formatted automatically before 2020 at all, otherwise there
wouldn't have been any trailing whitespace left.

Revision 1.513 / (download) - annotate - [select for diffs], Sat Jan 16 20:49:31 2021 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.512: +3 -3 lines
Diff to previous 1.512 (colored) to selected 1.30 (colored)

make(1): fix a few inconsistencies for lint's strict bool mode

Revision 1.512 / (download) - annotate - [select for diffs], Sun Jan 10 23:59:53 2021 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.511: +6 -6 lines
Diff to previous 1.511 (colored) to selected 1.30 (colored)

make(1): make a few more bool expressions more precise

The previous version of lint(1) from a few hours ago didn't catch all
occurrences.  And even the current one doesn't catch everything.
Function arguments and return types still need some work.  The "return
quietly" from shouldDieQuietly still implicitly converts from int to
_Bool.

No functional change.

Revision 1.511 / (download) - annotate - [select for diffs], Sun Jan 10 21:20:46 2021 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.510: +3 -3 lines
Diff to previous 1.510 (colored) to selected 1.30 (colored)

make(1): consistently use boolean expressions in conditions

Most of the make code already followed the style of explicitly writing
(ptr != NULL) instead of the shorter (ptr) in conditions.

The remaining 50 instances have been found by an experimental,
unpublished check in lint(1) that treats bool expressions as
incompatible to any other scalar type, just as in Java, C#, Pascal and
several other languages.

The only unsafe operation on Boolean that is left over is (flags &
FLAG), for an enum implementing a bit set.  If Boolean is an ordinary
integer type (the default), some high bits may get lost.  But if Boolean
is the same as _Bool (by compiling with -DUSE_C99_BOOLEAN), C99 6.3.1.2
defines that a conversion from any scalar to the type _Bool acts as a
comparison to 0, which cannot lose any bits.

Revision 1.510 / (download) - annotate - [select for diffs], Sat Jan 9 16:06:09 2021 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.509: +7 -7 lines
Diff to previous 1.509 (colored) to selected 1.30 (colored)

make(1): fix lint warnings

Revision 1.509 / (download) - annotate - [select for diffs], Fri Jan 8 21:46:50 2021 UTC (3 years, 3 months ago) by sjg
Branch: MAIN
Changes since 1.508: +7 -7 lines
Diff to previous 1.508 (colored) to selected 1.30 (colored)

Ensure PrintOnError always reports 'stopped in' on first call.

We may still suppress the rest of the noise if shouldDieQuietly
says to, but the 'stopped in' output is too important to lose.
Avoid repeating it though in the same process.

For the case of aborting due to failure detected elsewhere,
exit 6 so we have a clue.

PR: 55578
Reviewed by:

Revision 1.508 / (download) - annotate - [select for diffs], Thu Dec 31 17:39:36 2020 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.507: +5 -5 lines
Diff to previous 1.507 (colored) to selected 1.30 (colored)

make(1): replace pointers in controlling conditions with booleans

Revision 1.507 / (download) - annotate - [select for diffs], Wed Dec 30 10:03:16 2020 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.506: +58 -30 lines
Diff to previous 1.506 (colored) to selected 1.30 (colored)

make(1): format multi-line comments

Revision 1.506 / (download) - annotate - [select for diffs], Mon Dec 28 00:46:24 2020 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.505: +2 -3 lines
Diff to previous 1.505 (colored) to selected 1.30 (colored)

make(1): replace global preserveUndefined with VARE_KEEP_UNDEF

Controlling the expansion of variable expressions using a global
variable and a VARE flag was inconsistent.

Converting the global variable into a flag had to prerequisites:

1.  The unintended duplicate variable assignment had to be fixed, as
done in parse.c 1.520 from 2020-12-27.  Without this fix, it would have
been necessary to add more flags to Var_Exists and Var_SetWithFlags, and
this would have become too complex.

2.  There had to be a unit test demonstrating that VARE_KEEP_DOLLAR only
applies to the top-level expression and is not passed to the
subexpressions, while VARE_KEEP_UNDEF applies to all subexpressions as
well.  This test is in var-op-expand.mk 1.10 from 2020-12-28, at least
for the ':@word@' modifier.  In ParseModifierPartSubst, VARE_KEEP_UNDEF
is not passed down either, in the same way.

Revision 1.505 / (download) - annotate - [select for diffs], Sun Dec 27 11:47:04 2020 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.504: +6 -6 lines
Diff to previous 1.504 (colored) to selected 1.30 (colored)

make(1): exit 2 on technical errors

This allows the -q option to distinguish errors from out-of-date
targets.  Granted, it's an edge case but it should be solved
consistently anyway.

The majority of cases in which make exits with exit status 1, even in -q
mode, is when there are parse errors.  These have been kept as-is for
now as they affect many of the unit tests.

The technical errors, on the other hand, occur so rarely that it's hard
to write reliable tests for them that fail consistently on all platforms
supported by make.

Revision 1.504 / (download) - annotate - [select for diffs], Sun Dec 27 05:16:26 2020 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.503: +4 -4 lines
Diff to previous 1.503 (colored) to selected 1.30 (colored)

make(1): re-export variables from the actual make process

Since make uses vfork if available, re-exporting the variables happens
in the address space of the main process anyway, so there is no point in
mentioning anything about "our client process" anywhere.

Revision 1.503 / (download) - annotate - [select for diffs], Sat Dec 26 03:54:48 2020 UTC (3 years, 3 months ago) by sjg
Branch: MAIN
Changes since 1.502: +3 -4 lines
Diff to previous 1.502 (colored) to selected 1.30 (colored)

Use .MAKE.DEPENDFILE as makefiles set it

Revision 1.502 / (download) - annotate - [select for diffs], Wed Dec 23 14:13:49 2020 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.501: +6 -5 lines
Diff to previous 1.501 (colored) to selected 1.30 (colored)

make(1): fix a few lint warnings

Revision 1.501 / (download) - annotate - [select for diffs], Wed Dec 23 13:50:54 2020 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.500: +5 -5 lines
Diff to previous 1.500 (colored) to selected 1.30 (colored)

make(1): rename CmdOpts.lint to strict

When running lint(1) on the code, it defines the preprocessor macro
"lint" to 1, which generated a syntax error in the declaration "Boolean
lint", as that became "Boolean 1".

Revision 1.500 / (download) - annotate - [select for diffs], Sun Dec 20 14:39:46 2020 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.499: +16 -17 lines
Diff to previous 1.499 (colored) to selected 1.30 (colored)

make(1): remove constant parameter from MakeMode

Revision 1.499 / (download) - annotate - [select for diffs], Sun Dec 20 14:32:13 2020 UTC (3 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.498: +30 -36 lines
Diff to previous 1.498 (colored) to selected 1.30 (colored)

make(1): change return type of Var_Value to FStr

Revision 1.498 / (download) - annotate - [select for diffs], Sun Dec 13 20:14:48 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.497: +3 -6 lines
Diff to previous 1.497 (colored) to selected 1.30 (colored)

make(1): add str_basename to reduce duplicate code

The function basename from POSIX has a few unfortunate properties, it is
allowed to return a pointer to static memory.  This is too unreliable,
therefore this trivial own implementation.

Revision 1.497 / (download) - annotate - [select for diffs], Sun Dec 13 20:09:02 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.496: +3 -3 lines
Diff to previous 1.496 (colored) to selected 1.30 (colored)

make(1): constify progname

Revision 1.496 / (download) - annotate - [select for diffs], Sun Dec 13 02:01:43 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.495: +3 -2 lines
Diff to previous 1.495 (colored) to selected 1.30 (colored)

make(1): replace *line with line[0]

Since a line is not an iterator and since the expression *line typically
means "the current element", not "the first character", replacing *line
with line[0] more directly expresses the idea of accessing the first
character of a string.

Revision 1.495 / (download) - annotate - [select for diffs], Sat Dec 12 18:53:53 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.494: +3 -3 lines
Diff to previous 1.494 (colored) to selected 1.30 (colored)

make(1): rename Var_ExportVars to Var_ReexportVars

Revision 1.494 / (download) - annotate - [select for diffs], Fri Dec 11 23:00:59 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.493: +6 -6 lines
Diff to previous 1.493 (colored) to selected 1.30 (colored)

make(1): clean up comments for command line options

Revision 1.493 / (download) - annotate - [select for diffs], Fri Dec 11 22:48:31 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.492: +3 -7 lines
Diff to previous 1.492 (colored) to selected 1.30 (colored)

make(1): remove DEFMAXLOCAL and DEFMAXJOBS

These have been hard-wired all the time.  The word LOCAL doesn't make
sense anymore since the code for running jobs remotely has gone.

Revision 1.492 / (download) - annotate - [select for diffs], Sat Dec 5 18:38:02 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.491: +3 -3 lines
Diff to previous 1.491 (colored) to selected 1.30 (colored)

make(1): define constants for enum zero-values

Revision 1.491 / (download) - annotate - [select for diffs], Tue Dec 1 19:28:32 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.490: +3 -3 lines
Diff to previous 1.490 (colored) to selected 1.30 (colored)

make(1): remove Dir_InitDir

The function name had been too ambiguous since it didn't mention the
particular directory that was initialized.  Instead of that function,
Dir_InitCur is called directly from main_Init.

The pseudo CachedDir entry ".DOTLAST" is initialized at the very
beginning.  The observable behavior is unchanged since this a
memory-only object with no connection to the file system.

Revision 1.490 / (download) - annotate - [select for diffs], Sun Nov 29 01:40:26 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.489: +3 -3 lines
Diff to previous 1.489 (colored) to selected 1.30 (colored)

make(1): reduce memory allocation for dirSearchPath

Revision 1.489 / (download) - annotate - [select for diffs], Sun Nov 29 00:42:01 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.488: +3 -3 lines
Diff to previous 1.488 (colored) to selected 1.30 (colored)

make(1): fix main_CleanUp in -DCLEANUP mode (broken since 1 hour)

Broken since main.c 1.486 from 2020-11-28, about 1 hour ago.

Revision 1.488 / (download) - annotate - [select for diffs], Sun Nov 29 00:04:22 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.487: +8 -8 lines
Diff to previous 1.487 (colored) to selected 1.30 (colored)

make(1): reduce memory allocation for targets

This change moves the initialization and finalization of the list of
targets to the same function.  They had been split before.

Revision 1.487 / (download) - annotate - [select for diffs], Sat Nov 28 23:43:14 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.486: +8 -8 lines
Diff to previous 1.486 (colored) to selected 1.30 (colored)

make(1): reduce memory allocation in ReadBuiltinRules

Revision 1.486 / (download) - annotate - [select for diffs], Sat Nov 28 23:39:58 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.485: +9 -9 lines
Diff to previous 1.485 (colored) to selected 1.30 (colored)

make(1): reduce memory allocation for CmdOpts.create

Revision 1.485 / (download) - annotate - [select for diffs], Sat Nov 28 23:35:44 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.484: +6 -6 lines
Diff to previous 1.484 (colored) to selected 1.30 (colored)

make(1): reduce memory allocation in CmdOpts.variables

Revision 1.484 / (download) - annotate - [select for diffs], Sat Nov 28 23:32:22 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.483: +13 -9 lines
Diff to previous 1.483 (colored) to selected 1.30 (colored)

make(1): reduce memory allocation in CmdOpts.makefiles

Revision 1.483 / (download) - annotate - [select for diffs], Sat Nov 28 18:55:52 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.482: +3 -3 lines
Diff to previous 1.482 (colored) to selected 1.30 (colored)

make(1): remove pointer indirection from GNode.commands

Just to save a few memory allocations.  No noticeable effect on the
performance though.

Revision 1.482 / (download) - annotate - [select for diffs], Sat Nov 28 10:00:25 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.481: +10 -10 lines
Diff to previous 1.481 (colored) to selected 1.30 (colored)

make(1): rename local variable in Cmd_Exec

It conflicts with the global fds in job.c.

Revision 1.481 / (download) - annotate - [select for diffs], Sat Nov 28 08:40:05 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.480: +5 -5 lines
Diff to previous 1.480 (colored) to selected 1.30 (colored)

make(1): rename conflicting global variables called 'error'

When compiling make in all-in-one mode, these variable names conflict.
They could have been merged into a single variable, but that would have
required to make it a global variable for the other modules as well.
The parse module has a similar variable called 'fatals'.  All these can
possibly be merged into a single variable, but not now.

Revision 1.480 / (download) - annotate - [select for diffs], Wed Nov 25 00:50:44 2020 UTC (3 years, 4 months ago) by sjg
Branch: MAIN
Changes since 1.479: +6 -2 lines
Diff to previous 1.479 (colored) to selected 1.30 (colored)

Add .MAKE.UID and .MAKE.GID

Revision 1.479 / (download) - annotate - [select for diffs], Tue Nov 24 19:52:06 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.478: +4 -6 lines
Diff to previous 1.478 (colored) to selected 1.30 (colored)

make(1): fix indentation for short expressions in main.c

Revision 1.478 / (download) - annotate - [select for diffs], Mon Nov 23 23:41:11 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.477: +3 -3 lines
Diff to previous 1.477 (colored) to selected 1.30 (colored)

make(1): use comparisons in boolean expressions

The generated code stays exactly the same.

Revision 1.477 / (download) - annotate - [select for diffs], Mon Nov 23 20:52:59 2020 UTC (3 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.476: +4 -4 lines
Diff to previous 1.476 (colored) to selected 1.30 (colored)

make(1): use properly typed comparisons in boolean contexts

Revision 1.476 / (download) - annotate - [select for diffs], Mon Nov 16 22:08:20 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.475: +4 -5 lines
Diff to previous 1.475 (colored) to selected 1.30 (colored)

make(1): fix initialization order of modules (broken since today)

In CLEANUP mode, Var_Init depends on Targ_Init since the variable scopes
are implemented as GNodes.

By the way, since 1999-09-15 variables are no longer stored in lists but
in hash tables.

Revision 1.475 / (download) - annotate - [select for diffs], Mon Nov 16 18:28:27 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.474: +7 -7 lines
Diff to previous 1.474 (colored) to selected 1.30 (colored)

make(1): use postfix increment where possible

Revision 1.474 / (download) - annotate - [select for diffs], Sun Nov 15 09:54:16 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.473: +13 -21 lines
Diff to previous 1.473 (colored) to selected 1.30 (colored)

make(1): clean up ParseBoolean

Revision 1.473 / (download) - annotate - [select for diffs], Sun Nov 15 09:38:44 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.472: +13 -15 lines
Diff to previous 1.472 (colored) to selected 1.30 (colored)

make(1): clean up getTmpdir

Reduce indentation, structure code into paragraphs.

Revision 1.472 / (download) - annotate - [select for diffs], Sun Nov 15 09:33:50 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.471: +25 -20 lines
Diff to previous 1.471 (colored) to selected 1.30 (colored)

make(1): clean up PrintOnError

No functional change.

Revision 1.471 / (download) - annotate - [select for diffs], Sun Nov 15 08:12:35 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.470: +4 -3 lines
Diff to previous 1.470 (colored) to selected 1.30 (colored)

make(1): fix previous commit for parse_debug_options

Revision 1.470 / (download) - annotate - [select for diffs], Sun Nov 15 08:10:15 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.469: +26 -24 lines
Diff to previous 1.469 (colored) to selected 1.30 (colored)

make(1): reduce code size of parse_debug_options

Each access to a global variable requires a relocation.  Skip these.

Revision 1.469 / (download) - annotate - [select for diffs], Sat Nov 14 23:03:08 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.468: +26 -40 lines
Diff to previous 1.468 (colored) to selected 1.30 (colored)

make(1): switch cache for realpath from GNode to HashTable

An unintended side effect from the GNode implementation was that the
variable modifier :tA and the other places where cached_realpath are
used could be affected by setting a variable in the global scope,
thereby "redirecting" absolute paths to completely unrelated but
existing paths.

Another unintended side effect was that filenames containing a dollar
sign would not be resolved correctly since the dollar sign would be
expanded as a variable expression by Var_Set.

While here, the debugging output for the realpath cache has been
adjusted to the standard behavior.  Previously, when a new entry was
added to the cache, this was logged for the module VAR, as a side effect
of calling Var_Set, but only if the preprocessor macro
DEBUG_REALPATH_CACHE was defined at compilation time.  When relative
paths were purged from the cache because the current directory changed
and logging for the DIR module was active, the log output went directly
to stderr instead of the usual opts.debug_file.  This deviation from the
standard behavior was probably not intended as well.

All logging concerning the realpath cache now goes into the standard
debug log file and is controlled by the -dd option, not -dv.

Revision 1.468 / (download) - annotate - [select for diffs], Sat Nov 14 22:19:13 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.467: +3 -3 lines
Diff to previous 1.467 (colored) to selected 1.30 (colored)

make(1): document the -S option

This option has been available at least since 1993-03-21, and for the
same time it has been undocumented.

Revision 1.467 / (download) - annotate - [select for diffs], Sat Nov 14 22:16:17 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.466: +3 -3 lines
Diff to previous 1.466 (colored) to selected 1.30 (colored)

make(1): fix trailing whitespace in usage (since 2009-08-27)

Revision 1.466 / (download) - annotate - [select for diffs], Sat Nov 14 21:55:22 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.465: +5 -7 lines
Diff to previous 1.465 (colored) to selected 1.30 (colored)

make(1): don't modify progname in usage

Revision 1.465 / (download) - annotate - [select for diffs], Sat Nov 14 18:36:27 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.464: +9 -7 lines
Diff to previous 1.464 (colored) to selected 1.30 (colored)

make(1): clean up Fatal

Use the shortest possible scope between va_start and the corresponding
va_end.

Revision 1.464 / (download) - annotate - [select for diffs], Sat Nov 14 18:14:34 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.463: +5 -5 lines
Diff to previous 1.463 (colored) to selected 1.30 (colored)

make(1): clean up InitDefSysIncPath

Flipping the arguments to strncmp puts the subject first in the
sentence. Inverting the condition makes the code flow easier to follow.

Revision 1.463 / (download) - annotate - [select for diffs], Sat Nov 14 18:07:26 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.462: +4 -4 lines
Diff to previous 1.462 (colored) to selected 1.30 (colored)

make(1): use progname instead of hard-coded 'make' in warning

This only affects the warning that chdir to objdir failed.  In sub-makes
the progname includes the [n], allowing to narrow down the actual cause
of the problem.

Revision 1.462 / (download) - annotate - [select for diffs], Sat Nov 14 17:39:59 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.461: +7 -6 lines
Diff to previous 1.461 (colored) to selected 1.30 (colored)

make(1): remove redundant parameter from str2Lst_Append

Revision 1.461 / (download) - annotate - [select for diffs], Sat Nov 14 17:39:14 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.460: +5 -5 lines
Diff to previous 1.460 (colored) to selected 1.30 (colored)

make(1): rename Main_SetVarObjdir to SetVarObjdir

Only exported functions should be prefixed with the module name.

Revision 1.460 / (download) - annotate - [select for diffs], Sat Nov 14 17:29:41 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.459: +4 -4 lines
Diff to previous 1.459 (colored) to selected 1.30 (colored)

make(1): use different style of accessing characters in MainParseArgs

The * is preferred for iterators.  Since argv[i] is not an iterator but
a fixed string, argv[i][0] expresses the idea "read the first character"
more directly.

Revision 1.459 / (download) - annotate - [select for diffs], Sat Nov 14 15:58:01 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.458: +4 -4 lines
Diff to previous 1.458 (colored) to selected 1.30 (colored)

make(1): rename DEFAULT to defaultNode

In C, uppercase names are typically used for constants, and this is not
a constant.

Revision 1.458 / (download) - annotate - [select for diffs], Fri Nov 13 19:45:24 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.457: +4 -6 lines
Diff to previous 1.457 (colored) to selected 1.30 (colored)

make(1): clean up preprocessor macros in InitVarMachine

Revision 1.457 / (download) - annotate - [select for diffs], Fri Nov 13 08:21:37 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.456: +5 -9 lines
Diff to previous 1.456 (colored) to selected 1.30 (colored)

make(1): flatten #ifdef in InitVarMachineArch

Without proper indentation, that chain of nested #ifndef directives was
really hard to read.

Revision 1.456 / (download) - annotate - [select for diffs], Thu Nov 12 23:35:21 2020 UTC (3 years, 5 months ago) by sjg
Branch: MAIN
Changes since 1.455: +16 -14 lines
Diff to previous 1.455 (colored) to selected 1.30 (colored)

Pass a writable flag to Main_SetObjdir to control writable check

For curdir and an explicit .OBJDIR target, we allow for
the directory to be read-only.
During InitObjdir we otherwise default to requiring objdir to be
writable - this can be controlled by env variable
MAKE_OBJDIR_CHECK_WRITABLE

Add unit-tests/objdir-writable

Reviewed by: christos rillig

Revision 1.455 / (download) - annotate - [select for diffs], Sun Nov 8 23:38:02 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.454: +7 -6 lines
Diff to previous 1.454 (colored) to selected 1.30 (colored)

make(1): move lint option away from the debug flags

The lint option affects much more than a typical debug flag.  Not only
does it produce additional diagnostics, it also changes the control flow
and fixes the traditional error handling in a few places.

No functional change.

Revision 1.454 / (download) - annotate - [select for diffs], Sun Nov 8 15:07:37 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.453: +9 -9 lines
Diff to previous 1.453 (colored) to selected 1.30 (colored)

make(1): use strict typing in conditions of the form !var

Revision 1.453 / (download) - annotate - [select for diffs], Sun Nov 8 14:50:24 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.452: +394 -391 lines
Diff to previous 1.452 (colored) to selected 1.30 (colored)

make(1): reformat main.c more closely to share/misc/style

Revision 1.452 / (download) - annotate - [select for diffs], Sun Nov 8 14:19:15 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.451: +4 -7 lines
Diff to previous 1.451 (colored) to selected 1.30 (colored)

make(1): remove redundant comment from main_ReadFiles

The code has become so simple that it made the comment redundant.

Revision 1.451 / (download) - annotate - [select for diffs], Sun Nov 8 13:10:30 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.450: +6 -6 lines
Diff to previous 1.450 (colored) to selected 1.30 (colored)

make(1): rename init_machine to InitVarMachine

For consistency with the other Init functions.

Revision 1.450 / (download) - annotate - [select for diffs], Sun Nov 8 13:05:03 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.449: +22 -23 lines
Diff to previous 1.449 (colored) to selected 1.30 (colored)

make(1): move usage further to the top

This avoids a forward declaration.

Revision 1.449 / (download) - annotate - [select for diffs], Sun Nov 8 12:50:57 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.448: +13 -19 lines
Diff to previous 1.448 (colored) to selected 1.30 (colored)

make(1): move documentation from main to the phase functions

Revision 1.448 / (download) - annotate - [select for diffs], Sun Nov 8 12:40:04 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.447: +83 -57 lines
Diff to previous 1.447 (colored) to selected 1.30 (colored)

make(1): split main into manageable pieces

The purpose of a main function is to give a high-level overview about the
whole program.  270 lines of code with lots of tricky details did not serve this
purpose.  Split the code into functions corresponding to the phases.

Revision 1.447 / (download) - annotate - [select for diffs], Sun Nov 8 12:21:27 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.446: +46 -49 lines
Diff to previous 1.446 (colored) to selected 1.30 (colored)

make(1): indent main consistently

Revision 1.446 / (download) - annotate - [select for diffs], Sun Nov 8 12:14:14 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.445: +9 -11 lines
Diff to previous 1.445 (colored) to selected 1.30 (colored)

make(1): inline ReadMakefileSucceeded into ReadFirstDefaultMakefile

This gets rid of a few void pointers and an unused function parameter.

Revision 1.445 / (download) - annotate - [select for diffs], Sun Nov 8 12:02:16 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.444: +16 -6 lines
Diff to previous 1.444 (colored) to selected 1.30 (colored)

make(1): inline Lst_ForEachUntil in ReadBuiltinRules

The list of expanded filenames for sys.mk is freed in the end, but not
the filenames themselves, as these are still needed.

Revision 1.444 / (download) - annotate - [select for diffs], Sun Nov 8 08:53:22 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.443: +4 -6 lines
Diff to previous 1.443 (colored) to selected 1.30 (colored)

make(1): use common indentation style for else

Revision 1.443 / (download) - annotate - [select for diffs], Sun Nov 8 02:56:43 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.442: +29 -20 lines
Diff to previous 1.442 (colored) to selected 1.30 (colored)

make(1): split ReadMakefiles into separate functions

This keeps the indentation of the code small.

It also reduces the possible confusion about the two similar branches in
that function that differ in a small but important detail:
ReadAllMakefiles reads all the makefiles while ReadFirstDefaultMakefile
stops after the first existing makefile.

Revision 1.442 / (download) - annotate - [select for diffs], Sun Nov 8 02:05:34 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.441: +9 -7 lines
Diff to previous 1.441 (colored) to selected 1.30 (colored)

make(1): fix unrealistic memory leak in Main_ParseArgLine

It's unlikely that anyone ever defines an environment variable named
".MAKE" and then runs make with the -e option, which would make the
environment variable stronger than the built-in global variable.

Revision 1.441 / (download) - annotate - [select for diffs], Sun Nov 8 01:56:54 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.440: +4 -2 lines
Diff to previous 1.440 (colored) to selected 1.30 (colored)

make(1): add remarks for missing command line options in MAKEFLAGS

Revision 1.440 / (download) - annotate - [select for diffs], Sun Nov 8 01:52:24 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.439: +5 -4 lines
Diff to previous 1.439 (colored) to selected 1.30 (colored)

make(1): parse the internal option -J strictly

Revision 1.439 / (download) - annotate - [select for diffs], Sun Nov 8 01:43:58 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.438: +5 -7 lines
Diff to previous 1.438 (colored) to selected 1.30 (colored)

make(1): merge duplicate code in is_relpath

Revision 1.438 / (download) - annotate - [select for diffs], Sun Nov 8 01:40:01 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.437: +12 -21 lines
Diff to previous 1.437 (colored) to selected 1.30 (colored)

make(1): clean up overview comment in main.c

Revision 1.437 / (download) - annotate - [select for diffs], Sun Nov 8 01:39:24 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.436: +8 -8 lines
Diff to previous 1.436 (colored) to selected 1.30 (colored)

make(1): fix type mismatch between int and PrintVarsMode

Revision 1.436 / (download) - annotate - [select for diffs], Sat Nov 7 21:40:08 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.435: +3 -3 lines
Diff to previous 1.435 (colored) to selected 1.30 (colored)

make(1): remove trailing whitespace

Revision 1.435 / (download) - annotate - [select for diffs], Sat Nov 7 14:11:58 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.434: +4 -4 lines
Diff to previous 1.434 (colored) to selected 1.30 (colored)

make(1): make API of Buf_Init simpler

In most cases, the caller doesn't want to specify the exact number of
preallocated bytes.

Revision 1.434 / (download) - annotate - [select for diffs], Sat Nov 7 10:25:28 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.433: +4 -3 lines
Diff to previous 1.433 (colored) to selected 1.30 (colored)

make(1): document InitDefSysIncPath

Revision 1.433 / (download) - annotate - [select for diffs], Sat Nov 7 10:16:18 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.432: +11 -11 lines
Diff to previous 1.432 (colored) to selected 1.30 (colored)

make(1): clean up code stylistically

* Replace character literal 0 with '\0'.
* Replace pointer literal 0 with NULL.
* Remove redundant parentheses.
* Parentheses in multi-line conditions are not redundant at the
  beginning of a line.
* Replace a few !ptr with ptr == NULL.
* Replace a few ptr with ptr != NULL.
* Replace (expr & mask) == 0 with !(expr & mask).
* Remove redundant braces for blocks in cases where the generated code
  stays the same.  (Assertions further down in the code would get
  different line numbers.)
* Rename parameters in CondParser_String to reflect the data flow.
* Replace #ifdef notdef with #if 0.

The generated code stays exactly the same, at least with GCC 5.5.0 on
NetBSD 8.0 amd64 using the default configuration.

Revision 1.432 / (download) - annotate - [select for diffs], Fri Nov 6 23:11:11 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.431: +27 -27 lines
Diff to previous 1.431 (colored) to selected 1.30 (colored)

make(1): rename getBoolean and s2Boolean

Revision 1.431 / (download) - annotate - [select for diffs], Fri Nov 6 23:05:20 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.430: +4 -4 lines
Diff to previous 1.430 (colored) to selected 1.30 (colored)

make(1): fix comment of Error

Revision 1.430 / (download) - annotate - [select for diffs], Fri Nov 6 23:04:20 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.429: +10 -23 lines
Diff to previous 1.429 (colored) to selected 1.30 (colored)

make(1): clean up Cmd_Exec stylistically

Revision 1.429 / (download) - annotate - [select for diffs], Fri Nov 6 21:20:31 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.428: +8 -9 lines
Diff to previous 1.428 (colored) to selected 1.30 (colored)

make(1): rename dieQuietly to shouldDieQuietly

It was too confusing to have a function named die that doesn't actually
die.  Plus, the return type int didn't give any clue about what the
function actually returns.

Revision 1.428 / (download) - annotate - [select for diffs], Fri Nov 6 21:01:43 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.427: +3 -3 lines
Diff to previous 1.427 (colored) to selected 1.30 (colored)

make(1): fix typo from previous commit

Revision 1.427 / (download) - annotate - [select for diffs], Fri Nov 6 20:59:52 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.426: +3 -3 lines
Diff to previous 1.426 (colored) to selected 1.30 (colored)

make(1): fix wrong condition in mkTempFile (since 2020-10-31)

The wrong negation had been added in main.c 1.414 from 2020-10-31.
Found by GCC 10, which complained about a potential null pointer
dereference in line 2188.

Revision 1.426 / (download) - annotate - [select for diffs], Thu Nov 5 17:27:16 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.425: +13 -13 lines
Diff to previous 1.425 (colored) to selected 1.30 (colored)

make(1): remove redundant parentheses from sizeof operator

The parentheses are only needed if the argument is a type, not an
expression.

Revision 1.425 / (download) - annotate - [select for diffs], Wed Nov 4 13:29:42 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.424: +2 -4 lines
Diff to previous 1.424 (colored) to selected 1.30 (colored)

make(1): move declaration of parseIncPath from main.c to make.h

Revision 1.424 / (download) - annotate - [select for diffs], Wed Nov 4 13:22:15 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.423: +4 -4 lines
Diff to previous 1.423 (colored) to selected 1.30 (colored)

make(1): rename MAKEFILE_PREFERENCE for consistency

The names of the other special variables are all prefixed with MAKE_.

Revision 1.423 / (download) - annotate - [select for diffs], Wed Nov 4 04:49:32 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.422: +3 -5 lines
Diff to previous 1.422 (colored) to selected 1.30 (colored)

make(1): negate discardUndefined to preserveUndefined

Revision 1.422 / (download) - annotate - [select for diffs], Wed Nov 4 03:37:51 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.421: +4 -4 lines
Diff to previous 1.421 (colored) to selected 1.30 (colored)

make(1): rename oldVars to discardUndefined

While here, moved all the documentation about this variable into a
single place.

Revision 1.421 / (download) - annotate - [select for diffs], Sun Nov 1 00:24:57 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.420: +8 -4 lines
Diff to previous 1.420 (colored) to selected 1.30 (colored)

make(1): in lint mode, exit with error status on errors

Calling Parse_Error during parsing has always led to a nonzero exit
status.  Calling Parse_Error later, when expanding the shell commands,
has had no effect on the exit status.  Neither had calling Error.

To make make a reliable tool, it has to report errors as they occur.
Enable this strict behavior in lint mode for now.  Lint mode has to be
enabled explicitly, preserving the default behavior.

Revision 1.420 / (download) - annotate - [select for diffs], Sat Oct 31 21:09:22 2020 UTC (3 years, 5 months ago) by sjg
Branch: MAIN
Changes since 1.419: +5 -3 lines
Diff to previous 1.419 (colored) to selected 1.30 (colored)

Main_SetObjdir is first called for curdir which may be readonly

Skip access check if path is curdir.
This ensures that all proper initialization is done at least once.

If path is not curdir it should be writable to be useful.

Reviewed by: rillig

Revision 1.419 / (download) - annotate - [select for diffs], Sat Oct 31 16:13:00 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.418: +3 -3 lines
Diff to previous 1.418 (colored) to selected 1.30 (colored)

make(1): revert requiring a writable objdir

The change in main.c 1.413 broke the NetBSD build.sh if it uses a
read-only source tree, as in the daily builds.

Original commit:
https://mail-index.netbsd.org/source-changes/2020/10/31/msg123560.html

Build log:
make warning: /home/source/ab/HEAD/src: Permission denied.
[1]   Segmentation fault      "${make}" -m ${T...

Revision 1.418 / (download) - annotate - [select for diffs], Sat Oct 31 11:34:30 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.417: +3 -3 lines
Diff to previous 1.417 (colored) to selected 1.30 (colored)

make(1): reduce the scope where recursive expressions are detected

Only the call to Var_Subst needs to be protected since the other
functions have nothing to do with expanding variables.

Revision 1.417 / (download) - annotate - [select for diffs], Sat Oct 31 09:35:58 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.416: +8 -8 lines
Diff to previous 1.416 (colored) to selected 1.30 (colored)

make(1): remove redundant :tl from getBoolean

Uppercase and lowercase letters are already handled the same by
s2Boolean, which makes the :tl modifier redundant.

Revision 1.416 / (download) - annotate - [select for diffs], Sat Oct 31 09:27:19 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.415: +16 -18 lines
Diff to previous 1.415 (colored) to selected 1.30 (colored)

make(1): remove redundant null check from s2Boolean

Revision 1.415 / (download) - annotate - [select for diffs], Sat Oct 31 09:23:38 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.414: +5 -16 lines
Diff to previous 1.414 (colored) to selected 1.30 (colored)

make(1): write s2Boolean in a more compact form

Revision 1.414 / (download) - annotate - [select for diffs], Sat Oct 31 09:20:07 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.413: +8 -8 lines
Diff to previous 1.413 (colored) to selected 1.30 (colored)

make(1): clean up mkTempFile

Revision 1.413 / (download) - annotate - [select for diffs], Sat Oct 31 06:18:21 2020 UTC (3 years, 5 months ago) by sjg
Branch: MAIN
Changes since 1.412: +3 -3 lines
Diff to previous 1.412 (colored) to selected 1.30 (colored)

Do not use an objdir that is not writable.

Revision 1.412 / (download) - annotate - [select for diffs], Fri Oct 30 20:30:44 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.411: +21 -15 lines
Diff to previous 1.411 (colored) to selected 1.30 (colored)

make(1): change char * to void * in Var_Value

The only purpose of the parameter freeIt is to free the memory
associated with the return value.  To do this, no pointer arithmetic is
needed.  Therefore, change to a void pointer, to catch accidental use of
that pointer.

Revision 1.411 / (download) - annotate - [select for diffs], Fri Oct 30 15:39:17 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.410: +3 -3 lines
Diff to previous 1.410 (colored) to selected 1.30 (colored)

make(1): fix indentation in source code

Revision 1.410 / (download) - annotate - [select for diffs], Fri Oct 30 07:19:30 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.409: +12 -12 lines
Diff to previous 1.409 (colored) to selected 1.30 (colored)

make(1): rename VAR_CMD to VAR_CMDLINE

Since make has to do with both the command line and child commands, the
former name was confusing.

Revision 1.409 / (download) - annotate - [select for diffs], Wed Oct 28 03:21:25 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.408: +12 -10 lines
Diff to previous 1.408 (colored) to selected 1.30 (colored)

make(1): rename defIncPath to defSysIncPath

There are two variables, parseIncPath and sysIncPath, which made the
name defIncPath ambiguous.

Revision 1.408 / (download) - annotate - [select for diffs], Tue Oct 27 19:16:46 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.407: +35 -24 lines
Diff to previous 1.407 (colored) to selected 1.30 (colored)

make(1): extract InitMaxJobs from main

Revision 1.407 / (download) - annotate - [select for diffs], Tue Oct 27 18:16:19 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.406: +26 -20 lines
Diff to previous 1.406 (colored) to selected 1.30 (colored)

make(1): extract InitObjdir from main

Revision 1.406 / (download) - annotate - [select for diffs], Tue Oct 27 18:12:15 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.405: +19 -24 lines
Diff to previous 1.405 (colored) to selected 1.30 (colored)

make(1): make InitVarMake simpler and document its intention

Revision 1.405 / (download) - annotate - [select for diffs], Tue Oct 27 17:36:17 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.404: +30 -22 lines
Diff to previous 1.404 (colored) to selected 1.30 (colored)

make(1): extract InitVarMake from main

Revision 1.404 / (download) - annotate - [select for diffs], Tue Oct 27 17:09:09 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.403: +13 -9 lines
Diff to previous 1.403 (colored) to selected 1.30 (colored)

make(1): extract InitRandom from main

Revision 1.403 / (download) - annotate - [select for diffs], Tue Oct 27 08:05:20 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.402: +27 -21 lines
Diff to previous 1.402 (colored) to selected 1.30 (colored)

make(1): extract ReadMakefiles from main

Revision 1.402 / (download) - annotate - [select for diffs], Tue Oct 27 08:00:20 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.401: +36 -30 lines
Diff to previous 1.401 (colored) to selected 1.30 (colored)

make(1): extract CleanUp from main

This makes it a bit easier to spot the main task of the main function,
which is the runTargets call.

Revision 1.401 / (download) - annotate - [select for diffs], Tue Oct 27 07:51:43 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.400: +4 -4 lines
Diff to previous 1.400 (colored) to selected 1.30 (colored)

make(1): free the variable names given on the command line

These are not aliased anywhere.  The opts.makefiles on the other hand
may be referenced in GNode.fname or pretty much anywhere else, so don't
free them.  There's still a Targ_PrintGraph call below it that might use
them.

Revision 1.400 / (download) - annotate - [select for diffs], Tue Oct 27 07:44:43 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.399: +36 -31 lines
Diff to previous 1.399 (colored) to selected 1.30 (colored)

make(1): extract InitVpath from main

Revision 1.399 / (download) - annotate - [select for diffs], Tue Oct 27 07:38:08 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.398: +3 -9 lines
Diff to previous 1.398 (colored) to selected 1.30 (colored)

make(1): use constant string for Var_Subst

The times where Var_Subst needed a modifiable string are long gone.

Revision 1.398 / (download) - annotate - [select for diffs], Tue Oct 27 07:34:36 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.397: +19 -15 lines
Diff to previous 1.397 (colored) to selected 1.30 (colored)

make(1): extract ReadBuiltinRules from main

Revision 1.397 / (download) - annotate - [select for diffs], Tue Oct 27 07:28:33 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.396: +43 -35 lines
Diff to previous 1.396 (colored) to selected 1.30 (colored)

make(1): extract InitDefIncPath from main

Revision 1.396 / (download) - annotate - [select for diffs], Tue Oct 27 07:16:27 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.395: +6 -6 lines
Diff to previous 1.395 (colored) to selected 1.30 (colored)

make(1): initialize all CmdOpts fiels

Revision 1.395 / (download) - annotate - [select for diffs], Tue Oct 27 07:13:02 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.394: +29 -18 lines
Diff to previous 1.394 (colored) to selected 1.30 (colored)

make(1): extract CmdOpts_Init from main

Revision 1.394 / (download) - annotate - [select for diffs], Tue Oct 27 07:03:55 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.393: +5 -6 lines
Diff to previous 1.393 (colored) to selected 1.30 (colored)

make(1): move debugVflag to CmdOpts

Revision 1.393 / (download) - annotate - [select for diffs], Tue Oct 27 06:59:20 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.392: +18 -15 lines
Diff to previous 1.392 (colored) to selected 1.30 (colored)

make(1): extract UnlimitFiles from main

Revision 1.392 / (download) - annotate - [select for diffs], Mon Oct 26 23:28:52 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.391: +8 -35 lines
Diff to previous 1.391 (colored) to selected 1.30 (colored)

make(1): remove "Results: none" from the documentation of void functions

Revision 1.391 / (download) - annotate - [select for diffs], Mon Oct 26 21:34:10 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.390: +109 -129 lines
Diff to previous 1.390 (colored) to selected 1.30 (colored)

make(1): group the command line options and arguments

By having a single struct that holds all command line options and
arguments, it is easy to see in the code when such a command line
argument is modified.  It also cleans up the namespace since the command
line options don't follow a common naming style.  Having them in a
struct also means that there is a single place for putting the
documentation, not two as before.

The struct also suggests to extract the initialization code out of main,
which is still too large, having more than 400 lines of code and
covering far too many topics.

Revision 1.390 / (download) - annotate - [select for diffs], Sun Oct 25 19:19:07 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.389: +3 -3 lines
Diff to previous 1.389 (colored) to selected 1.30 (colored)

make(1): rename hash functions to identify the type name

This makes it easier to spot mismatches between the function name and
its first parameter, although the compiler should already catch most of
them.  Except for void pointers.

Revision 1.389 / (download) - annotate - [select for diffs], Sun Oct 25 17:37:36 2020 UTC (3 years, 5 months ago) by sjg
Branch: MAIN
Changes since 1.388: +10 -7 lines
Diff to previous 1.388 (colored) to selected 1.30 (colored)

Skip reading .MAKE.DEPENDFILE if set to
"/dev/null" or anything starting with "no".

Ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223564

Revision 1.388 / (download) - annotate - [select for diffs], Sat Oct 24 20:29:40 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.387: +3 -3 lines
Diff to previous 1.387 (colored) to selected 1.30 (colored)

make(1): convert macros for debug flags into enum

Revision 1.387 / (download) - annotate - [select for diffs], Sat Oct 24 10:36:23 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.386: +3 -3 lines
Diff to previous 1.386 (colored) to selected 1.30 (colored)

make(1): remove unused Lst_Find and Lst_FindFrom

Revision 1.386 / (download) - annotate - [select for diffs], Sat Oct 24 09:28:50 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.385: +12 -22 lines
Diff to previous 1.385 (colored) to selected 1.30 (colored)

make(1): inline ReadMakefileFailed, eliminating some void pointers

Revision 1.385 / (download) - annotate - [select for diffs], Fri Oct 23 06:27:39 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.384: +24 -20 lines
Diff to previous 1.384 (colored) to selected 1.30 (colored)

make(1): remove void pointers from addErrorCMD

Revision 1.384 / (download) - annotate - [select for diffs], Thu Oct 22 07:12:13 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.383: +16 -12 lines
Diff to previous 1.383 (colored) to selected 1.30 (colored)

make(1): clean up PrintVar

Conceptually, the last parameters of Var_Subst and Var_Value differ a
lot.  The former is the actual variable value while the latter is just a
pointer to be freed.  It will be changed to a void pointer in a few
commits.

To keep the number of needed variables small and the code simple, the
printf statement is mentioned in each branch.  An additional benefit is
that in 2 of the 3 branches, no null pointer can occur.

Revision 1.383 / (download) - annotate - [select for diffs], Thu Oct 22 07:01:25 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.382: +27 -21 lines
Diff to previous 1.382 (colored) to selected 1.30 (colored)

make(1): extract PrintVar from doPrintVars

Revision 1.382 / (download) - annotate - [select for diffs], Thu Oct 22 06:54:51 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.381: +25 -18 lines
Diff to previous 1.381 (colored) to selected 1.30 (colored)

make(1): clean up HandlePWD

Revision 1.381 / (download) - annotate - [select for diffs], Thu Oct 22 06:38:52 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.380: +42 -32 lines
Diff to previous 1.380 (colored) to selected 1.30 (colored)

make(1): extract HandlePWD from main

Revision 1.380 / (download) - annotate - [select for diffs], Thu Oct 22 05:50:02 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.379: +3 -3 lines
Diff to previous 1.379 (colored) to selected 1.30 (colored)

make(1): remove redundant type casts

This mainly affects the void pointers in callback functions for lists.
These had been necessary once when the parameter type was still
ClientData instead of void pointer.

Revision 1.379 / (download) - annotate - [select for diffs], Mon Oct 19 21:57:37 2020 UTC (3 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.378: +4 -4 lines
Diff to previous 1.378 (colored) to selected 1.30 (colored)

make(1): inline simple Lst getters

The function call variant takes more screen space than the direct field
access.  Having an abstract API is usually a good idea, in this case of
simple read-only member access it makes the code more difficult to read.

LstNode_Set has been kept as a function since it is not a read-only
accessor function.

Revision 1.378 / (download) - annotate - [select for diffs], Sun Oct 18 13:02:10 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.377: +6 -6 lines
Diff to previous 1.377 (colored) to selected 1.30 (colored)

make(1): rename Lst_Init to Lst_New

For the other types such as HashTable and Buffer, the Init function does
not allocate the memory for the structure itself, it only fills it.

Revision 1.377 / (download) - annotate - [select for diffs], Sun Oct 18 12:47:43 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.376: +4 -4 lines
Diff to previous 1.376 (colored) to selected 1.30 (colored)

make(1): rename HashEntry.name to key

Revision 1.376 / (download) - annotate - [select for diffs], Sun Oct 18 12:36:43 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.375: +3 -3 lines
Diff to previous 1.375 (colored) to selected 1.30 (colored)

make(1): remove underscore from Hash_Table and Hash_Entry

For consistency with the other type names, such as GNodeListNode.

Revision 1.375 / (download) - annotate - [select for diffs], Sun Oct 18 11:54:43 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.374: +3 -3 lines
Diff to previous 1.374 (colored) to selected 1.30 (colored)

make(1): prepare for WARNS=6

The FD_* macros from sys/sys/fd_set.h use signed integers on NetBSD 8
and thus produce conversion errors.  On NetBSD 9, these macros are fixed
to use 1U instead of 1.

Revision 1.374 / (download) - annotate - [select for diffs], Sun Oct 18 10:44:25 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.373: +7 -6 lines
Diff to previous 1.373 (colored) to selected 1.30 (colored)

make(1): make API for iterating over hash tables simpler

Revision 1.373 / (download) - annotate - [select for diffs], Sun Oct 18 08:01:23 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.372: +31 -28 lines
Diff to previous 1.372 (colored) to selected 1.30 (colored)

make(1): remove USE_IOVEC

When a system call in a child process failed, there was no guarantee
that the error message would be written completely.  Using writev
correctly is harder than building the string in a buffer and then
writing it in the traditional way.

According to POSIX 2004, using memory allocation or even calling
write(2) from the child process invokes undefined behavior.  The
remaining code from make has done all this for several years now,
successfully, therefore adding one more of that won't hurt.

Make still tries to write the error message atomically by passing the
whole buffer at once to write(2), just as in the previous writev(2)
implementation.

Revision 1.372 / (download) - annotate - [select for diffs], Sun Oct 18 07:46:04 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.371: +6 -5 lines
Diff to previous 1.371 (colored) to selected 1.30 (colored)

make(1): replace execError with execDie

All calls to this function were followed by _exit(1).

Revision 1.371 / (download) - annotate - [select for diffs], Mon Oct 5 22:45:47 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.370: +10 -11 lines
Diff to previous 1.370 (colored) to selected 1.30 (colored)

make(1): remove pathname limit for Dir_FindHereOrAbove

While trying to compile the code with GCC's -Wformat-truncation, the
snprintf calls felt quite complicated.  The function Dir_FindHereOrAbove
is not in a bottleneck execution path, therefore it doesn't hurt to
dynamically allocate the memory instead of using size-limited stack
memory.

Revision 1.370 / (download) - annotate - [select for diffs], Mon Oct 5 21:37:07 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.369: +5 -5 lines
Diff to previous 1.369 (colored) to selected 1.30 (colored)

make(1): prepare job.c, main.c, parse.c, suff.c for WARNS=6

In job.c, GCC 5 complains about the macro FILENO that it has type
unsigned int, which is then passed as the argument of dup2, which
expects a simple int.  Maybe this workaround from 1995 is not necessary
anymore, or maybe it is but can be restricted to the few affected
platforms.

This leaves meta.c and the filemon files to be converted.  I didn't do
them since they are not well covered by the unit tests.

Revision 1.369 / (download) - annotate - [select for diffs], Mon Oct 5 19:27:47 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.368: +74 -60 lines
Diff to previous 1.368 (colored) to selected 1.30 (colored)

make(1): revert previous commit

It had accidentally reverted all the work from the past few days.

Revision 1.368 / (download) - annotate - [select for diffs], Mon Oct 5 19:24:29 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.367: +60 -74 lines
Diff to previous 1.367 (colored) to selected 1.30 (colored)

make(1): fix double-free bug in -DCLEANUP mode (since 2020-10-02)

The bug had been introduced with dir.c 1.155 on 2020-10-02 22:20:25.  In
that commit, openDirectories was replaced with a combination of a list
with a hash table, for more efficient lookup by name.

Upon cleanup, OpenDirs_Done is called, which in turn called
Dir_ClearPath.  Dir_ClearPath takes full ownership of the given list and
empties it.  This was no problem before since afterwards the list was
empty and calling Lst_Free just frees the remaining list pointer.

With OpenDirs, this list was combined with a hash table, and the hash
table contains the list nodes, assuming that the OpenDirs functions have
full ownership of both the list and the hash table.  This assumption was
generally correct, except for the one moment during cleanup where full
ownership of the list was passed to Dir_ClearPath, while the hash table
still contained pointers to the (now freed) list nodes.  This by itself
was not a problem since the hash table would be freed afterwards.  But
as part of Dir_ClearPath, OpenDirs_Remove was called, which looked up
the freed directory by name and now found the freed list node, trying to
free it again.  Boom.

Fixed by replacing the call to Dir_ClearPath with code that only frees
the directories, without giving up control over the list.

Revision 1.367 / (download) - annotate - [select for diffs], Mon Oct 5 17:33:21 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.366: +60 -42 lines
Diff to previous 1.366 (colored) to selected 1.30 (colored)

make(1): extract init_machine and init_machine_arch from main

Revision 1.366 / (download) - annotate - [select for diffs], Sun Oct 4 19:36:32 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.365: +7 -5 lines
Diff to previous 1.365 (colored) to selected 1.30 (colored)

make(1): remove duplicate code for parsing a variable name

Revision 1.365 / (download) - annotate - [select for diffs], Sun Oct 4 08:22:59 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.364: +5 -11 lines
Diff to previous 1.364 (colored) to selected 1.30 (colored)

make(1): make documentation of Error more precise

Revision 1.364 / (download) - annotate - [select for diffs], Sat Oct 3 21:52:50 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.363: +2 -6 lines
Diff to previous 1.363 (colored) to selected 1.30 (colored)

make(1): clean up #include sections

Revision 1.363 / (download) - annotate - [select for diffs], Sat Oct 3 13:22:39 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.362: +5 -4 lines
Diff to previous 1.362 (colored) to selected 1.30 (colored)

make(1): replace backslash-newline with ordinary string literals

The character sequence backslash-newline is not mentioned in ISO C99.

Revision 1.362 / (download) - annotate - [select for diffs], Sat Oct 3 13:06:56 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.361: +5 -2 lines
Diff to previous 1.361 (colored) to selected 1.30 (colored)

make(1): allow to disable debug logging options

This is only intended for the unit tests, to selectively enable and
disable debug logging as needed.  Previously the tests for debug logging
required complicated postprocessing that was not obvious when looking at
the test .mk file alone, but was specified externally in
unit-tests/Makefile.

This is the simplest possible implementation.  Another variant would
have been to selectively disable individual debug logging options, but
that would have made the code more complicated.

The -dL option is not affected by -d0 since that is not really a debug
option, even if it is implemented as one.

Revision 1.361 / (download) - annotate - [select for diffs], Thu Oct 1 23:52:51 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.360: +5 -19 lines
Diff to previous 1.360 (colored) to selected 1.30 (colored)

make(1): clean up documentation of Main_ParseArgLine

The previous documentation contained lots of irrelevant implementation
details.

Revision 1.360 / (download) - annotate - [select for diffs], Thu Oct 1 23:44:36 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.359: +4 -4 lines
Diff to previous 1.359 (colored) to selected 1.30 (colored)

make(1): add missing const for Parse_AddIncludeDir

Revision 1.359 / (download) - annotate - [select for diffs], Thu Oct 1 23:42:22 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.358: +7 -17 lines
Diff to previous 1.358 (colored) to selected 1.30 (colored)

make(1): clean up option handling

The test for argvalue == NULL for the individual options was unnecessary
since that is already done in the common part.

Revision 1.358 / (download) - annotate - [select for diffs], Thu Oct 1 23:28:01 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.357: +15 -15 lines
Diff to previous 1.357 (colored) to selected 1.30 (colored)

make(1): format code in MainParseArgs

Revision 1.357 / (download) - annotate - [select for diffs], Thu Oct 1 23:20:48 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.356: +21 -15 lines
Diff to previous 1.356 (colored) to selected 1.30 (colored)

make(1): extract handling of the -m option into separate function

Revision 1.356 / (download) - annotate - [select for diffs], Thu Oct 1 23:14:07 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.355: +49 -35 lines
Diff to previous 1.355 (colored) to selected 1.30 (colored)

make(1): extract option handling for -j/-J into separate functions

Revision 1.355 / (download) - annotate - [select for diffs], Thu Oct 1 23:06:56 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.354: +26 -21 lines
Diff to previous 1.354 (colored) to selected 1.30 (colored)

make(1): extract MainParseArgChdir into separate function

This removes the struct stat from MainParseArg.

Revision 1.354 / (download) - annotate - [select for diffs], Thu Oct 1 23:02:07 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.353: +198 -184 lines
Diff to previous 1.353 (colored) to selected 1.30 (colored)

make(1): extract MainParseArg into separate function

That part of the code is long enough and independent enough to get its
own function.  Having a struct stat in MainParseArgs just didn't feel
like a correct abstraction level.

Revision 1.353 / (download) - annotate - [select for diffs], Thu Oct 1 22:42:00 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.352: +2 -3 lines
Diff to previous 1.352 (colored) to selected 1.30 (colored)

make(1): remove redundant function prototypes

Revision 1.352 / (download) - annotate - [select for diffs], Mon Sep 28 20:46:11 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.351: +4 -6 lines
Diff to previous 1.351 (colored) to selected 1.30 (colored)

make(1): make debugging code shorter

Revision 1.351 / (download) - annotate - [select for diffs], Sun Sep 27 21:35:16 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.350: +10 -10 lines
Diff to previous 1.350 (colored) to selected 1.30 (colored)

make(1): normalize whitespace in source code

There is no more space tab.  Either only tabs or only spaces or tabs
followed by spaces, but not spaces followed by tabs.

Revision 1.350 / (download) - annotate - [select for diffs], Sun Sep 27 16:52:22 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.349: +3 -3 lines
Diff to previous 1.349 (colored) to selected 1.30 (colored)

make(1): rename Buf_Size to Buf_Len

The new name better matches the field name Buffer.len as well as the
variables around the calls to this function.

Revision 1.349 / (download) - annotate - [select for diffs], Sat Sep 26 17:39:45 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.348: +3 -3 lines
Diff to previous 1.348 (colored) to selected 1.30 (colored)

make(1): revert migration from Lst_ForEachUntil to Lst_ForEach

There is a crucial difference between these functions, in that
Lst_ForEachUntil can cope with a few concurrent modifications while
iterating over the list.  This is something that Lst_ForEach doesn't do.

This difference led to a crash very early in NetBSD's build.sh.

Revision 1.348 / (download) - annotate - [select for diffs], Sat Sep 26 17:15:20 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.347: +4 -4 lines
Diff to previous 1.347 (colored) to selected 1.30 (colored)

make(1): inline and remove LstNode_Prev and LstNode_Next

These functions made the code larger than necessary.  The prev and next
fields are published intentionally since navigating in a doubly-linked
list is simple to do and there is no need to wrap this in a layer of
function calls, not even syntactically.  (On the execution level, the
function calls had been inlined anyway.)

Revision 1.347 / (download) - annotate - [select for diffs], Sat Sep 26 16:55:58 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.346: +3 -3 lines
Diff to previous 1.346 (colored) to selected 1.30 (colored)

make(1): replace a few Lst_ForEachUntil with simpler Lst_ForEach

Revision 1.346 / (download) - annotate - [select for diffs], Sat Sep 26 16:00:12 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.345: +4 -4 lines
Diff to previous 1.345 (colored) to selected 1.30 (colored)

make(1): clean up API for finding and creating GNodes

The previous API had complicated rules for the cases in which the single
function returned NULL or what it did.  The flags for that function were
confusing since passing TARG_NOHASH would create a new node even though
TARG_CREATE was not included in that bit mask.

Splitting the function into 3 separate functions avoids this confusion.
It also reveals several places where the complicated API led to
unreachable code.  Such code has been removed.

Revision 1.345 / (download) - annotate - [select for diffs], Fri Sep 25 23:18:59 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.344: +9 -16 lines
Diff to previous 1.344 (colored) to selected 1.30 (colored)

make(1): fix undefined behavior for .MAKEFLAGS: -f file

Since at least 1993-03-21, adding other makefiles in a .MAKEFILES
dependency has invoked undefined behavior because the command line
arguments were copied directly into the global makefiles variable,
without a proper strdup.  Shortly after that, the word list created by
Str_Words (formerly brk_string) was freed.

This applies to both the -f and the -v and -V options.  Luckily it is an
edge case to use these options in .MAKEFLAGS at all.

The -T option had already been fixed at 2000-12-30, but not the other
options.

Revision 1.344 / (download) - annotate - [select for diffs], Fri Sep 25 19:40:23 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.343: +45 -33 lines
Diff to previous 1.343 (colored) to selected 1.30 (colored)

make(1): extract parsing of the -dF option into separate function

Revision 1.343 / (download) - annotate - [select for diffs], Fri Sep 25 19:24:56 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.342: +24 -17 lines
Diff to previous 1.342 (colored) to selected 1.30 (colored)

make(1): extract InitVarTarget from main

Revision 1.342 / (download) - annotate - [select for diffs], Thu Sep 24 07:11:29 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.341: +3 -3 lines
Diff to previous 1.341 (colored) to selected 1.30 (colored)

make(1): rename Lst_ForEach to Lst_ForEachUntil

Since the callback function returns a terminating condition, this is not
really a foreach loop.

Many of the calls to Lst_ForEachUntil don't make use of the terminating
condition, and several don't modify the list structurally, which means
they don't need this complicated implementation.

In a follow-up commit, Lst_ForEach will be added back with a much
simpler implementation that iterates over the list naively, without a
terminating condition and without taking the iteration state from
Lst_Open/Lst_Next/Lst_Close into account.  The migration to this simpler
implementation will be done step by step since each callback function
needs to be examined closely.

Revision 1.341 / (download) - annotate - [select for diffs], Tue Sep 22 20:19:46 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.340: +42 -22 lines
Diff to previous 1.340 (colored) to selected 1.30 (colored)

make(1): prepare Var_Subst for proper error handling

Returning a VarParseResult instead of a string makes it possible to let
the error bubble up, until it reaches the main expression.

Revision 1.340 / (download) - annotate - [select for diffs], Tue Sep 22 19:51:19 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.339: +5 -9 lines
Diff to previous 1.339 (colored) to selected 1.30 (colored)

make(1): fix unnecessary length limitation for -v option

Revision 1.339 / (download) - annotate - [select for diffs], Tue Sep 22 05:12:08 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.338: +3 -3 lines
Diff to previous 1.338 (colored) to selected 1.30 (colored)

make(1): fix type of global variable 'create'

Revision 1.338 / (download) - annotate - [select for diffs], Tue Sep 22 04:05:41 2020 UTC (3 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.337: +13 -13 lines
Diff to previous 1.337 (colored) to selected 1.30 (colored)

make(1): use fine-grained type names for lists and their nodes

This is only intended to help the human reader.  There is no additional
type safety yet.

Revision 1.337 / (download) - annotate - [select for diffs], Sun Sep 13 15:15:51 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.336: +8 -19 lines
Diff to previous 1.336 (colored) to selected 1.30 (colored)

make(1): clean up RCSID blocks

These blocks mostly consisted of redundant structure, following the same
#ifndef pattern over and over, with only minimal variation.

It's easier to maintain if the common structure is only written once and
encapsulated in a macro.

To avoid "defined but unused" warnings from GCC in the case where
MAKE_NATIVE is not defined, I had to add volatile.  Adding
MAKE_ATTR_UNUSED alone would not preserve the rcsid variable in the
resulting binary.

Revision 1.336 / (download) - annotate - [select for diffs], Sun Sep 13 06:15:29 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.335: +4 -4 lines
Diff to previous 1.335 (colored) to selected 1.30 (colored)

make(1): remove #endif comments for very short blocks

Revision 1.335 / (download) - annotate - [select for diffs], Sun Sep 13 06:05:56 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.334: +3 -6 lines
Diff to previous 1.334 (colored) to selected 1.30 (colored)

make(1): remove redundant VARARGS comments

These had been necessary at a time when the functions were declared with
"unknown parameter types".

On 1994-03-05, conditional support for function prototypes was added,
for those compilers that already supported this feature.

On 2002-06-15, the prototypes were made mandatory, and since then the
VARARGS comments had been completely redundant, or worse, simply wrong
(for ParseVErrorInternal).

Revision 1.334 / (download) - annotate - [select for diffs], Sun Sep 13 05:56:32 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.333: +5 -13 lines
Diff to previous 1.333 (colored) to selected 1.30 (colored)

make(1): consense documentation for Fatal

Revision 1.333 / (download) - annotate - [select for diffs], Sat Sep 12 15:15:51 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.332: +3 -10 lines
Diff to previous 1.332 (colored) to selected 1.30 (colored)

make(1): move PrintAddr to where it belongs

Revision 1.332 / (download) - annotate - [select for diffs], Fri Sep 11 17:32:36 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.331: +4 -4 lines
Diff to previous 1.331 (colored) to selected 1.30 (colored)

make(1): add wrappers around ctype.h functions

This avoids casting the argument to unsigned char, and to cast the
result of toupper/tolower back to char.

Revision 1.331 / (download) - annotate - [select for diffs], Sun Aug 30 19:56:02 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.330: +8 -11 lines
Diff to previous 1.330 (colored) to selected 1.30 (colored)

make(1): replace brk_string with Str_Words

The API is much simpler, and there is less detail that is exposed by
default and fewer punctuation to type on the caller's side.  To see that
there is some memory to be freed, one would have to look into the
struct.  Having part of the return value as the actual return value and
the rest in output parameters was unnecessarily asymmetrical.

Revision 1.330 / (download) - annotate - [select for diffs], Sun Aug 30 11:15:05 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.329: +7 -7 lines
Diff to previous 1.329 (colored) to selected 1.30 (colored)

make(1): rename Lst_Datum to LstNode_Datum

Revision 1.329 / (download) - annotate - [select for diffs], Sat Aug 29 13:16:54 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.328: +7 -12 lines
Diff to previous 1.328 (colored) to selected 1.30 (colored)

make(1): trust that Var_Subst never returns NULL

It really never does, and it doesn't even report errors.  It just
returns the content of the buffer, up to the first parse error.

Revision 1.328 / (download) - annotate - [select for diffs], Sat Aug 29 13:04:30 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.327: +10 -16 lines
Diff to previous 1.327 (colored) to selected 1.30 (colored)

make(1): make getBoolean simpler

This function is so seldom used that there is no point having
complicated code for it.

Revision 1.327 / (download) - annotate - [select for diffs], Sat Aug 29 10:41:12 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.326: +5 -5 lines
Diff to previous 1.326 (colored) to selected 1.30 (colored)

make(1): rename LstNode functions to match their type

Revision 1.326 / (download) - annotate - [select for diffs], Sat Aug 29 10:12:06 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.325: +8 -8 lines
Diff to previous 1.325 (colored) to selected 1.30 (colored)

make(1): rename Lst_FindB back to Lst_Find

The migration from "comparison function" to "match function" is done,
the "B" in the names is no longer needed.

Revision 1.325 / (download) - annotate - [select for diffs], Sat Aug 29 09:30:10 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.324: +24 -16 lines
Diff to previous 1.324 (colored) to selected 1.30 (colored)

make(1): start replacing Lst_Find with Lst_FindB

Lst_Find is called with a "comparison" function that returns the integer
0 if the desired node is found.  This leads to confusion since there are
so many different return value conventions for int, such as 0/1 for
mimicking false/true, -1/0 as in close(2), and the sign as in strcmp(3).
This API is much easier to understand if the "comparison" function is
not called a comparison function (since that is too close to strcmp),
but a "match" function that just returns a boolean.

In Lst_FindFromB, the node argument may be null.  This deviates from the
other Lst functions, which require Lst and LstNode to generally be
non-null.  In this case it is useful though to make the calling code
simpler.

In arch.c, this makes a lot of the previous documentation redundant.

In cond.c, the documentation is reduced a little bit since it had
already been cleaned up before.  It also removes the strange negation
from CondFindStrMatch.

In dir.c, the documentation collapses as well.

In main.c, separating the ReadMakefile function from the callbacks for
Lst_FindB allows the former to get back its natural function signature,
with proper types and no unused parameters.

To catch any accidental mistakes during the migration from Lst_Find to
Lst_FindB, the code can be compiled with -DUSE_DOUBLE_BOOLEAN, which
will complain about incompatible function pointer types.

Revision 1.324 / (download) - annotate - [select for diffs], Sat Aug 29 08:59:08 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.323: +4 -4 lines
Diff to previous 1.323 (colored) to selected 1.30 (colored)

make(1): fix null pointer dereference when sys.mk is not found

This is quite hard to trigger in a real-life scenario since it requires
precise timing.

Instead, I created /tmp/sys.mk and ran "./make -m /tmp -f /dev/null" in
the debugger, after setting a breakpoint in this line:

ln = Lst_Find(sysMkPath, ReadMakefile, NULL);

Once this line was reached, I removed /tmp/sys.mk to make ReadMakefile
fail.  Just adding a few parse errors won't help since ReadMakefile only
fails if the file cannot be found.

Revision 1.323 / (download) - annotate - [select for diffs], Sat Aug 29 07:52:55 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.322: +6 -5 lines
Diff to previous 1.322 (colored) to selected 1.30 (colored)

make(1): allow for strict type checking for Boolean

Having Boolean aliased to int creates ambiguities since int is widely
used.  Allow to occasionally compile make with -DUSE_DOUBLE_BOOLEAN to
check that the type definitions still agree.

Revision 1.322 / (download) - annotate - [select for diffs], Sat Aug 29 07:13:17 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.321: +17 -15 lines
Diff to previous 1.321 (colored) to selected 1.30 (colored)

make(1): clean up code in make.c

Var_Subst never returns NULL.

In Main_ExportMAKEFLAGS, don't compare ints with booleans.

In MainParseArgs, use char for the current character.  First, that's
more precise and correct, and second, it makes debugging easier for
those who don't know the ASCII table by heart.

Revision 1.321 / (download) - annotate - [select for diffs], Sat Aug 29 07:05:12 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.320: +7 -18 lines
Diff to previous 1.320 (colored) to selected 1.30 (colored)

make(1): rename confusing function ReadAllMakefiles

The old name implied that the function would read multiple files, which
was not the case.

The comment above that function was highly confusing.  It's not that the
function returns a boolean, but rather 0 or non-zero, and 0 means that
Lst_Find should stop searching.

One of the next refactorings will be to make Lst_Find return the first
list node for which the function returns TRUE.  This will reduce the
confusion about the several functions called SomethingP in suff.c.  The
P suffix means to return TRUE or FALSE, not 0 or non-zero.

Revision 1.320 / (download) - annotate - [select for diffs], Fri Aug 28 04:48:57 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.319: +27 -27 lines
Diff to previous 1.319 (colored) to selected 1.30 (colored)

make(1): remove trailing 'S' from names of Lst functions

The migration from null-passing Lst functions to argument-checking Lst
functions is completed.

There were 2 surprises: The targets list may be NULL, and in Dir_AddDir,
the path may be NULL.  The latter case is especially surprising since
that function turns into an almost-nop in that case.  This is another
case where probably 2 independent functions have been squeezed into a
single function.  This may be improved in a follow-up commit.

All other lists were fine.  They were always defined and thus didn't
need much work.

Revision 1.319 / (download) - annotate - [select for diffs], Fri Aug 28 04:28:45 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.318: +6 -6 lines
Diff to previous 1.318 (colored) to selected 1.30 (colored)

make(1): migrate Lst_Find to Lst_FindS

Revision 1.318 / (download) - annotate - [select for diffs], Fri Aug 28 04:14:31 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.317: +5 -5 lines
Diff to previous 1.317 (colored) to selected 1.30 (colored)

make(1): migrate Lst_First to Lst_FirstS

Revision 1.317 / (download) - annotate - [select for diffs], Thu Aug 27 19:15:35 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.316: +8 -8 lines
Diff to previous 1.316 (colored) to selected 1.30 (colored)

make(1): migrate Lst_IsEmpty to Lst_IsEmptyS

Revision 1.316 / (download) - annotate - [select for diffs], Thu Aug 27 07:00:29 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.315: +5 -6 lines
Diff to previous 1.315 (colored) to selected 1.30 (colored)

make(1): migrate Lst_Succ to Lst_SuccS

Revision 1.315 / (download) - annotate - [select for diffs], Thu Aug 27 06:53:57 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.314: +4 -4 lines
Diff to previous 1.314 (colored) to selected 1.30 (colored)

make(1): migrate Lst_ForEach to Lst_ForEachS

Most lists are always valid.  Only the "targets" variable may be null in
some cases, probably.

Revision 1.314 / (download) - annotate - [select for diffs], Wed Aug 26 22:55:46 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.313: +8 -8 lines
Diff to previous 1.313 (colored) to selected 1.30 (colored)

make(1): add stricter variants for remaining Lst functions

In most cases the Lst functions are only called when the arguments are
indeed valid.  It's not guaranteed though, therefore each function call
needs to be analyzed and converted individually.

While here, remove a few statements that were only useful when the Lst
functions handled circular lists.

Revision 1.313 / (download) - annotate - [select for diffs], Tue Aug 25 16:50:02 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.312: +4 -4 lines
Diff to previous 1.312 (colored) to selected 1.30 (colored)

make(1): fix obvious bugs in -DCLEANUP mode

The outdated type name FreeProc had been renamed to LstFreeProc.
Casting the function free to it is not necessary since the type of this
function is already exactly the correct type.  Anything else would be
undefined behavior anyway.

The uninitialized sufflist in Suff_ClearSuffixes was ok until now
because the Lst functions had silently skipped any calls with invalid
arguments.  This silent skipping is a good argument to have strict
argument validation since it detects these unintended control flows.

Revision 1.312 / (download) - annotate - [select for diffs], Sun Aug 23 18:26:35 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.311: +6 -6 lines
Diff to previous 1.311 (colored) to selected 1.30 (colored)

make(1): make brk_string return size_t for the number of words

Revision 1.311 / (download) - annotate - [select for diffs], Sun Aug 23 16:58:02 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.310: +6 -6 lines
Diff to previous 1.310 (colored) to selected 1.30 (colored)

make(1): reverse order of the Lst_Find parameters

The other callbacks all have (function, param), only the Lst_Find had
(param, function), which was inconsistent.

Revision 1.310 / (download) - annotate - [select for diffs], Sat Aug 22 18:47:31 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.309: +3 -5 lines
Diff to previous 1.309 (colored) to selected 1.30 (colored)

make(1): remove unused variable jobServer

Revision 1.309 / (download) - annotate - [select for diffs], Sat Aug 22 17:34:25 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.308: +4 -4 lines
Diff to previous 1.308 (colored) to selected 1.30 (colored)

make(1): fix indentation

Revision 1.308 / (download) - annotate - [select for diffs], Sat Aug 22 15:17:09 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.307: +8 -10 lines
Diff to previous 1.307 (colored) to selected 1.30 (colored)

make(1): replace Lst_Datum with non-null guaranteeing Lst_DatumS

Revision 1.307 / (download) - annotate - [select for diffs], Sat Aug 22 11:35:00 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.306: +7 -7 lines
Diff to previous 1.306 (colored) to selected 1.30 (colored)

make(1): replace "(void)Lst_AtEnd" with stricter "Lst_AppendS"

This change ensures that there is actually something added to the list.
Lst_AtEnd had silently skipped the addition if the list was invalid
(null pointer), which was not intended in these cases.  The "(void)" is
assumed to mean "I know that this cannot fail", while it could also mean
"I don't care whether something actually happened".

Running "./build.sh -j6 tools" still succeeds after this change,
therefore chances are very low that this change breaks anything.  If
there is any change, it's an obvious assertion failure.  There is no
silent change in behavior though.

Revision 1.306 / (download) - annotate - [select for diffs], Sat Aug 22 00:48:02 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.305: +5 -5 lines
Diff to previous 1.305 (colored) to selected 1.30 (colored)

make(1): split Dir_Init into two functions

There's just no point in having a function consisting of a big
if-then-else.

Revision 1.305 / (download) - annotate - [select for diffs], Fri Aug 21 02:20:47 2020 UTC (3 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.304: +7 -7 lines
Diff to previous 1.304 (colored) to selected 1.30 (colored)

make(1): remove unused code for circular lists

The list library had probably been imported from a general-purpose
library that also supported circular lists.  These are not used by make
though.

After replacing Lst_Init(FALSE) with Lst_Init(), only a single call to
Lst_Init remained with a non-constant argument, and that was in
Lst_Concat, which was to be expected.

Revision 1.304 / (download) - annotate - [select for diffs], Tue Aug 11 18:52:03 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.303: +7 -14 lines
Diff to previous 1.303 (colored) to selected 1.30 (colored)

make(1): replace snprintf/malloc in ReadMakefile with str_concat3

Revision 1.303 / (download) - annotate - [select for diffs], Mon Aug 10 19:53:19 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.302: +4 -4 lines
Diff to previous 1.302 (colored) to selected 1.30 (colored)

make(1): replace str_concat with str_concat2 and str_concat3

The new functions have a simpler interface, and str_concat3 is even more
general-purpose, since the middle string is no longer required to be
exactly of length 1.

Revision 1.302 / (download) - annotate - [select for diffs], Sun Aug 9 09:44:14 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.301: +5 -5 lines
Diff to previous 1.301 (colored) to selected 1.30 (colored)

make(1): clean up indentation, includes, add documentation

Revision 1.301 / (download) - annotate - [select for diffs], Sun Aug 9 09:27:44 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.300: +3 -4 lines
Diff to previous 1.300 (colored) to selected 1.30 (colored)

make(1): remove outdated comment

Revision 1.300 / (download) - annotate - [select for diffs], Sun Aug 9 09:26:21 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.299: +6 -9 lines
Diff to previous 1.299 (colored) to selected 1.30 (colored)

make(1): avoid undefined behavior in Cmd_Exec

Iterating the command output backwards was dangerous since at the end,
the pointer cp pointed outside of the array.  Even without dereferencing
this pointer, this already invokes undefined behavior (C11, 6.5.6p8).
Don't risk anything.  Iterating forwards is probably faster anyway, since
it is more common.

Revision 1.299 / (download) - annotate - [select for diffs], Sun Aug 9 09:07:54 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.298: +6 -13 lines
Diff to previous 1.298 (colored) to selected 1.30 (colored)

make(1): remove redundant assignment from Cmd_Exec

A Buffer is always null-terminated.

Revision 1.298 / (download) - annotate - [select for diffs], Sun Aug 9 09:01:29 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.297: +16 -18 lines
Diff to previous 1.297 (colored) to selected 1.30 (colored)

make(1): split local variable in Cmd_Exec into two

This avoids a mismatch between signed and unsigned types.

Revision 1.297 / (download) - annotate - [select for diffs], Sat Aug 8 18:54:04 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.296: +5 -5 lines
Diff to previous 1.296 (colored) to selected 1.30 (colored)

make(1): remove trailing Z from buffer functions

This Z had been useful during the migration from int to size_t.  This
migration is finished, at least for the Buffer type, so the Z is no
longer necessary.

Revision 1.296 / (download) - annotate - [select for diffs], Mon Aug 3 20:26:09 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.295: +19 -12 lines
Diff to previous 1.295 (colored) to selected 1.30 (colored)

make(1): no declaration-after-statement anymore

NetBSD make is intended to be maximally portable, therefore it uses only
C89.  This was not declared in the Makefile before.

There are still a few places in parse.c and metachar.c that use
end-of-line comments.  These will be fixed in a follow-up commit.

Revision 1.295 / (download) - annotate - [select for diffs], Sun Aug 2 08:06:35 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.294: +4 -4 lines
Diff to previous 1.294 (colored) to selected 1.30 (colored)

make(1): replace one instance of strncpy with snprintf

GCC 9 incorrectly claims that the string might not be null-terminated.
Since objdir is a global variable, it is initialized to zero, and the +1
in the size guarantees that this byte is always 0.

Still, using strncpy to initialize a string is a waste of memory access,
since it is enough if only the actual data is copied, without zeroing
out all the remaining bytes.

Revision 1.294 / (download) - annotate - [select for diffs], Sat Aug 1 21:40:49 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.293: +8 -7 lines
Diff to previous 1.293 (colored) to selected 1.30 (colored)

make(1): switch Buffer size from int to size_t

This change helps to make the various integer types compatible and is a
preparational step for setting WARNS=6 in the Makefile.

The documentation of buf.c has been cleaned up and condensed since it
was mostly redundant, and some statements were even slightly wrong.

All code changes are covered by the existing unit tests, except for the
few lines in for.c around for_var_len.  These changes have been reviewed
thoroughly and manually, like all the others in this commit.

Those buffer functions that deal with sizes have been renamed by
appending a Z, to make sure that no function call was accidentally
forgotten.  They will be renamed back in a follow-up commit.

As usual, the scope of a few affected variables has been reduced, and
some variables had to be split since they had been incorrectly merged
before.

The order of the arguments to Buf_AddBytes has changed from (mem_len,
mem) to (mem, mem_len), in order to make it consistent with the
functions from the C standard library, such as snprintf.

Revision 1.293 / (download) - annotate - [select for diffs], Sat Aug 1 17:45:32 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.292: +14 -15 lines
Diff to previous 1.292 (colored) to selected 1.30 (colored)

make(1): fix parameter name in Cmd_Exec

A format string is not a number.

Revision 1.292 / (download) - annotate - [select for diffs], Sat Aug 1 14:52:14 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.291: +8 -8 lines
Diff to previous 1.291 (colored) to selected 1.30 (colored)

make(1): use ordinary string concatenation in usage text

Revision 1.291 / (download) - annotate - [select for diffs], Sat Aug 1 14:47:49 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.290: +7 -7 lines
Diff to previous 1.290 (colored) to selected 1.30 (colored)

make(1): use consistent indentation in source code

Tabs for multiples of 8, then spaces.

The usage string has been kept as-is since the spaces there are
indentional and do influence the output.

Revision 1.290 / (download) - annotate - [select for diffs], Sat Aug 1 09:55:00 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.289: +11 -11 lines
Diff to previous 1.289 (colored) to selected 1.30 (colored)

make(1): avoid calls to free(3) in the common case of a NULL pointer

Revision 1.289 / (download) - annotate - [select for diffs], Sat Aug 1 09:25:36 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.288: +7 -6 lines
Diff to previous 1.288 (colored) to selected 1.30 (colored)

make(1): let Var_Value return a const char *

The return value must not be modified anyway, so let the compiler check
this for free.

Revision 1.288 / (download) - annotate - [select for diffs], Sat Aug 1 09:08:17 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.287: +14 -13 lines
Diff to previous 1.287 (colored) to selected 1.30 (colored)

make(1): make Main_SetVarObjdir const-correct and use separate variables

The return value of Var_Value should be const char *, but changing that
now would be too large a change.

Revision 1.287 / (download) - annotate - [select for diffs], Sat Aug 1 08:55:28 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.286: +5 -7 lines
Diff to previous 1.286 (colored) to selected 1.30 (colored)

make(1): merge duplicate code for concatenating strings

Revision 1.286 / (download) - annotate - [select for diffs], Sat Aug 1 08:49:47 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.285: +6 -9 lines
Diff to previous 1.285 (colored) to selected 1.30 (colored)

make(1): eliminate unsatisfiable condition in is_relpath

Revision 1.285 / (download) - annotate - [select for diffs], Fri Jul 31 20:22:10 2020 UTC (3 years, 8 months ago) by sjg
Branch: MAIN
Changes since 1.284: +7 -4 lines
Diff to previous 1.284 (colored) to selected 1.30 (colored)

Add -dL for LINT

When parsing variable assignments other than := and if
value contains '$' attempt Var_Subst the same as for :=,
if the value does not parse correctly, we get a fatal error
including file an line number.

This can greatly help with finding the cause of problems.

Reviewed by: christos

Revision 1.284 / (download) - annotate - [select for diffs], Tue Jul 28 16:42:22 2020 UTC (3 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.283: +15 -17 lines
Diff to previous 1.283 (colored) to selected 1.30 (colored)

make(1): remove dead code from Var_Subst

The first parameter from Var_Subst had been a literal NULL in all cases.
These have been fixed using this command:

sed -i 's|Var_Subst(NULL, |Var_Subst(|' *.c

The one remaining case was not found because the "NULL," was followed by
a line break instead of a space.

The removed code probably wouldn't have worked as expected anyway.
Expanding a single variable to a literal string would have led to
unexpected behavior for cases like ${VAR:M${pattern}}, in case pattern
would contain an unescaped ':' itself.

Revision 1.283 / (download) - annotate - [select for diffs], Mon Jul 20 18:12:48 2020 UTC (3 years, 8 months ago) by sjg
Branch: MAIN
Changes since 1.282: +8 -3 lines
Diff to previous 1.282 (colored) to selected 1.30 (colored)

Make DEBUG_HASH less of a fire-hose.

Reporting keys on every lookup is overkill unless
playing with a new HASH, so wrap in #ifdef DEBUG_HASH_LOOKUP
Also add some stats at the end so we can see
final size and max chain length - maxchain is a better
variable name than maxlen.

Revision 1.282 / (download) - annotate - [select for diffs], Sun Jul 19 12:35:30 2020 UTC (3 years, 9 months ago) by rillig
Branch: MAIN
Changes since 1.281: +8 -14 lines
Diff to previous 1.281 (colored) to selected 1.30 (colored)

make(1): clean up unnecessary snprintf and multi-line function calls

Revision 1.281 / (download) - annotate - [select for diffs], Sun Jul 19 12:26:17 2020 UTC (3 years, 9 months ago) by rillig
Branch: MAIN
Changes since 1.280: +15 -15 lines
Diff to previous 1.280 (colored) to selected 1.30 (colored)

make(1): rename Varf_Flags to VarEvalFlags

In var.c there are lots of different flag types.  To make any accidental
mixture obvious, each flag group gets its own prefix.

The only flag group that is visible outside of var.c is concerned with
evaluating variables, therefore the "e", which replaces the former "f"
that probably just meant "flag".

Revision 1.280 / (download) - annotate - [select for diffs], Sat Jul 18 21:37:38 2020 UTC (3 years, 9 months ago) by sjg
Branch: MAIN
Changes since 1.279: +6 -3 lines
Diff to previous 1.279 (colored) to selected 1.30 (colored)

Add -dh for DEBUG_HASH

Allow tracking of max chain length, to see how well the hash
tables are working.
Pull the actual hash operation into a marco so it can be
easily changed - for experimenting.

The current hash, is pretty good.

Reviewed by: christos

Revision 1.279 / (download) - annotate - [select for diffs], Fri Jul 3 08:13:23 2020 UTC (3 years, 9 months ago) by rillig
Branch: MAIN
Changes since 1.278: +16 -16 lines
Diff to previous 1.278 (colored) to selected 1.30 (colored)

make(1): remove trailing whitespace

Revision 1.278 / (download) - annotate - [select for diffs], Fri Jul 3 08:02:55 2020 UTC (3 years, 9 months ago) by rillig
Branch: MAIN
Changes since 1.277: +9 -9 lines
Diff to previous 1.277 (colored) to selected 1.30 (colored)

make(1): remove redundant parentheses around return values

Revision 1.277 / (download) - annotate - [select for diffs], Thu Jul 2 15:47:38 2020 UTC (3 years, 9 months ago) by rillig
Branch: MAIN
Changes since 1.276: +34 -34 lines
Diff to previous 1.276 (colored) to selected 1.30 (colored)

make(1): remove useless parameter from Var_Set

The enum corresponding to this int parameter is only defined in var.c,
which makes it impractical for the outside to set this parameter to
anything but 0.

On x86_64, this reduces the size of the resulting executable by 5 kB.

Revision 1.276 / (download) - annotate - [select for diffs], Mon Jun 22 20:15:25 2020 UTC (3 years, 9 months ago) by sjg
Branch: MAIN
Changes since 1.275: +4 -4 lines
Diff to previous 1.275 (colored) to selected 1.30 (colored)

dieQuietly: ignore OP_SUBMAKE

Stick to OP_MAKE for deciding when to supress noise
as OP_SUBMAKE can be too aggressive.

Reviewed by: gson

Revision 1.275 / (download) - annotate - [select for diffs], Fri Jun 19 21:17:48 2020 UTC (3 years, 9 months ago) by sjg
Branch: MAIN
Changes since 1.274: +30 -3 lines
Diff to previous 1.274 (colored) to selected 1.30 (colored)

Avoid unnecessary noise when sub-make or sibling dies

When analyzing a build log, the first 'stopped' output
from make, is the end of interesting output.

Normally when a build fails deep down in a parallel build
the log ends with many blockes of error output from make,
with all but the fist being unhelpful.

We add a function dieQuietly() which will return true
if we should supress the error output from make.
If the failing node was a sub-make, we want to die quietly.

Also when we read an abort token we call dieQuietly telling we
want to die quietly.

This behavior is suppressed by -dj or
setting .MAKE.DIE_QUIETLY=no

Reviewed by: christos

Revision 1.273.4.1 / (download) - annotate - [select for diffs], Wed Apr 8 14:09:16 2020 UTC (4 years ago) by martin
Branch: phil-wifi
Changes since 1.273: +5 -3 lines
Diff to previous 1.273 (colored) next main 1.274 (colored) to selected 1.30 (colored)

Merge changes from current as of 20200406

Revision 1.274 / (download) - annotate - [select for diffs], Mon Mar 30 02:41:06 2020 UTC (4 years ago) by sjg
Branch: MAIN
CVS Tags: phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406
Changes since 1.273: +5 -3 lines
Diff to previous 1.273 (colored) to selected 1.30 (colored)

make: fix -fno-common build

debug was declared extern, but debug_file was not; correct this and define
debug_file in main.c (as debug is) to fix the -fno-common build.

-fno-common will become the default with GCC10/LLVM11.

Patch from kevans at freebsd

Revision 1.273 / (download) - annotate - [select for diffs], Sat Oct 28 21:54:54 2017 UTC (6 years, 5 months ago) by sjg
Branch: MAIN
CVS Tags: phil-wifi-base, phil-wifi-20191119, phil-wifi-20190609, pgoyette-compat-merge-20190127, pgoyette-compat-base, pgoyette-compat-20190127, pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930, pgoyette-compat-0906, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315, pgoyette-compat, netbsd-9-base, netbsd-9-1-RELEASE, netbsd-9-0-RELEASE, netbsd-9-0-RC2, netbsd-9-0-RC1, is-mlppp-base, is-mlppp
Branch point for: phil-wifi, netbsd-9
Changes since 1.272: +5 -4 lines
Diff to previous 1.272 (colored) to selected 1.30 (colored)

Ignore empty MAKEOBJDIR

Otherwise we end up with .OBJDIR = ${.CURDIR}/
which is quivalent, but fails the typial
.if ${.OBJDIR} == ${.CURDIR}

Revision 1.265.2.1 / (download) - annotate - [select for diffs], Tue Jul 18 15:26:14 2017 UTC (6 years, 9 months ago) by snj
Branch: netbsd-8
CVS Tags: netbsd-8-2-RELEASE, netbsd-8-1-RELEASE, netbsd-8-1-RC1, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1, matt-nb8-mediatek-base, matt-nb8-mediatek
Changes since 1.265: +99 -73 lines
Diff to previous 1.265 (colored) to selected 1.30 (colored)

Pull up following revision(s) (requested by jmcneill in ticket #113):
	usr.bin/make/main.c: 1.266-1.272
	usr.bin/make/make.1: revision 1.267
move some code out of the gigantic main function; no functional change.
--
-V: try to expand the variable again if the value contains a variable.
--
simplify
--
a variable that starts with \\ is not expanded.
--
Remove previous variable expansion code; sjg had already added the code to
do it. Note that the manual page already documents this behavior and does
not need to change:
        -dV -V VAR:     prints the raw variable
        -V VAR:         prints the expanded variable
--
make the code look like to 1.266
--
Add -v variable that always expands variables; restore -V the way it was.

Revision 1.272 / (download) - annotate - [select for diffs], Mon Jun 19 19:58:24 2017 UTC (6 years, 10 months ago) by christos
Branch: MAIN
CVS Tags: perseant-stdc-iso10646-base, perseant-stdc-iso10646
Changes since 1.271: +16 -10 lines
Diff to previous 1.271 (colored) to selected 1.30 (colored)

Add -v variable that always expands variables; restore -V the way it was.

Revision 1.271 / (download) - annotate - [select for diffs], Mon Jun 19 15:49:21 2017 UTC (6 years, 10 months ago) by christos
Branch: MAIN
Changes since 1.270: +4 -8 lines
Diff to previous 1.270 (colored) to selected 1.30 (colored)

make the code look like to 1.266

Revision 1.270 / (download) - annotate - [select for diffs], Mon Jun 19 14:59:06 2017 UTC (6 years, 10 months ago) by christos
Branch: MAIN
Changes since 1.269: +5 -11 lines
Diff to previous 1.269 (colored) to selected 1.30 (colored)

Remove previous variable expansion code; sjg had already added the code to
do it. Note that the manual page already documents this behavior and does
not need to change:

	-dV -V VAR:	prints the raw variable
	-V VAR:		prints the expanded variable

Revision 1.269 / (download) - annotate - [select for diffs], Sat Jun 17 19:59:28 2017 UTC (6 years, 10 months ago) by christos
Branch: MAIN
Changes since 1.268: +8 -4 lines
Diff to previous 1.268 (colored) to selected 1.30 (colored)

a variable that starts with \\ is not expanded.

Revision 1.268 / (download) - annotate - [select for diffs], Sat Jun 17 16:34:07 2017 UTC (6 years, 10 months ago) by christos
Branch: MAIN
Changes since 1.267: +7 -8 lines
Diff to previous 1.267 (colored) to selected 1.30 (colored)

simplify

Revision 1.267 / (download) - annotate - [select for diffs], Sat Jun 17 15:49:56 2017 UTC (6 years, 10 months ago) by christos
Branch: MAIN
Changes since 1.266: +14 -6 lines
Diff to previous 1.266 (colored) to selected 1.30 (colored)

-V: try to expand the variable again if the value contains a variable.

Revision 1.266 / (download) - annotate - [select for diffs], Sat Jun 17 15:26:50 2017 UTC (6 years, 10 months ago) by christos
Branch: MAIN
Changes since 1.265: +87 -68 lines
Diff to previous 1.265 (colored) to selected 1.30 (colored)

move some code out of the gigantic main function; no functional change.

Revision 1.264.2.1 / (download) - annotate - [select for diffs], Thu May 11 02:58:42 2017 UTC (6 years, 11 months ago) by pgoyette
Branch: prg-localcount2
Changes since 1.264: +4 -5 lines
Diff to previous 1.264 (colored) next main 1.265 (colored) to selected 1.30 (colored)

Sync with HEAD

Revision 1.265 / (download) - annotate - [select for diffs], Wed May 10 22:26:14 2017 UTC (6 years, 11 months ago) by sjg
Branch: MAIN
CVS Tags: prg-localcount2-base3, prg-localcount2-base2, netbsd-8-base
Branch point for: netbsd-8
Changes since 1.264: +4 -5 lines
Diff to previous 1.264 (colored) to selected 1.30 (colored)

Main_SetObjdir: ensure buf2 is in scope

Revision 1.248.2.3 / (download) - annotate - [select for diffs], Wed Apr 26 02:53:35 2017 UTC (6 years, 11 months ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.248.2.2: +92 -30 lines
Diff to previous 1.248.2.2 (colored) to branchpoint 1.248 (colored) next main 1.249 (colored) to selected 1.30 (colored)

Sync with HEAD

Revision 1.254.2.1 / (download) - annotate - [select for diffs], Fri Apr 21 16:54:14 2017 UTC (6 years, 11 months ago) by bouyer
Branch: bouyer-socketcan
Changes since 1.254: +102 -30 lines
Diff to previous 1.254 (colored) next main 1.255 (colored) to selected 1.30 (colored)