mirror of
https://github.com/mirror/make.git
synced 2025-01-09 11:50:46 +08:00
16e14b4114
Savannah issues such as SV 57242 and SV 62397 show how passing references to closed file descriptors via the --jobserver-auth option in MAKEFLAGS can lead to problematic outcomes. When computing the child environment for a non-recursive shell, add an extra option to MAKEFLAGS to disable the file descriptors for the jobserver. Unfortunately this doesn't modify the value of the make variable MAKEFLAGS, it only modifies the value of the sub-shell environment variable MAKEFLAGS. This can lead to confusion if the user is not considering the distinction. * src/makeint.h: Publish the jobserver-auth value. Add a global definition of the name of the command line option. * src/os.h (jobserver_get_invalid_auth): New function to return a string invalidating the jobserver-auth option. * src/w32/w32os.c (jobserver_get_invaid_auth): Implement it. On Windows we use a semaphore so there's no need to invalidate. * src/posixos.c (jobserver_parse_auth): If we parse the invalid auth string, don't set up the jobserver. (jobserver_get_invalid_auth): Return an invalid option. * src/variable.h (target_environment): Specify if the target environment is for a recursive shell or non-recursive shell. * src/variable.c (target_environment): Move checking for MAKELEVEL into the loop rather than doing it at the end. Along with this, check for MAKEFLAGS and MFLAGS, and update them based on whether we're invoking a recursive or non-recursive child, and also on whether it's necessary to invalidate the jobserver. * src/function.c (func_shell_base): Shell functions can never be recursive to pass 0 to target_environment(). * src/job.c (start_job_command): Specify whether the child is recursive when calling target_environment(). * src/main.c: Export jobserver_auth. sync_mutex doesn't need to be exported. Use the global definition for the option name. * tests/scripts/variables/MAKEFLAGS: Add tests for $MAKEFLAGS. |
||
|---|---|---|
| .. | ||
| automatic | ||
| CURDIR | ||
| DEFAULT_GOAL | ||
| define | ||
| EXTRA_PREREQS | ||
| flavors | ||
| GNUMAKEFLAGS | ||
| INCLUDE_DIRS | ||
| LIBPATTERNS | ||
| MAKE | ||
| MAKE_RESTARTS | ||
| MAKECMDGOALS | ||
| MAKEFILES | ||
| MAKEFLAGS | ||
| MAKELEVEL | ||
| MFILE_LIST | ||
| negative | ||
| private | ||
| SHELL | ||
| special | ||
| undefine | ||