summaryrefslogtreecommitdiff
path: root/main.c
AgeCommit message (Collapse)AuthorFilesLines
2014-02-08* Rename MAP_PATHSEP to MAP_DIRSEP.Paul Smith1-3/+3
2014-01-12* main.c (die): Close output_context AND make_sync.Paul Smith1-2/+7
die() can be invoked inside a separate output_context, if the $(error ...) function is expanded as part of a recipe.
2013-11-27* main.c (decode_env_switches): Ensure we have enough space.Paul Smith1-5/+4
Reported (with patch) by Gerte Hoogewerf <g.hoogewerf@gmail.com>
2013-11-27Solve some Windows build issues.Stephan T. Lavavej1-2/+2
* main.c (main): Use ONS(), not OSN(). (prepare_mutex_handle_string) [WINDOWS32]: Use %Ix formatting to support both 32bit and 64bit systems. * job.c (free_child, new_job): Use ONS(), not OSN(). * w32/subproc/w32err.c (map_windws32_error_to_string): Use O() when calling fatal(). Copyright-paperwork-exempt: yes
2013-11-24Fix memory leak during environment option decoding.Paul Smith1-10/+11
* main.c (decode_switches): Always make a copy of option arguments. (decode_env_switches): Use a stack buffer to convert environment switches for parsing.
2013-11-24[SV 40226] Add a new type of switch: single-string optionsPaul Smith1-71/+49
* main.c (struct command_switch): Change the "string" types to "strlist" and make "string" be a single-valued string instead. (output_sync_option, jobserver_fds, sync_mutex): Change to string type. (decode_output_sync_flags): Handle single strings instead of lists. (prepare_mutex_handle_string): Ditto. (main): Ditto. (clean_jobserver): Ditto. (init_switches): Handle the new type. (decode_switches): Ditto. (define_makeflags): Ditto.
2013-11-23[SV 40361] Don't use vsnprintf(), which is an ISO C99 function.Paul Smith1-44/+57
* output.c (error, fatal, message): Take an extra argument specifying how many bytes are used by the formatted arguments. (get_buffer): New function that allocates the requested buffer size. Remove msc_vsnprintf(), vfmtconcat(), and fmtconcat() as unneeded. * makeint.h: Declare various helper macros for generating output. * *.c: Change all error(), fatal(), message() calls to use the macros, or pass the extra length argument directly.
2013-10-19[SV 40254] Modify build.sh to work properly with Guile support.Paul Smith1-2/+0
* guile.c (guile_gmake_setup) [HAVE_GUILE]: Define a stub function when Guile support is not enabled. * main.c (main) [HAVE_GUILE]: Always invoke guile_gmake_setup(). * Makefile.am: Make guile.c standard, not optional. * build.template: Add the Guile compiler and linker flags.
2013-10-18Fix initialization of stringlist variables for jobserver_fds and sync_mutex.Christian Boos1-4/+6
(tiny change) main.c (prepare_mutex_handle_string, main): Initialize stringlist variables with at least 2 members, as one member is not currently supported.
2013-10-05Sanitize the registered function interface.Paul Smith1-1/+6
Expand the characters which are legal in a function name, and check the name for validity. Create a type for the function pointer. Convert the last argument from a boolean to flags, to allow for expansion.
2013-09-30Final fixes for obscure output-sync errors.Paul Smith1-40/+38
2013-09-29Reset GNUMAKEFLAGS after parsing.Paul Smith1-1/+9
If we don't do this we'll continually add flags on recursion. This is mainly for users to set in their environment before invoking make.
2013-09-22Add VMS port updates from Hartmut Becker.Paul Smith1-1/+1
2013-09-21Invert the #define for output-sync: turn it off with NO_OUTPUT_SYNCPaul Smith1-4/+8
2013-09-21Ensure that output generated while reading makefiles is synced.Paul Smith1-0/+47
2013-09-21Ensure that stderr from shell functions in recipes is synced.Paul Smith1-1/+2
2013-09-21Don't write "Entering" every time we re-exec for remake makefiles.Paul Smith1-6/+14
2013-09-18[SV 40043] Set the current directory before printing errors.Paul Smith1-5/+5
2013-09-16Small cleanup defining MAKEFLAGS.Paul Smith1-25/+11
2013-09-15[SV 39934] Verify jobserver FDs before something else uses them.Paul Smith1-84/+94
2013-09-15[SV 39203] Don't set MAKEFLAGS when restarting.Paul Smith1-12/+6
We are restarting with the original command line flags, so if we set MAKEFLAGS as well that will cause double flags.
2013-09-14[SV 35248] Add --debug "n" flag to turn off current debug options.Paul Smith1-1/+10
2013-09-14[SV 33134] Don't try to close stdout when it's already closed.Paul Smith1-4/+0
2013-09-14Support the -Orecurse option properly.Paul Smith1-36/+19
In this mode we still collect all the output from a given target and dump it at once. However we don't treat recursive lines any differently from non-recursive lines. Also we don't print enter/leave messages after every dump. However we do ensure that we always print them once to stdout, so the parent make will collect it properly.
2013-09-12Enhance the output sync mode.Paul Smith1-93/+7
Create a new file, output.c, and collect functions that generate output there. We introduce a new global context specifying where output should go (to stdout or to a sync file), and the lowest level output generator chooses where to write output based on that context. This allows us to set the context globally, and all operations that write output (including functions like $(info ...) etc.) will use it. Removed the "--trace=dir" capability. It was too confusing. If you have directory tracking enabled then output sync will print the enter/leave message for each synchronized block. If you don't want that, disable directory tracking.
2013-07-22[Bug #39310] Parse simple pattern prereqs for globbing.Paul Smith1-1/+1
We tried to get some efficiency by avoiding a parse_file_seq() for simple pattern prerequisites, but this also means no wildcard expansion was happening, so add it back. Add regression tests for wildcards in target and prerequisite lists.
2013-07-21[Bug #39158] Source cleanups suggested by cppcheck utility.Paul Smith1-2/+1
2013-07-14Modify the update_status field in struct file to be an enum.Paul Smith1-30/+20
Makes the code a little clearer/cleaner, and solves a problem on systems where a char is unsigned by default.
2013-06-28Set O_APPEND mode for stdout/stderr and output-sync temporary files.Paul Smith1-0/+6
POSIX does not guarantee that writes will be atomic if a file is opened for normal (non-append) output. That means if multiple processes are writing to the same file, output could be lost. I can't think of a real use-case where we would NOT want append for stdout/stderr, so force it if we can.
2013-06-22Fix a fatal error at startup on Windows due to non-ASCII characters in PATH.Eli Zaretskii1-9/+12
main.c (find_and_set_default_shell): Don't use file_exists_p or dir_file_exists_p, as those call readdir, which can fail if PATH includes directories with non-ASCII characters, and that would cause Make to fail at startup with confusing diagnostics. See https://sourceforge.net/mailarchive/message.php?msg_id=30846737 for the details.
2013-06-22Create a character map to use for locating stop-points in strings.Paul Smith1-2/+46
In various places we were passing flags and characters to compare, then using complex conditionals to see where to stop in string searches. Performance numbers reveal that we were spending as much as 23% of our processing time in these functions, most of it in the comparison lines. Instead create a character map and use a single bitwise comparison to determine if this is any one of the stop characters.
2013-06-21Disable database verification unless debug enabled.Paul Smith1-40/+47
The database verification can take a long time. Only enable it if debug mode is enabled. If MAKE_MAINTAINER_MODE is set, it's also enabled by default.
2013-05-27Cleanups.Paul Smith1-11/+10
2013-05-26[SV #39028] Fix some small typos in messages.Paul Smith1-1/+1
2013-05-22Force version printing whenever we print the database.Paul Smith1-3/+4
2013-05-22Make MFLAGS and MAKEFLAGS more reliable and predictable.Paul Smith1-115/+80
Ensure all simple flags are kept in the initial batch of flags. Do not allow any flags with options in that batch. If there are only non-simple flags ensure MAKEFLAGS begins with " ". Don't let MFLAGS start with "- ".
2013-05-17Fix MS-Windows compilation when OUTPUT_SYNC is not defined.Eli Zaretskii1-0/+4
main.c (prepare_mutex_handle_string): Define conditioned on OUTPUT_SYNC.
2013-05-17Update source file format: remove TABs, use GNU coding styles.Paul Smith1-133/+149
2013-05-17Update copyright for changes in 2013.Paul Smith1-1/+1
2013-05-13[Savannah #20501] Handle adding -r/-R to MAKEFLAGS in the makefile.Paul Smith1-4/+24
If -R is set in the makefile and not the command line, then go through all the default variables and undefine them. If -r is set in the makefile and not in the command line, then remove all .SUFFIX prefixes (unless the user set it) and SUFFIX variable setting. In -p mode don't print builtins.
2013-05-13Add a new variable: GNUMAKEFLAGSPaul Smith1-0/+3
This allows you to write portable makefiles that set GNU make-specific command line options in the environment or makefile: add them to GNUMAKEFLAGS instead of MAKEFLAGS and they will be seen by GNU make but ignored by other implementations of make.
2013-05-13Use level o_env_override for MAKEFLAGS so it's reset even with -e.Paul Smith1-7/+7
Fixes Savannah bug #2216.
2013-05-13Add new --trace[=MODE] flags, with --trace=dirPaul Smith1-5/+35
This mode replaces the previous heuristic setting enabled with -O, where we would log directory enter/leave for each synchronized output. Now we only do that if --trace=dir is given.
2013-05-05cosmetics: fix few innocuous typosStefano Lattarini1-2/+2
Most of these were found using Lucas De Marchi's 'codespell' tool. * ChangeLog: Fix minor typos. * ChangeLog.2: Likewise. * README.Amiga: Likewise. * TODO.private: Likewise. * function.c: Likewise. * glob/glob.h: Likewise. * job.c: Likewise. * main.c: Likewise. * readme.vms: Likewise. * remake.c: Likewise. * tests/ChangeLog: Likewise. * tests/NEWS: Likewise. * tests/README: Likewise. * tests/scripts/variables/private: Likewise. * vmsdir.h: Likewise. * signame.c: Likewise. While at it, improve line wrapping in the touched comment. Copyright-paperwork-exempt: yes Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
2013-05-05Rename the -O "job" mode to "line" and "make" to "recurse".Paul Smith1-7/+7
2013-04-28Add support for per-job output sync.Paul Smith1-1/+5
A new flag to the -O/--output-sync, "job", selects a per-job (that is, per line of a recipe) output synchronization. To support this move the close of the temp file out of the sync_output() function and don't do it until we free the child, since we may call sync_output() multiple times in a given recipe. When we set up for a new temp file, if we're in per-job mode we truncate the file and seek to the beginning to re-use it for every job.
2013-04-27Support --output-sync on MS-Windows.Eli Zaretskii1-0/+47
w32/compat/posixfcn.c: New file, with emulations of Posix functions and Posix functionality for MS-Windows. w32/subproc/sub_proc.c: Include io.h. (process_noinherit): New function, forces a file descriptor to not be inherited by child processes. (process_easy): Accept two additional arguments, and use them to set up the standard output and standard error handles of the child process. w32/include/sub_proc.h (process_easy): Adjust prototype. (process_noinherit): Add prototype. read.c [WINDOWS32]: Include windows.h and sub_proc.h. makeint.h (LOCALEDIR) [WINDOWS32}: Define to NULL if not defined. This is needed because the MS-Windows build doesn't have a canonical place for LOCALEDIR. (WIN32_LEAN_AND_MEAN) [WINDOWS32]: Define, to avoid getting from windows.h header too much stuff that could conflict with the code. main.c <sync_mutex>: New static variable. <switches>: Add support for "--sync-mutex" switch. (decode_output_sync_flags): Decode the --sync-mutex= switch. (prepare_mutex_handle_string) [WINDOWS32]: New function. (main): Add "output-sync" to .FEATURES. job.h (CLOSE_ON_EXEC) [WINDOWS32]: Define to call process_noinherit. (F_GETFD, F_SETLKW, F_WRLCK, F_UNLCK, struct flock) [WINDOWS32]: New macros. (RECORD_SYNC_MUTEX): New macro, a no-op for Posix platforms. (sync_handle_t): New typedef. job.c <sync_handle>: Change type to sync_handle_t. (FD_NOT_EMPTY): Seek to the file's end. Suggested by Frank Heckenbach <f.heckenbach@fh-soft.de>. (pump_from_tmp_fd) [WINDOWS32]: Switch to_fd to binary mode for the duration of this function, and then change back before returning. (start_job_command) [WINDOWS32]: Support output_sync mode on MS-Windows. Use a system-wide mutex instead of locking stdout/stderr. Call process_easy with two additional arguments: child->outfd and child->errfd. (exec_command) [WINDOWS32]: Pass two additional arguments, both -1, to process_easy, to adjust for the changed function signature. function.c (windows32_openpipe) [WINDOWS32]: This function now returns an int, which is -1 if it fails and zero otherwise. It also calls 'error' instead of 'fatal', to avoid exiting prematurely. (func_shell_base) [WINDOWS32]: Call perror_with_name if windows32_openpipe fails, now that it always returns. This avoids a compiler warning that error_prefix is not used in the MS-Windows build. config.h.W32.template (OUTPUT_SYNC): Define. build_w32.bat: Add w32/compat/posixfcn.c to compilation and linking commands. From Frank Heckenbach <f.heckenbach@fh-soft.de>: job.c (sync_output): Don't discard the output if acquire_semaphore fails; instead, dump the output unsynchronized.
2013-04-16Some cleanups for Windows builds after the output-sync option.Paul Smith1-10/+2
Note currently output-sync is not supported on Windows.
2013-04-16Create an open_tmpfd() function to return temp files by FD. Use it.Paul Smith1-44/+0
2013-04-15Change the arg option for -O from numeric to string.Paul Smith1-26/+48
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-13 06:21:22 +0000